vxe-table 3.4.12-beta.0 → 3.4.13

package/lib/index.umd.js

@@ -8931,6 +8931,7 @@ var utils_ColumnInfo = /*#__PURE__*/function () {
       // 基本属性
       type: _vm.type,
       property: _vm.field,
+      field: _vm.field,
       title: _vm.title,
       width: _vm.width,
       minWidth: _vm.minWidth,
@@ -9801,14 +9802,14 @@ function getChangeEvent(renderOpts) {
   return 'change';
 }
 
-function parseDate(value, props) {
+function renderer_parseDate(value, props) {
   return value && props.valueFormat ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(value, props.valueFormat) : value;
 }
 
 function getFormatDate(value, props, defaultFormat) {
   var _props$dateConfig = props.dateConfig,
       dateConfig = _props$dateConfig === void 0 ? {} : _props$dateConfig;
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(renderer_parseDate(value, props), dateConfig.labelFormat || defaultFormat);
 }
 
 function getLabelFormatDate(value, props) {
@@ -11496,6 +11497,19 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
     this.$el._onscroll = null;
     this.$el.onscroll = null;
   },
+  destroyed: function destroyed() {
+    var $xetable = this.$parent,
+        fixedType = this.fixedType;
+    var elemStore = $xetable.elemStore;
+    var prefix = "".concat(fixedType || 'main', "-body-");
+    elemStore["".concat(prefix, "wrapper")] = null;
+    elemStore["".concat(prefix, "table")] = null;
+    elemStore["".concat(prefix, "colgroup")] = null;
+    elemStore["".concat(prefix, "list")] = null;
+    elemStore["".concat(prefix, "xSpace")] = null;
+    elemStore["".concat(prefix, "ySpace")] = null;
+    elemStore["".concat(prefix, "emptyBlock")] = null;
+  },
   render: function render(h) {
     var _e = this._e,
         $xetable = this.$parent,
@@ -11662,8 +11676,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
       var rightElem = rightBody ? rightBody.$el : null;
       var bodyYElem = elemStore['main-body-ySpace'];
       var bodyXElem = elemStore['main-body-xSpace'];
-      var bodyHeight = bodyYElem ? bodyYElem.clientHeight : 0;
-      var bodyWidth = bodyXElem ? bodyXElem.clientWidth : 0;
+      var bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
+      var bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
       var scrollTop = scrollBodyElem.scrollTop;
       var scrollLeft = bodyElem.scrollLeft;
       var isRollX = scrollLeft !== lastScrollLeft;
@@ -11719,6 +11733,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
         fixed: fixedType,
         scrollTop: scrollTop,
         scrollLeft: scrollLeft,
+        scrollHeight: bodyElem.scrollHeight,
+        scrollWidth: bodyElem.scrollWidth,
         bodyHeight: bodyHeight,
         bodyWidth: bodyWidth,
         isX: isRollX,
@@ -11730,7 +11746,9 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
 
       var $xetable = this.$parent;
       var $refs = $xetable.$refs,
-          elemStore = $xetable.elemStore;
+          elemStore = $xetable.elemStore,
+          scrollYLoad = $xetable.scrollYLoad,
+          scrollXLoad = $xetable.scrollXLoad;
       var tableBody = $refs.tableBody,
           leftBody = $refs.leftBody,
           rightBody = $refs.rightBody;
@@ -11740,8 +11758,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
       var remainSize = this.isPrevWheelTop === isTopWheel ? Math.max(0, this.wheelYSize - this.wheelYTotal) : 0;
       var bodyYElem = elemStore['main-body-ySpace'];
       var bodyXElem = elemStore['main-body-xSpace'];
-      var bodyHeight = bodyYElem ? bodyYElem.clientHeight : 0;
-      var bodyWidth = bodyXElem ? bodyXElem.clientWidth : 0;
+      var bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
+      var bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
       this.isPrevWheelTop = isTopWheel;
       this.wheelYSize = Math.abs(isTopWheel ? deltaTop - remainSize : deltaTop + remainSize);
       this.wheelYInterval = 0;
@@ -11787,6 +11805,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
             fixed: fixedType,
             scrollTop: bodyElem.scrollTop,
             scrollLeft: bodyElem.scrollLeft,
+            scrollHeight: bodyElem.scrollHeight,
+            scrollWidth: bodyElem.scrollWidth,
             bodyHeight: bodyHeight,
             bodyWidth: bodyWidth,
             isX: isRollX,
@@ -14227,16 +14247,23 @@ var Methods = {
         afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
-        checkboxOpts = this.checkboxOpts;
+        checkboxOpts = this.checkboxOpts,
+        tableFullTreeData = this.tableFullTreeData,
+        afterTreeFullData = this.afterTreeFullData;
+    var transform = treeOpts.transform,
+        children = treeOpts.children,
+        mapChildren = treeOpts.mapChildren;
     var property = checkboxOpts.checkField;
-    var currTableData = isFull ? tableFullData : afterFullData;
+    var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
 
     if (property) {
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.filterTree(currTableData, function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
-        }, treeOpts);
+        }, {
+          children: transform ? mapChildren : children
+        });
       } else {
         rowList = currTableData.filter(function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
@@ -14248,7 +14275,9 @@ var Methods = {
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.filterTree(currTableData, function (row) {
           return selection.indexOf(row) > -1;
-        }, treeOpts);
+        }, {
+          children: transform ? mapChildren : children
+        });
       } else {
         rowList = currTableData.filter(function (row) {
           return selection.indexOf(row) > -1;
@@ -14314,7 +14343,8 @@ var Methods = {
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
-      var sortable = column.sortable,
+      var property = column.property,
+          sortable = column.sortable,
           order = column.order,
           filters = column.filters;
 
@@ -14340,7 +14370,8 @@ var Methods = {
       if (!allRemoteSort && sortable && order) {
         orderColumns.push({
           column: column,
-          property: column.property,
+          field: column.property,
+          property: property,
           order: order
         });
       }
@@ -14575,6 +14606,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 行主键
@@ -16032,7 +16087,9 @@ var Methods = {
           // 如果是按下非功能键之外允许直接编辑
 
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
-            if (!editOpts.activeMethod || editOpts.activeMethod(selected.args)) {
+            if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
+              $table: _this26
+            }))) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
@@ -17633,12 +17690,14 @@ var Methods = {
   getSortColumns: function getSortColumns() {
     var sortList = [];
     this.tableFullColumn.forEach(function (column) {
-      var order = column.order;
+      var property = column.property,
+          order = column.order;
 
       if ((column.sortable || column.remoteSort) && order) {
         sortList.push({
           column: column,
-          property: column.property,
+          field: column.property,
+          property: property,
           order: order
         });
       }
@@ -21436,6 +21495,7 @@ var Menu = {
 
 
 
+
 var mixin_getRowid = UtilTools.getRowid;
 
 function insertTreeRow(_vm, newRecords, isAppend) {
@@ -21444,22 +21504,28 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       fullDataRowIdData = _vm.fullDataRowIdData,
       fullAllDataRowIdData = _vm.fullAllDataRowIdData,
       treeOpts = _vm.treeOpts;
+  var rowField = treeOpts.rowField,
+      parentField = treeOpts.parentField,
+      children = treeOpts.children,
+      mapChildren = treeOpts.mapChildren;
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
-    var parentRowId = item[treeOpts.parentField];
+    var parentRowId = item[parentField];
     var rowid = mixin_getRowid(_vm, item);
     var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
-      return parentRowId === item[treeOpts.rowField];
-    }, treeOpts) : null;
+      return parentRowId === item[rowField];
+    }, {
+      children: mapChildren
+    }) : null;
 
     if (matchObj) {
       var parentRow = matchObj.item;
       var parentRest = fullAllDataRowIdData[mixin_getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
-      var parentChilds = parentRow[treeOpts.children];
+      var parentChilds = parentRow[children];
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(parentChilds)) {
-        parentChilds = parentRow[treeOpts.children] = [];
+        parentChilds = parentRow[children] = [];
       }
 
       parentChilds[funcName](item);
@@ -21530,7 +21596,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           fullDataRowIdData = this.fullDataRowIdData,
           fullAllDataRowIdData = this.fullAllDataRowIdData,
           treeOpts = this.treeOpts;
-      var transform = treeOpts.transform;
+      var transform = treeOpts.transform,
+          rowField = treeOpts.rowField,
+          mapChildren = treeOpts.mapChildren;
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(records)) {
         records = [records];
@@ -21578,8 +21646,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           // 如果为虚拟树
           if (treeConfig && transform) {
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
-              return row[treeOpts.rowField] === item[treeOpts.rowField];
-            }, treeOpts);
+              return row[rowField] === item[rowField];
+            }, {
+              children: mapChildren
+            });
 
             if (matchObj) {
               var parentRow = matchObj.parent;
@@ -21592,7 +21662,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
                 if (false) {}
 
                 if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[treeOpts.rowField];
+                  item[treeOpts.parentField] = parentRow[rowField];
                 }
 
                 parentChilds.splice(matchObj.index + i, 0, item);
@@ -21620,7 +21690,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
               throw new Error(UtilTools.getLog('vxe.error.noTree', ['insert']));
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = -1; // 如果是可视索引
+
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(row)) {
+              if (row < afterFullData.length) {
+                afIndex = row;
+              }
+            } else {
+              afIndex = afterFullData.indexOf(row);
+            }
 
             if (afIndex === -1) {
               throw new Error(UtilTools.error('vxe.error.unableInsert'));
@@ -21971,7 +22049,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           // 判断是否禁用编辑
           var type = 'edit-disabled';
 
-          if (!activeMethod || activeMethod(params)) {
+          if (!activeMethod || activeMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+            $table: this
+          }))) {
             if (mouseConfig) {
               this.clearSelected(evnt);
               this.clearCellAreas(evnt);
@@ -23154,7 +23234,7 @@ var msgQueue = [];
 
       return this.$nextTick().then(function () {
         if (!_this7.zoomLocat) {
-          var marginSize = _this7.marginSize;
+          var marginSize = Math.max(0, _this7.marginSize);
 
           var modalBoxElem = _this7.getBox();
 
@@ -24495,18 +24575,11 @@ function renderExtraSuffixIcon(h, _vm) {
     dateValue: function dateValue() {
       var value = this.value,
           isDatePickerType = this.isDatePickerType,
-          type = this.type,
           dateValueFormat = this.dateValueFormat;
       var val = null;
 
       if (value && isDatePickerType) {
-        var date;
-
-        if (type === 'time') {
-          date = toStringTimeDate(value);
-        } else {
-          date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(value, dateValueFormat);
-        }
+        var date = this.parseDate(value, dateValueFormat);
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(date)) {
           val = date;
@@ -24565,13 +24638,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++) {
@@ -24737,7 +24813,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,
@@ -24746,7 +24824,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);
       });
@@ -24841,8 +24919,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() {
@@ -25134,6 +25214,15 @@ function renderExtraSuffixIcon(h, _vm) {
         $event: evnt
       });
     },
+    parseDate: function parseDate(value, format) {
+      var type = this.type;
+
+      if (type === 'time') {
+        return toStringTimeDate(value);
+      }
+
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(value, format);
+    },
 
     /**
      * 检查初始值
@@ -25178,7 +25267,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) {
@@ -25207,13 +25297,7 @@ function renderExtraSuffixIcon(h, _vm) {
           if (inputValue) {
             if (type === 'week' || type === 'quarter') {// 周和季度选择器不支持解析，无需处理
             } else {
-              var inpDateVal;
-
-              if (type === 'time') {
-                inpDateVal = toStringTimeDate(inputValue);
-              } else {
-                inpDateVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(inputValue, dateLabelFormat);
-              }
+              var inpDateVal = this.parseDate(inputValue, dateLabelFormat);
 
               if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(inpDateVal)) {
                 if (type === 'time') {
@@ -25240,7 +25324,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);
@@ -25633,20 +25719,35 @@ 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 = '';
 
       if (date) {
-        if (type === 'time') {
-          dValue = toStringTimeDate(date);
-        } else {
-          dValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(date, valueFormat);
-        }
+        dValue = this.parseDate(date, valueFormat);
       }
 
       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;
       }
@@ -25657,7 +25758,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();
@@ -25715,11 +25817,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);
@@ -25743,18 +25845,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)) {
@@ -27965,6 +28070,7 @@ var es_string_repeat = __webpack_require__("38cf");
 
 
 
+
 
 
 var mixin_formatText = UtilTools.formatText; // 默认导出或打印的 HTML 样式
@@ -28000,16 +28106,18 @@ function hasTreeChildren($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0;
 }
 
-function getSeq($xetable, row, rowIndex, column, columnIndex) {
+function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
   var seqOpts = $xetable.seqOpts;
   var seqMethod = seqOpts.seqMethod || column.seqMethod;
 
   if (seqMethod) {
     return seqMethod({
       row: row,
-      rowIndex: rowIndex,
+      rowIndex: $xetable.getRowIndex(row),
+      $rowIndex: $rowIndex,
       column: column,
-      columnIndex: columnIndex
+      columnIndex: $xetable.getColumnIndex(column),
+      $columnIndex: $columnIndex
     });
   }
 
@@ -28037,7 +28145,8 @@ function toBooleanValue(cellValue) {
 }
 
 function getLabelData($xetable, opts, columns, datas) {
-  var isAllExpand = opts.isAllExpand;
+  var isAllExpand = opts.isAllExpand,
+      mode = opts.mode;
   var treeConfig = $xetable.treeConfig,
       treeOpts = $xetable.treeOpts,
       radioOpts = $xetable.radioOpts,
@@ -28051,7 +28160,7 @@ function getLabelData($xetable, opts, columns, datas) {
     // 如果是树表格只允许导出数据源
     var rest = [];
     var expandMaps = new Map();
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(datas, function (item, rowIndex, items, path, parent, nodes) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(datas, function (item, $rowIndex, items, path, parent, nodes) {
       var row = item._row || item;
       var parentRow = parent && parent._row ? parent._row : parent;
 
@@ -28063,7 +28172,7 @@ function getLabelData($xetable, opts, columns, datas) {
           _hasChild: hasRowChild,
           _expand: hasRowChild && $xetable.isTreeExpandByRow(row)
         };
-        columns.forEach(function (column, columnIndex) {
+        columns.forEach(function (column, $columnIndex) {
           var cellValue = '';
           var renderOpts = column.editRender || column.cellRender;
           var exportLabelMethod = column.exportMethod;
@@ -28086,7 +28195,9 @@ function getLabelData($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
+                cellValue = mode === 'all' ? path.map(function (num, i) {
+                  return i % 2 === 0 ? Number(num) + 1 : '.';
+                }).join('') : getSeq($xetable, row, $rowIndex, column, $columnIndex);
                 break;
 
               case 'checkbox':
@@ -28135,11 +28246,11 @@ function getLabelData($xetable, opts, columns, datas) {
     return rest;
   }
 
-  return datas.map(function (row, rowIndex) {
+  return datas.map(function (row, $rowIndex) {
     var item = {
       _row: row
     };
-    columns.forEach(function (column, columnIndex) {
+    columns.forEach(function (column, $columnIndex) {
       var cellValue = '';
       var renderOpts = column.editRender || column.cellRender;
       var exportLabelMethod = column.exportMethod;
@@ -28162,7 +28273,7 @@ function getLabelData($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
+            cellValue = mode === 'all' ? $rowIndex + 1 : getSeq($xetable, row, $rowIndex, column, $columnIndex);
             break;
 
           case 'checkbox':
@@ -30951,6 +31062,18 @@ var cellType = 'header';
     elemStore["".concat(prefix, "xSpace")] = $refs.xSpace;
     elemStore["".concat(prefix, "repair")] = $refs.repair;
   },
+  destroyed: function destroyed() {
+    var $xetable = this.$parent,
+        fixedType = this.fixedType;
+    var elemStore = $xetable.elemStore;
+    var prefix = "".concat(fixedType || 'main', "-header-");
+    elemStore["".concat(prefix, "wrapper")] = null;
+    elemStore["".concat(prefix, "table")] = null;
+    elemStore["".concat(prefix, "colgroup")] = null;
+    elemStore["".concat(prefix, "list")] = null;
+    elemStore["".concat(prefix, "xSpace")] = null;
+    elemStore["".concat(prefix, "repair")] = null;
+  },
   render: function render(h) {
     var _this = this;
 
@@ -31320,6 +31443,17 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     elemStore["".concat(prefix, "list")] = $refs.tfoot;
     elemStore["".concat(prefix, "xSpace")] = $refs.xSpace;
   },
+  destroyed: function destroyed() {
+    var $xetable = this.$parent,
+        fixedType = this.fixedType;
+    var elemStore = $xetable.elemStore;
+    var prefix = "".concat(fixedType || 'main', "-footer-");
+    elemStore["".concat(prefix, "wrapper")] = null;
+    elemStore["".concat(prefix, "table")] = null;
+    elemStore["".concat(prefix, "colgroup")] = null;
+    elemStore["".concat(prefix, "list")] = null;
+    elemStore["".concat(prefix, "xSpace")] = null;
+  },
   render: function render(h) {
     var _e = this._e,
         $xetable = this.$parent,
@@ -32135,7 +32269,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         proxyConfig = this.proxyConfig;
 
     if (proxyConfig && (data || proxyOpts.form && formOpts.data)) {
-      console.error('[vxe-grid] There is a conflict between the props proxy-config and data.');
+      UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
     }
 
     if (false) {}
@@ -32286,7 +32420,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
     handleActiveMethod: function handleActiveMethod(params) {
       var editConfig = this.editConfig;
       var activeMethod = editConfig ? editConfig.activeMethod : null;
-      return this.pendingRecords.indexOf(params.row) === -1 && (!activeMethod || activeMethod(params));
+      return this.pendingRecords.indexOf(params.row) === -1 && (!activeMethod || activeMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+        $grid: this
+      })));
     },
     initToolbar: function initToolbar() {
       var _this3 = this;
@@ -32496,6 +32632,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
                   sortList = defaultSort.map(function (item) {
                     return {
+                      field: item.field,
                       property: item.field,
                       order: item.order
                     };
@@ -36406,6 +36543,7 @@ function renderItems(h, _vm, itemList) {
       evnt.preventDefault();
 
       if (!this.preventSubmit) {
+        this.clearValidate();
         this.beginValidate(this.getItems()).then(function () {
           _this3.$emit('submit', {
             data: _this3.data,
@@ -36550,6 +36688,7 @@ function renderItems(h, _vm, itemList) {
       return this.$nextTick();
     },
     validate: function validate(callback) {
+      this.clearValidate();
       return this.beginValidate(this.getItems(), '', callback);
     },
     validateField: function validateField(field, callback) {
@@ -36566,7 +36705,6 @@ function renderItems(h, _vm, itemList) {
       var validRest = {};
       var validFields = [];
       var itemValids = [];
-      this.clearValidate();
       clearTimeout(this.showErrTime);
 
       if (data && formRules) {
@@ -37666,6 +37804,7 @@ var List = Object.assign(src_list, {
   name: 'VxePulldown',
   mixins: [size],
   props: {
+    value: Boolean,
     disabled: Boolean,
     placement: String,
     size: {
@@ -37689,6 +37828,15 @@ var List = Object.assign(src_list, {
       isActivated: false
     };
   },
+  watch: {
+    value: function value(_value) {
+      if (_value) {
+        this.showPanel();
+      } else {
+        this.hidePanel();
+      }
+    }
+  },
   created: function created() {
     GlobalEvent.on(this, 'mousewheel', this.handleGlobalMousewheelEvent);
     GlobalEvent.on(this, 'mousedown', this.handleGlobalMousedownEvent);
@@ -37829,6 +37977,8 @@ var List = Object.assign(src_list, {
           setTimeout(function () {
             _this.visiblePanel = true;
 
+            _this.$emit('update:input', true);
+
             _this.updatePlacement();
 
             setTimeout(function () {
@@ -37850,6 +38000,7 @@ var List = Object.assign(src_list, {
       var _this2 = this;
 
       this.visiblePanel = false;
+      this.$emit('update:input', false);
       return new Promise(function (resolve) {
         if (_this2.animatVisible) {
           _this2.hidePanelTimeout = setTimeout(function () {