vxe-table 3.4.10 → 3.4.12-beta.2

package/lib/index.umd.js

@@ -8683,7 +8683,17 @@ var iconPrefix = 'vxe-icon--';
   button: {// size: null,
     // transfer: false
   },
-  radio: {// size: null
+  radio: {
+    // size: null,
+    strict: true
+  },
+  radioButton: {
+    // size: null,
+    strict: true
+  },
+  radioGroup: {
+    // size: null,
+    strict: true
   },
   checkbox: {// size: null
   },
@@ -13635,7 +13645,7 @@ var Methods = {
           row: childRow,
           rowid: rowid,
           seq: -1,
-          index: -1,
+          index: index,
           _index: -1,
           $index: -1,
           items: items,
@@ -13653,6 +13663,8 @@ var Methods = {
         row[mapChildren] = rows;
       }
 
+      _this10.updateAfterDataIndex();
+
       return rows;
     });
   },
@@ -14533,7 +14545,7 @@ var Methods = {
           fullDataRowIdData[rowid] = rest;
         }
       }, {
-        children: treeOpts.mapChildren
+        children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -14563,6 +14575,30 @@ var Methods = {
     }
   },
 
+  /**
+   * 只对 tree-config 有效，获取行的父级
+   */
+  getParentRow: function getParentRow(rowOrRowid) {
+    var treeConfig = this.treeConfig,
+        fullDataRowIdData = this.fullDataRowIdData;
+
+    if (rowOrRowid && treeConfig) {
+      var rowid;
+
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(rowOrRowid)) {
+        rowid = rowOrRowid;
+      } else {
+        rowid = methods_getRowid(this, rowOrRowid);
+      }
+
+      if (rowid) {
+        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null;
+      }
+    }
+
+    return null;
+  },
+
   /**
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
@@ -24553,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++) {
@@ -24725,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,
@@ -24734,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);
       });
@@ -24829,8 +24870,10 @@ function renderExtraSuffixIcon(h, _vm) {
       this.initValue();
     },
     dateLabelFormat: function dateLabelFormat() {
-      this.dateParseValue(this.datePanelValue);
-      this.inputValue = this.datePanelLabel;
+      if (this.isDatePickerType) {
+        this.dateParseValue(this.datePanelValue);
+        this.inputValue = this.datePanelLabel;
+      }
     }
   },
   created: function created() {
@@ -25166,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) {
@@ -25228,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);
@@ -25621,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 = '';
 
@@ -25634,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;
       }
@@ -25645,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();
@@ -25703,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);
@@ -25731,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)) {
@@ -27624,6 +27693,12 @@ Object.keys(option_props).forEach(function (name) {
     content: [String, Number],
     disabled: Boolean,
     name: String,
+    strict: {
+      type: Boolean,
+      default: function _default() {
+        return conf.radio.strict;
+      }
+    },
     size: {
       type: String,
       default: function _default() {
@@ -27640,11 +27715,14 @@ Object.keys(option_props).forEach(function (name) {
     isDisabled: function isDisabled() {
       var $xeradiogroup = this.$xeradiogroup;
       return this.disabled || $xeradiogroup && $xeradiogroup.disabled;
+    },
+    isStrict: function isStrict() {
+      var $xeradiogroup = this.$xeradiogroup;
+      return $xeradiogroup ? $xeradiogroup.strict : this.strict;
     }
   },
   render: function render(h) {
-    var _ref,
-        _this = this;
+    var _ref;
 
     var $scopedSlots = this.$scopedSlots,
         $xeradiogroup = this.$xeradiogroup,
@@ -27675,22 +27753,8 @@ Object.keys(option_props).forEach(function (name) {
         checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
       },
       on: {
-        change: function change(evnt) {
-          if (!isDisabled) {
-            var params = {
-              label: label,
-              $event: evnt
-            };
-
-            if ($xeradiogroup) {
-              $xeradiogroup.handleChecked(params);
-            } else {
-              _this.$emit('input', label);
-
-              _this.$emit('change', params);
-            }
-          }
-        }
+        change: this.changeEvent,
+        click: this.clickEvent
       }
     }), h('span', {
       class: 'vxe-radio--icon'
@@ -27699,22 +27763,35 @@ Object.keys(option_props).forEach(function (name) {
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])]);
   },
   methods: {
+    handleValue: function handleValue(label, evnt) {
+      var $xeradiogroup = this.$xeradiogroup;
+      var params = {
+        label: label,
+        $event: evnt
+      };
+
+      if ($xeradiogroup) {
+        $xeradiogroup.handleChecked(params);
+      } else {
+        this.$emit('input', label);
+        this.$emit('change', params);
+      }
+    },
     changeEvent: function changeEvent(evnt) {
-      var $xeradiogroup = this.$xeradiogroup,
-          isDisabled = this.isDisabled,
-          label = this.label;
+      var isDisabled = this.isDisabled;
 
       if (!isDisabled) {
-        var params = {
-          label: label,
-          $event: evnt
-        };
+        this.handleValue(this.label, evnt);
+      }
+    },
+    clickEvent: function clickEvent(evnt) {
+      var $xeradiogroup = this.$xeradiogroup,
+          isDisabled = this.isDisabled,
+          isStrict = this.isStrict;
 
-        if ($xeradiogroup) {
-          $xeradiogroup.handleChecked(params);
-        } else {
-          this.$emit('input', label);
-          this.$emit('change', params);
+      if (!isDisabled && !isStrict) {
+        if (this.label === ($xeradiogroup ? $xeradiogroup.value : this.value)) {
+          this.handleValue(null, evnt);
         }
       }
     }
@@ -34400,10 +34477,16 @@ var Radio = Object.assign(src_radio, {
   props: {
     value: [String, Number, Boolean],
     disabled: Boolean,
+    strict: {
+      type: Boolean,
+      default: function _default() {
+        return conf.radioGroup.strict;
+      }
+    },
     size: {
       type: String,
       default: function _default() {
-        return conf.radio.size || conf.size;
+        return conf.radioGroup.size || conf.size;
       }
     }
   },
@@ -34459,10 +34542,16 @@ var RadioGroup = Object.assign(radio_src_group, {
     title: [String, Number],
     content: [String, Number],
     disabled: Boolean,
+    strict: {
+      type: Boolean,
+      default: function _default() {
+        return conf.radioButton.strict;
+      }
+    },
     size: {
       type: String,
       default: function _default() {
-        return conf.radio.size || conf.size;
+        return conf.radioButton.size || conf.size;
       }
     }
   },
@@ -34478,6 +34567,10 @@ var RadioGroup = Object.assign(radio_src_group, {
     isDisabled: function isDisabled() {
       var $xeradiogroup = this.$xeradiogroup;
       return this.disabled || $xeradiogroup && $xeradiogroup.disabled;
+    },
+    isStrict: function isStrict() {
+      var $xeradiogroup = this.$xeradiogroup;
+      return $xeradiogroup ? $xeradiogroup.strict : this.strict;
     }
   },
   render: function render(h) {
@@ -34511,29 +34604,43 @@ var RadioGroup = Object.assign(radio_src_group, {
         checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
       },
       on: {
-        change: this.changeEvent
+        change: this.changeEvent,
+        click: this.clickEvent
       }
     }), h('span', {
       class: 'vxe-radio--label'
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])]);
   },
   methods: {
+    handleValue: function handleValue(label, evnt) {
+      var $xeradiogroup = this.$xeradiogroup;
+      var params = {
+        label: label,
+        $event: evnt
+      };
+
+      if ($xeradiogroup) {
+        $xeradiogroup.handleChecked(params);
+      } else {
+        this.$emit('input', label);
+        this.$emit('change', params);
+      }
+    },
     changeEvent: function changeEvent(evnt) {
-      var $xeradiogroup = this.$xeradiogroup,
-          isDisabled = this.isDisabled,
-          label = this.label;
+      var isDisabled = this.isDisabled;
 
       if (!isDisabled) {
-        var params = {
-          label: label,
-          $event: evnt
-        };
+        this.handleValue(this.label, evnt);
+      }
+    },
+    clickEvent: function clickEvent(evnt) {
+      var $xeradiogroup = this.$xeradiogroup,
+          isDisabled = this.isDisabled,
+          isStrict = this.isStrict;
 
-        if ($xeradiogroup) {
-          $xeradiogroup.handleChecked(params);
-        } else {
-          this.$emit('input', label);
-          this.$emit('change', params);
+      if (!isDisabled && !isStrict) {
+        if (this.label === ($xeradiogroup ? $xeradiogroup.value : this.value)) {
+          this.handleValue(null, evnt);
         }
       }
     }