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

package/lib/index.umd.js

@@ -24589,13 +24589,16 @@ function renderExtraSuffixIcon(h, _vm) {
 
       return '';
     },
+    firstDayOfWeek: function firstDayOfWeek() {
+      var startDay = this.startDay,
+          startWeek = this.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);
+    },
     weekDatas: function weekDatas() {
       var weeks = [];
 
       if (this.isDatePickerType) {
-        var startDay = this.startDay,
-            startWeek = this.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 = this.firstDayOfWeek;
         weeks.push(sWeek);
 
         for (var index = 0; index < 6; index++) {
@@ -24761,7 +24764,9 @@ function renderExtraSuffixIcon(h, _vm) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.chunk(this.dayList, 7);
     },
     weekDates: function weekDates() {
-      return this.dayDatas.map(function (list) {
+      var dayDatas = this.dayDatas,
+          firstDayOfWeek = this.firstDayOfWeek;
+      return dayDatas.map(function (list) {
         var firstItem = list[0];
         var item = {
           date: firstItem.date,
@@ -24770,7 +24775,7 @@ function renderExtraSuffixIcon(h, _vm) {
           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);
       });
@@ -25204,7 +25209,8 @@ function renderExtraSuffixIcon(h, _vm) {
           datetimePanelValue = this.datetimePanelValue,
           dateLabelFormat = this.dateLabelFormat,
           min = this.min,
-          max = this.max;
+          max = this.max,
+          firstDayOfWeek = this.firstDayOfWeek;
 
       if (!inpReadonly) {
         if (isNumType) {
@@ -25266,7 +25272,9 @@ function renderExtraSuffixIcon(h, _vm) {
                     isChange = true;
                   }
 
-                  this.inputValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(inpDateVal, dateLabelFormat);
+                  this.inputValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(inpDateVal, dateLabelFormat, {
+                    firstDay: firstDayOfWeek
+                  });
 
                   if (isChange) {
                     this.dateChange(inpDateVal);
@@ -25659,7 +25667,8 @@ function renderExtraSuffixIcon(h, _vm) {
     dateParseValue: function dateParseValue(date) {
       var type = this.type,
           dateLabelFormat = this.dateLabelFormat,
-          valueFormat = this.valueFormat;
+          valueFormat = this.valueFormat,
+          firstDayOfWeek = this.firstDayOfWeek;
       var dValue = null;
       var dLabel = '';
 
@@ -25672,7 +25681,25 @@ function renderExtraSuffixIcon(h, _vm) {
       }
 
       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;
       }
@@ -25683,7 +25710,8 @@ function renderExtraSuffixIcon(h, _vm) {
     dateOffsetEvent: function dateOffsetEvent(evnt) {
       var isActivated = this.isActivated,
           datePanelValue = this.datePanelValue,
-          datePanelType = this.datePanelType;
+          datePanelType = this.datePanelType,
+          firstDayOfWeek = this.firstDayOfWeek;
 
       if (isActivated) {
         evnt.preventDefault();
@@ -25741,11 +25769,11 @@ function renderExtraSuffixIcon(h, _vm) {
           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);
           }
 
           this.dateMoveDay(offsetDay);
@@ -25769,18 +25797,21 @@ function renderExtraSuffixIcon(h, _vm) {
     dateChange: function dateChange(date) {
       var value = this.value,
           datetimePanelValue = this.datetimePanelValue,
-          dateValueFormat = this.dateValueFormat;
+          dateValueFormat = this.dateValueFormat,
+          firstDayOfWeek = this.firstDayOfWeek;
 
       if (this.type === 'week') {
         var sWeek = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(this.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 (this.hasTime) {
         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
+      });
       this.dateCheckMonth(date);
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(value, inpVal)) {