vxe-table 4.7.86 → 4.7.88

package/lib/table/src/table.js

@@ -391,13 +391,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return '';
     });
     const computeValidOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.validConfig, true), props.validConfig);
+      return Object.assign({}, getConfig().table.validConfig, props.validConfig);
     });
     const computeSXOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.scrollX, true), props.scrollX);
+      return Object.assign({}, getConfig().table.scrollX, props.scrollX);
     });
     const computeSYOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.scrollY, true), props.scrollY);
+      return Object.assign({}, getConfig().table.scrollY, props.scrollY);
     });
     const computeRowHeightMaps = (0, _vue.computed)(() => {
       return {
@@ -408,31 +408,31 @@ var _default = exports.default = (0, _vue.defineComponent)({
       };
     });
     const computeColumnOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.columnConfig, true), props.columnConfig);
+      return Object.assign({}, getConfig().table.columnConfig, props.columnConfig);
     });
     const computeRowOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.rowConfig, true), props.rowConfig);
+      return Object.assign({}, getConfig().table.rowConfig, props.rowConfig);
     });
     const computeResizeOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.resizeConfig, true), props.resizeConfig);
+      return Object.assign({}, getConfig().table.resizeConfig, props.resizeConfig);
     });
     const computeResizableOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.resizableConfig, true), props.resizableConfig);
+      return Object.assign({}, getConfig().table.resizableConfig, props.resizableConfig);
     });
     const computeSeqOpts = (0, _vue.computed)(() => {
       return Object.assign({
         startIndex: 0
-      }, _xeUtils.default.clone(getConfig().table.seqConfig, true), props.seqConfig);
+      }, getConfig().table.seqConfig, props.seqConfig);
     });
     const computeRadioOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.radioConfig, true), props.radioConfig);
+      return Object.assign({}, getConfig().table.radioConfig, props.radioConfig);
     });
     const computeCheckboxOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.checkboxConfig, true), props.checkboxConfig);
+      return Object.assign({}, getConfig().table.checkboxConfig, props.checkboxConfig);
     });
     let computeTooltipOpts = (0, _vue.ref)();
     computeTooltipOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().tooltip, true), _xeUtils.default.clone(getConfig().table.tooltipConfig, true), props.tooltipConfig);
+      return Object.assign({}, getConfig().tooltip, getConfig().table.tooltipConfig, props.tooltipConfig);
     });
     const computeTipConfig = (0, _vue.computed)(() => {
       const tooltipOpts = computeTooltipOpts.value;
@@ -445,33 +445,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }, tooltipOpts);
     });
     const computeEditOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.editConfig, true), props.editConfig);
+      return Object.assign({}, getConfig().table.editConfig, props.editConfig);
     });
     const computeSortOpts = (0, _vue.computed)(() => {
       return Object.assign({
         orders: ['asc', 'desc', null]
-      }, _xeUtils.default.clone(getConfig().table.sortConfig, true), props.sortConfig);
+      }, getConfig().table.sortConfig, props.sortConfig);
     });
     const computeFilterOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.filterConfig, true), props.filterConfig);
+      return Object.assign({}, getConfig().table.filterConfig, props.filterConfig);
     });
     const computeMouseOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.mouseConfig, true), props.mouseConfig);
+      return Object.assign({}, getConfig().table.mouseConfig, props.mouseConfig);
     });
     const computeAreaOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.areaConfig, true), props.areaConfig);
+      return Object.assign({}, getConfig().table.areaConfig, props.areaConfig);
     });
     const computeKeyboardOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.keyboardConfig, true), props.keyboardConfig);
+      return Object.assign({}, getConfig().table.keyboardConfig, props.keyboardConfig);
     });
     const computeClipOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.clipConfig, true), props.clipConfig);
+      return Object.assign({}, getConfig().table.clipConfig, props.clipConfig);
     });
     const computeFNROpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.fnrConfig, true), props.fnrConfig);
+      return Object.assign({}, getConfig().table.fnrConfig, props.fnrConfig);
     });
     const computeMenuOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.menuConfig, true), props.menuConfig);
+      return Object.assign({}, getConfig().table.menuConfig, props.menuConfig);
     });
     const computeHeaderMenu = (0, _vue.computed)(() => {
       const menuOpts = computeMenuOpts.value;
@@ -508,31 +508,31 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return rest;
     });
     const computeExportOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.exportConfig, true), props.exportConfig);
+      return Object.assign({}, getConfig().table.exportConfig, props.exportConfig);
     });
     const computeImportOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.importConfig, true), props.importConfig);
+      return Object.assign({}, getConfig().table.importConfig, props.importConfig);
     });
     const computePrintOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.printConfig, true), props.printConfig);
+      return Object.assign({}, getConfig().table.printConfig, props.printConfig);
     });
     const computeExpandOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.expandConfig, true), props.expandConfig);
+      return Object.assign({}, getConfig().table.expandConfig, props.expandConfig);
     });
     const computeTreeOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.treeConfig, true), props.treeConfig);
+      return Object.assign({}, getConfig().table.treeConfig, props.treeConfig);
     });
     const computeEmptyOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.emptyRender, true), props.emptyRender);
+      return Object.assign({}, getConfig().table.emptyRender, props.emptyRender);
     });
     const computeLoadingOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.loadingConfig, true), props.loadingConfig);
