vxe-table 4.6.20 → 4.6.22

package/lib/switch/style/style.css

@@ -1,28 +1,3 @@
-/*font*/
-/*size*/
-/*icon*/
-/*color*/
-/*input/radio/checkbox*/
-/*popup*/
-/*table*/
-/*filter*/
-/*menu*/
-/*loading*/
-/*validate*/
-/*grid*/
-/*toolbar*/
-/*tooltip*/
-/*pager*/
-/*modal*/
-/*checkbox*/
-/*radio*/
-/*button*/
-/*input*/
-/*textarea*/
-/*form*/
-/*select*/
-/*switch*/
-/*pulldown*/
 .vxe-switch {
   display: inline-block;
   color: var(--vxe-font-color);

package/lib/table/src/table.js

@@ -320,6 +320,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
+      // 列选取状态
+      columnStatusMaps: {},
+      // 行选取状态
+      rowStatusMaps: {},
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -5979,8 +5983,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const treeOpts = computeTreeOpts.value;
-        let {
-          fullDataRowIdData,
+        const {
           fullAllDataRowIdData,
           tableFullData,
           tableFullTreeData
@@ -5989,6 +5992,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;
@@ -6000,26 +6005,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