vxe-table 4.1.17-beta.1 → 4.1.17-beta.2

package/es/input/src/input.js

@@ -283,12 +283,15 @@ export default defineComponent({
             }
             return '';
         });
+        var computeFirstDayOfWeek = computed(function () {
+            var startDay = props.startDay, startWeek = props.startWeek;
+            return XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek);
+        });
         var computeWeekDatas = computed(function () {
             var weeks = [];
             var isDatePickerType = computeIsDatePickerType.value;
             if (isDatePickerType) {
-                var startDay = props.startDay, startWeek = props.startWeek;
-                var sWeek = XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek);
+                var sWeek = computeFirstDayOfWeek.value;
                 weeks.push(sWeek);
                 for (var index = 0; index < 6; index++) {
                     if (sWeek >= 6) {
@@ -435,6 +438,7 @@ export default defineComponent({
         });
         var computeWeekDates = computed(function () {
             var dayDatas = computeDayDatas.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             return dayDatas.map(function (list) {
                 var firstItem = list[0];
                 var item = {
@@ -444,7 +448,7 @@ export default defineComponent({
                     isCurrent: false,
                     isNow: false,
                     isNext: false,
-                    label: XEUtils.getYearWeek(firstItem.date)
+                    label: XEUtils.getYearWeek(firstItem.date, firstDayOfWeek)
                 };
                 return [item].concat(list);
             });
@@ -610,6 +614,7 @@ export default defineComponent({
             var type = props.type;
             var valueFormat = props.valueFormat;
             var dateLabelFormat = computeDateLabelFormat.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             var dValue = null;
             var dLabel = '';
             if (value) {
@@ -621,7 +626,20 @@ export default defineComponent({
                 }
             }
             if (XEUtils.isValidDate(dValue)) {
-                dLabel = XEUtils.toDateString(dValue, dateLabelFormat);
+                dLabel = XEUtils.toDateString(dValue, dateLabelFormat, { firstDay: firstDayOfWeek });
+                // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+                if (dateLabelFormat && type === 'week') {
+                    var firstWeekDate = XEUtils.getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek);
+                    if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+                        var yyIndex = dateLabelFormat.indexOf('yyyy');
+                        if (yyIndex > -1) {
+                            var yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
+                            if (yyNum && !isNaN(yyNum)) {
+                                dLabel = dLabel.replace("" + yyNum, "" + (yyNum - 1));
+                            }
+                        }
+                    }
+                }
             }
             else {
                 dValue = null;
@@ -680,16 +698,17 @@ export default defineComponent({
             var datetimePanelValue = reactData.datetimePanelValue;
             var isDateTimeType = computeIsDateTimeType.value;
             var dateValueFormat = computeDateValueFormat.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             if (props.type === 'week') {
                 var sWeek = XEUtils.toNumber(props.selectDay);
-                date = XEUtils.getWhatWeek(date, 0, sWeek);
+                date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
             }
             else if (isDateTimeType) {
                 date.setHours(datetimePanelValue.getHours());
                 date.setMinutes(datetimePanelValue.getMinutes());
                 date.setSeconds(datetimePanelValue.getSeconds());
             }
-            var inpVal = XEUtils.toDateString(date, dateValueFormat);
+            var inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek });
             dateCheckMonth(date);
             if (!XEUtils.isEqual(modelValue, inpVal)) {
                 emitModel(inpVal, { type: 'update' });
@@ -740,6 +759,7 @@ export default defineComponent({
                             }
                             else {
                                 var isChange = false;
+                                var firstDayOfWeek = computeFirstDayOfWeek.value;
                                 if (type === 'datetime') {
                                     var dateValue = computeDateValue.value;
                                     if (inputValue !== XEUtils.toDateString(dateValue, dateLabelFormat) || inputValue !== XEUtils.toDateString(inpDateVal, dateLabelFormat)) {
@@ -752,7 +772,7 @@ export default defineComponent({
                                 else {
                                     isChange = true;
                                 }
-                                reactData.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat);
+                                reactData.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat, { firstDay: firstDayOfWeek });
                                 if (isChange) {
                                     dateChange(inpDateVal);
                                 }
@@ -1192,17 +1212,18 @@ export default defineComponent({
                 }
                 else {
                     var offsetDay = datePanelValue || XEUtils.getWhatDay(Date.now(), 0, 'first');
+                    var firstDayOfWeek = computeFirstDayOfWeek.value;
                     if (isLeftArrow) {
                         offsetDay = XEUtils.getWhatDay(offsetDay, -1);
                     }
                     else if (isUpArrow) {
-                        offsetDay = XEUtils.getWhatWeek(offsetDay, -1);
+                        offsetDay = XEUtils.getWhatWeek(offsetDay, -1, firstDayOfWeek);
                     }
                     else if (isRightArrow) {
                         offsetDay = XEUtils.getWhatDay(offsetDay, 1);
                     }
                     else if (isDwArrow) {
-                        offsetDay = XEUtils.getWhatWeek(offsetDay, 1);
+                        offsetDay = XEUtils.getWhatWeek(offsetDay, 1, firstDayOfWeek);
                     }
                     dateMoveDay(offsetDay);
                 }

package/lib/index.umd.js

@@ -15176,14 +15176,17 @@ function toStringTimeDate(str) {
 
       return '';
     });
+    var computeFirstDayOfWeek = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var startDay = props.startDay,
+          startWeek = props.startWeek;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(startDay) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(startDay) ? startDay : startWeek);
+    });
     var computeWeekDatas = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var weeks = [];
       var isDatePickerType = computeIsDatePickerType.value;
 
       if (isDatePickerType) {
-        var startDay = props.startDay,
-            startWeek = props.startWeek;
-        var sWeek = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(startDay) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(startDay) ? startDay : startWeek);
+        var sWeek = computeFirstDayOfWeek.value;
         weeks.push(sWeek);
 
         for (var index = 0; index < 6; index++) {
@@ -15352,6 +15355,7 @@ function toStringTimeDate(str) {
     });
     var computeWeekDates = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var dayDatas = computeDayDatas.value;
+      var firstDayOfWeek = computeFirstDayOfWeek.value;
       return dayDatas.map(function (list) {
         var firstItem = list[0];
         var item = {
@@ -15361,7 +15365,7 @@ function toStringTimeDate(str) {
           isCurrent: false,
           isNow: false,
           isNext: false,
-          label: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getYearWeek(firstItem.date)
+          label: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getYearWeek(firstItem.date, firstDayOfWeek)
         };
         return [item].concat(list);
       });
@@ -15576,6 +15580,7 @@ function toStringTimeDate(str) {
       var type = props.type;
       var valueFormat = props.valueFormat;
       var dateLabelFormat = computeDateLabelFormat.value;
+      var firstDayOfWeek = computeFirstDayOfWeek.value;
       var dValue = null;
       var dLabel = '';
 
@@ -15588,7 +15593,25 @@ function toStringTimeDate(str) {
       }
 
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(dValue)) {
-        dLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(dValue, dateLabelFormat);
+        dLabel = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(dValue, dateLabelFormat, {
+          firstDay: firstDayOfWeek
+        }); // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+
+        if (dateLabelFormat && type === 'week') {
+          var firstWeekDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek);
+
+          if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+            var yyIndex = dateLabelFormat.indexOf('yyyy');
+
+            if (yyIndex > -1) {
+              var yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
+
+              if (yyNum && !isNaN(yyNum)) {
+                dLabel = dLabel.replace("".concat(yyNum), "".concat(yyNum - 1));
+              }
+            }
+          }
+        }
       } else {
         dValue = null;
       }
@@ -15661,17 +15684,20 @@ function toStringTimeDate(str) {
       var datetimePanelValue = reactData.datetimePanelValue;
       var isDateTimeType = computeIsDateTimeType.value;
       var dateValueFormat = computeDateValueFormat.value;
+      var firstDayOfWeek = computeFirstDayOfWeek.value;
 
       if (props.type === 'week') {
         var sWeek = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(props.selectDay);
-        date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(date, 0, sWeek);
+        date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
       } else if (isDateTimeType) {
         date.setHours(datetimePanelValue.getHours());
         date.setMinutes(datetimePanelValue.getMinutes());
         date.setSeconds(datetimePanelValue.getSeconds());
       }
 
-      var inpVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateValueFormat);
+      var inpVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(date, dateValueFormat, {
+        firstDay: firstDayOfWeek
+      });
       dateCheckMonth(date);
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(modelValue, inpVal)) {
@@ -15739,6 +15765,7 @@ function toStringTimeDate(str) {
                 reactData.inputValue = inpDateVal;
               } else {
                 var isChange = false;
+                var firstDayOfWeek = computeFirstDayOfWeek.value;
 
                 if (type === 'datetime') {
                   var dateValue = computeDateValue.value;
@@ -15753,7 +15780,9 @@ function toStringTimeDate(str) {
                   isChange = true;
                 }
 
-                reactData.inputValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(inpDateVal, dateLabelFormat);
+                reactData.inputValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(inpDateVal, dateLabelFormat, {
+                  firstDay: firstDayOfWeek
+                });
 
                 if (isChange) {
                   dateChange(inpDateVal);
@@ -16281,15 +16310,16 @@ function toStringTimeDate(str) {
           dateMoveMonth(offsetMonth);
         } else {
           var offsetDay = datePanelValue || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(Date.now(), 0, 'first');
+          var firstDayOfWeek = computeFirstDayOfWeek.value;
 
           if (isLeftArrow) {
             offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(offsetDay, -1);
           } else if (isUpArrow) {
-            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(offsetDay, -1);
+            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(offsetDay, -1, firstDayOfWeek);
           } else if (isRightArrow) {
             offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(offsetDay, 1);
           } else if (isDwArrow) {
-            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(offsetDay, 1);
+            offsetDay = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatWeek(offsetDay, 1, firstDayOfWeek);
           }
 
           dateMoveDay(offsetDay);