+      return Object.assign({}, getConfig().table.loadingConfig, props.loadingConfig);
     });
     const computeCellOffsetWidth = (0, _vue.computed)(() => {
       return props.border ? Math.max(2, Math.ceil(reactData.scrollbarWidth / reactData.tableColumn.length)) : 1;
     });
     const computeCustomOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().table.customConfig, true), props.customConfig);
+      return Object.assign({}, getConfig().table.customConfig, props.customConfig);
     });
     const computeAutoWidthColumnList = (0, _vue.computed)(() => {
       const {
@@ -807,7 +807,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         visibleSize: 8
       };
     };
-    const calculateMergerOffserIndex = (list, offsetItem, type) => {
+    const calculateMergerOffsetIndex = (list, offsetItem, type) => {
       for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
         const mergeItem = list[mcIndex];
         const {
@@ -1190,7 +1190,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 });
               } else {
                 const labelEl = cellEl.firstChild;
-                titleWidth = labelEl.offsetWidth;
+                if (labelEl) {
+                  titleWidth = labelEl.offsetWidth;
+                }
               }
               if (titleWidth) {
                 colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
@@ -1470,6 +1472,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         treeExpandedMaps
       } = reactData;
       const treeOpts = computeTreeOpts.value;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
       if (treeConfig && treeOpts.transform) {
         const fullData = [];
         const expandMaps = {};
@@ -1481,7 +1484,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             fullData.push(row);
           }
         }, {
-          children: treeOpts.mapChildrenField
+          children: childrenField
         });
         internalData.afterFullData = fullData;
         updateScrollYStatus(fullData);
@@ -1505,6 +1508,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const filterOpts = computeFilterOpts.value;
       const sortOpts = computeSortOpts.value;
       const treeOpts = computeTreeOpts.value;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
         transform
       } = treeOpts;
@@ -1619,9 +1623,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           };
           if (treeConfig && transform) {
             // 筛选虚拟树
-            tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, Object.assign(Object.assign({}, treeOpts), {
-              original: true
-            }));
+            tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, {
+              original: true,
+              isEvery: true,
+              children: treeOpts.mapChildrenField,
+              mapChildren: childrenField
+            });
             tableData = tableTree;
           } else {
             tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
@@ -1630,9 +1637,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           if (treeConfig && transform) {
             // 还原虚拟树
-            tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, Object.assign(Object.assign({}, treeOpts), {
-              original: true
-            }));
+            tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
+              original: true,
+              isEvery: true,
+              children: treeOpts.mapChildrenField,
+              mapChildren: childrenField
+            });
             tableData = tableTree;
           } else {
             tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
@@ -1678,9 +1688,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } else {
         if (treeConfig && transform) {
           // 还原虚拟树
-          tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, Object.assign(Object.assign({}, treeOpts), {
-            original: true
-          }));
+          tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
+            original: true,
+            isEvery: true,
+            children: treeOpts.mapChildrenField,
+            mapChildren: childrenField
+          });
           tableData = tableTree;
         } else {
           tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
@@ -2779,7 +2792,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
         endIndex: toVisibleIndex + visibleSize + offsetSize
       };
-      calculateMergerOffserIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
+      calculateMergerOffsetIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
       const {
         startIndex: offsetStartIndex,
         endIndex: offsetEndIndex
@@ -3113,7 +3126,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
         endIndex: toVisibleIndex + visibleSize + offsetSize
       };
-      calculateMergerOffserIndex(mergeList, offsetItem, 'row');
+      calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
       const {
         startIndex: offsetStartIndex,
         endIndex: offsetEndIndex
@@ -6249,8 +6262,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const treeOpts = computeTreeOpts.value;
-        let {
-          fullDataRowIdData,
+        const {
           fullAllDataRowIdData,
           tableFullData,
           tableFullTreeData
@@ -6259,6 +6271,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const rowkey = (0, _util.getRowkey)($xeTable);
         const isLazy = treeConfig && treeOpts.lazy;
+        const fullAllDataRowIdMaps = {};
+        const fullDataRowIdMaps = {};
         const handleRow = (row, index, items, path, parent, nodes) => {
           let rowid = (0, _util.getRowid)($xeTable, row);
           const seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
@@ -6270,26 +6284,30 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (isLazy && row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
             row[childrenField] = null;
           }
-          const rest = {
-            row,
-            rowid,
-            seq,
-            index: treeConfig && parent ? -1 : index,
-            _index: -1,
-            $index: -1,
-            items,
-            parent,
-            level
-          };
+          let cacheItem = fullAllDataRowIdData[rowid];
+          if (!cacheItem) {
+            cacheItem = {
+              row,
+              rowid,
+              seq,
+              index: -1,
+              _index: -1,
+              $index: -1,
+              items,
+              parent,
+              level
+            };
+          }
           if (isSource) {
-            fullDataRowIdData[rowid] = rest;
+            cacheItem.index = treeConfig && parent ? -1 : index;
+            fullDataRowIdMaps[rowid] = cacheItem;
           }
-          fullAllDataRowIdData[rowid] = rest;
+          fullAllDataRowIdMaps[rowid] = cacheItem;
         };
         if (isSource) {
-          fullDataRowIdData = internalData.fullDataRowIdData = {};
+          internalData.fullDataRowIdData = fullDataRowIdMaps;
         }
-        fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
           _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
             children: childrenField