|
|
@@ -314,7 +314,10 @@ export default {
|
|
|
|
|
|
this[week_list].map((item,index)=>{
|
|
|
list.push(item.map((vo,key)=>{
|
|
|
- if(this.dot_list.indexOf(vo.date) > -1 || this.dot_list.indexOf(vo.date.replace(/-(\d)(?!\d)/g, '-0$1')) > -1 ){
|
|
|
+ if (vo.day == ""){
|
|
|
+ vo.dot = false;
|
|
|
+ }
|
|
|
+ else if(this.dot_list.indexOf(vo.date) > -1 || this.dot_list.indexOf(vo.date.replace(/-(\d)(?!\d)/g, '-0$1')) > -1 ){
|
|
|
vo.dot = true;
|
|
|
|
|
|
}else{
|
|
|
@@ -481,7 +484,7 @@ export default {
|
|
|
|
|
|
for(let i = prev_date_days - start_week + 1; i <= prev_date_days; i++){
|
|
|
date_arrs.push({
|
|
|
- day:i,
|
|
|
+ day:"",
|
|
|
type:'prev',
|
|
|
date:`${prev_date.getFullYear()}-${prev_date.getMonth()+1}-${i}`
|
|
|
})
|
|
|
@@ -503,12 +506,12 @@ export default {
|
|
|
if(this.debug) console.log(value,date,this.date,`${next_date.getFullYear()}-${next_date.getMonth()+1}-${next_date.getDate()}`)
|
|
|
let date_arrs_length = date_arrs.length;
|
|
|
|
|
|
- // if(date_arrs_length > 35){
|
|
|
+ if(date_arrs_length > 35){
|
|
|
count_days = 42;
|
|
|
- // }
|
|
|
+ }
|
|
|
for(let i = 1; i <= count_days - date_arrs_length; i++){
|
|
|
date_arrs.push({
|
|
|
- day:i,
|
|
|
+ day:"",
|
|
|
type:'next',
|
|
|
date:`${next_date.getFullYear()}-${next_date.getMonth()+1}-${i}`
|
|
|
})
|
|
|
@@ -571,7 +574,7 @@ export default {
|
|
|
@import (less) '../../static/lx-calendar/fonts/iconfont.css';
|
|
|
|
|
|
@color:#007aff;
|
|
|
-@color_disabled:#f1f1f1;
|
|
|
+@color_disabled:#a1a1a1;
|
|
|
@color_standard:#333;
|
|
|
@color_border:#f5f5f5;
|
|
|
.date{
|
