vxe-table 3.7.0-beta.8 → 3.7.0-beta.9

package/lib/index.umd.js

@@ -10740,9 +10740,9 @@ var iconPrefix = 'vxe-icon-';
     treeConfig: {
       rowField: 'id',
       parentField: 'parentId',
-      children: 'children',
-      hasChild: 'hasChild',
-      mapChildren: '_X_ROW_CHILD',
+      childrenField: 'children',
+      hasChildField: 'hasChild',
+      mapChildrenField: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -12096,12 +12096,7 @@ var VXECommandsStore = /*#__PURE__*/function () {
     value: function add(name, render) {
       var conf = this.store[name];
       // 兼容
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
-        render = {
-          commandMethod: render
-        };
-      }
+      if (false) {}
 
       // 检测是否覆盖
       if (false) { var confKeys; }
@@ -12154,12 +12149,7 @@ var VXEMenusStore = /*#__PURE__*/function () {
     value: function add(name, render) {
       var conf = this.store[name];
       // 兼容
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
-        render = {
-          menuMethod: render
-        };
-      }
+      if (false) {}
 
       // 检测是否覆盖
       if (false) { var confKeys; }
@@ -12212,12 +12202,7 @@ var VXEFormatsStore = /*#__PURE__*/function () {
     value: function add(name, render) {
       var conf = this.store[name];
       // 兼容
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
-        render = {
-          formatMethod: render
-        };
-      }
+      if (false) {}
 
       // 检测是否覆盖
       if (false) { var confKeys; }
@@ -13024,7 +13009,7 @@ function countTreeExpand(prevRow, params) {
     return count;
   }
   var $table = params.$table;
-  var rowChildren = prevRow[$table.treeOpts.children];
+  var rowChildren = prevRow[$table.treeOpts.childrenField || $table.treeOpts.children];
   if ($table.isTreeExpandByRow(prevRow)) {
     for (var index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params);
@@ -13222,7 +13207,7 @@ function renderLine(h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
   }
-  if (treeConfig && treeNode && treeOpts.line) {
+  if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       "class": 'vxe-tree--line-wrapper'
     }, [h('div', {
@@ -13550,7 +13535,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       isNewRow = $xetable.isInsertByRow(row);
     }
     if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      rowChildren = row[treeOpts.children];
+      rowChildren = row[treeOpts.childrenField || treeOpts.children];
       isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1;
     }
     rows.push(h('tr', {
@@ -14986,7 +14971,9 @@ var Cell = {
       column = params.column,
       level = params.level;
     var slots = column.slots;
-    var children = treeOpts.children,
+    var childrenField = treeOpts.childrenField,
+      children = treeOpts.children,
+      hasChildField = treeOpts.hasChildField,
       hasChild = treeOpts.hasChild,
       indent = treeOpts.indent,
       lazy = treeOpts.lazy,
@@ -14995,7 +14982,7 @@ var Cell = {
       showIcon = treeOpts.showIcon,
       iconOpen = treeOpts.iconOpen,
       iconClose = treeOpts.iconClose;
-    var rowChilds = row[children];
+    var rowChilds = row[childrenField || children];
     var hasLazyChilds = false;
     var isAceived = false;
     var isLazyLoaded = false;
@@ -15007,7 +14994,7 @@ var Cell = {
       isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1;
       if (lazy) {
         isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1;
-        hasLazyChilds = row[hasChild];
+        hasLazyChilds = row[hasChildField || hasChild];
       }
     }
     if (!trigger || trigger === 'default') {
@@ -16038,8 +16025,8 @@ var Methods = {
         treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: treeOpts.childrenField || treeOpts.children,
+          mapChildren: treeOpts.mapChildrenField
         });
         fullData = treeData.slice(0);
       } else {
@@ -16257,8 +16244,8 @@ var Methods = {
         rowid = getRowUniqueId();
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
       }
-      if (isLazy && row[treeOpts.hasChild] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null;
+      if (isLazy && row[treeOpts.hasChildField || treeOpts.hasChild] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[treeOpts.childrenField || treeOpts.children])) {
+        row[treeOpts.childrenField || treeOpts.children] = null;
       }
       var rest = {
         row: row,
@@ -16327,8 +16314,9 @@ var Methods = {
       fullAllDataRowMap = this.fullAllDataRowMap,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
     var transform = treeOpts.transform,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
     var rest = fullAllDataRowIdData[getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
@@ -16338,7 +16326,7 @@ var Methods = {
           return rowid === getRowid(_this12, item);
         }, treeOpts);
         if (matchObj) {
-          matchObj.item[children] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
+          matchObj.item[childrenField || children] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
         }
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
@@ -16359,9 +16347,9 @@ var Methods = {
         fullAllDataRowIdData[rowid] = rest;
         fullAllDataRowMap.set(childRow, rest);
       }, treeOpts);
-      row[children] = rows;
+      row[childrenField || children] = rows;
       if (transform) {
-        row[mapChildren] = rows;
+        row[mapChildrenField] = rows;
       }
       _this12.updateAfterDataIndex();
       return rows;
@@ -16616,8 +16604,8 @@ var Methods = {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, key, null);
         }
       });
-      if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null;
+      if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[treeOpts.childrenField || treeOpts.children])) {
+        record[treeOpts.childrenField || treeOpts.children] = null;
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if (eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, rowkey))) {
@@ -16834,8 +16822,9 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData,
       afterTreeFullData = this.afterTreeFullData;
     var transform = treeOpts.transform,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
     var checkField = checkboxOpts.checkField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
@@ -16844,7 +16833,7 @@ var Methods = {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField || children
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -16857,7 +16846,7 @@ var Methods = {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
           return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField || children
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -16886,7 +16875,7 @@ var Methods = {
           fullData.push(row);
         }
       }, {
-        children: treeOpts.mapChildren
+        children: treeOpts.mapChildrenField
       });
       this.afterFullData = fullData;
       this.updateScrollYStatus(fullData);
@@ -17137,7 +17126,7 @@ var Methods = {
           fullDataRowIdData[rowid] = rest;
         }
       }, {
-        children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children
+        children: treeOpts.transform ? treeOpts.mapChildrenField : treeOpts.childrenField || treeOpts.children
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -20461,8 +20450,9 @@ var Methods = {
       treeLazyLoadeds = this.treeLazyLoadeds;
     var transform = treeOpts.transform,
       lazy = treeOpts.lazy,
+      hasChildField = treeOpts.hasChildField,
       hasChild = treeOpts.hasChild;
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+    if (lazy && row[hasChildField || hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
         return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
@@ -20601,10 +20591,11 @@ var Methods = {
     var tableFullData = this.tableFullData,
       treeOpts = this.treeOpts;
     var lazy = treeOpts.lazy,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children;
     var expandeds = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (row) {
-      var rowChildren = row[children];
+      var rowChildren = row[childrenField || children];
       if (lazy || rowChildren && rowChildren.length) {
         expandeds.push(row);
       }
@@ -20627,7 +20618,9 @@ var Methods = {
       treeNodeColumn = this.treeNodeColumn;
     var reserve = treeOpts.reserve,
       lazy = treeOpts.lazy,
+      hasChildField = treeOpts.hasChildField,
       hasChild = treeOpts.hasChild,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children,
       accordion = treeOpts.accordion,
       toggleMethod = treeOpts.toggleMethod;
@@ -20659,12 +20652,12 @@ var Methods = {
       validRows.forEach(function (row) {
         if (treeExpandeds.indexOf(row) === -1) {
           var rest = fullAllDataRowMap.get(row);
-          var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
+          var isLoad = lazy && row[hasChildField || hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
           // 是否使用懒加载
           if (isLoad) {
             result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
-            if (row[children] && row[children].length) {
+            if (row[childrenField || children] && row[childrenField || children].length) {
               treeExpandeds.push(row);
             }
           }
@@ -21350,10 +21343,10 @@ var Methods = {
       };
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
         var gFormatOpts = formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams) : '';
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
       } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
         var _gFormatOpts = formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.formatMethod ? _gFormatOpts.formatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }
@@ -22542,7 +22535,7 @@ function handleUupdateResize(_vm) {
     var leftList = columnStore.leftList,
       rightList = columnStore.rightList;
     return h('div', {
-      "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && treeOpts.line), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
+      "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
       on: {
         keydown: this.keydownEvent
       }
@@ -23760,8 +23753,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     treeOpts = _vm.treeOpts;
   var rowField = treeOpts.rowField,
     parentField = treeOpts.parentField,
+    childrenField = treeOpts.childrenField,
     children = treeOpts.children,
-    mapChildren = treeOpts.mapChildren;
+    mapChildrenField = treeOpts.mapChildrenField;
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
     var parentRowId = item[parentField];
@@ -23769,15 +23763,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
       return parentRowId === item[rowField];
     }, {
-      children: mapChildren
+      children: mapChildrenField
     }) : null;
     if (matchObj) {
       var parentRow = matchObj.item;
       var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
-      var parentChilds = parentRow[children];
+      var parentChilds = parentRow[childrenField || children];
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
-        parentChilds = parentRow[children] = [];
+        parentChilds = parentRow[childrenField || children] = [];
       }
       parentChilds[funcName](item);
       var rest = {
@@ -23844,7 +23838,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         treeOpts = this.treeOpts;
       var transform = treeOpts.transform,
         rowField = treeOpts.rowField,
-        mapChildren = treeOpts.mapChildren;
+        mapChildrenField = treeOpts.mapChildrenField;
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
         records = [records];
       }
@@ -23889,7 +23883,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
               return row[rowField] === item[rowField];
             }, {
-              children: mapChildren
+              children: mapChildrenField
             });
             if (matchObj) {
               var parentRow = matchObj.parent;
@@ -30312,7 +30306,7 @@ function getExportBlobByContent(content, options) {
 }
 function hasTreeChildren($xetable, row) {
   var treeOpts = $xetable.treeOpts;
-  return row[treeOpts.children] && row[treeOpts.children].length > 0;
+  return row[treeOpts.childrenField || treeOpts.children] && row[treeOpts.childrenField || treeOpts.children].length > 0;
 }
 function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
   var seqOpts = $xetable.seqOpts;
@@ -32455,12 +32449,14 @@ function validErrorRuleValue(rule, val) {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate: function _fullValidate(rows, cb) {
+      if (false) {}
       return this.beginValidate(rows, cb, true);
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate: function _validate(rows, cb) {
+      if (false) {}
       return this.beginValidate(rows, cb);
     },
     /**
@@ -34963,7 +34959,8 @@ function renderCustoms(h, _vm) {
   created: function created() {
     var _this = this;
     var refresh = this.refresh,
-      refreshOpts = this.refreshOpts;
+      refreshOpts = this.refreshOpts,
+      customOpts = this.customOpts;
     this.$nextTick(function () {
       var $xetable = _this.fintTable();
       var queryMethod = refreshOpts.queryMethod || refreshOpts.query;