vxe-table 3.4.12 → 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,
@@ -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,
@@ -14323,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;
 
@@ -14349,7 +14370,8 @@ var Methods = {
       if (!allRemoteSort && sortable && order) {
         orderColumns.push({
           column: column,
-          property: column.property,
+          field: column.property,
+          property: property,
           order: order
         });
       }
@@ -16065,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,
@@ -17666,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
         });
       }
@@ -21469,6 +21495,7 @@ var Menu = {
 
 
 
+
 var mixin_getRowid = UtilTools.getRowid;
 
 function insertTreeRow(_vm, newRecords, isAppend) {
@@ -22022,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);
@@ -23205,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();
 
@@ -28041,6 +28070,7 @@ var es_string_repeat = __webpack_require__("38cf");
 
 
 
+
 
 
 var mixin_formatText = UtilTools.formatText; // 默认导出或打印的 HTML 样式
@@ -28076,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
     });
   }
 
@@ -28113,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,
@@ -28127,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;
 
@@ -28139,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;
@@ -28162,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':
@@ -28211,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;
@@ -28238,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':
@@ -31027,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;
 
@@ -31396,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,
@@ -32362,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;
@@ -32572,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
                     };
@@ -36482,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,
@@ -36626,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) {
@@ -36642,7 +36705,6 @@ function renderItems(h, _vm, itemList) {
       var validRest = {};
       var validFields = [];
       var itemValids = [];
-      this.clearValidate();
       clearTimeout(this.showErrTime);
 
       if (data && formRules) {
@@ -37742,6 +37804,7 @@ var List = Object.assign(src_list, {
   name: 'VxePulldown',
   mixins: [size],
   props: {
+    value: Boolean,
     disabled: Boolean,
     placement: String,
     size: {
@@ -37765,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);
@@ -37905,6 +37977,8 @@ var List = Object.assign(src_list, {
           setTimeout(function () {
             _this.visiblePanel = true;
 
+            _this.$emit('update:input', true);
+
             _this.updatePlacement();
 
             setTimeout(function () {
@@ -37926,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 () {