vxe-table 3.9.10 → 3.9.12

package/lib/table/src/methods.js

@@ -754,7 +754,6 @@ const Methods = {
       treeOpts,
       tableFullData,
       fullAllDataRowIdData,
-      fullAllDataRowMap,
       tableFullTreeData
     } = this;
     const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -798,7 +797,6 @@ const Methods = {
       this.fullDataRowIdData = fullDataRowIdMaps;
     }
     this.fullAllDataRowIdData = fullAllDataRowIdMaps;
-    fullAllDataRowMap.clear();
     if (treeConfig) {
       _xeUtils.default.eachTree(tableFullTreeData, handleCache, {
         children: childrenField
@@ -842,13 +840,12 @@ const Methods = {
     return this.params;
   },
   loadTreeChildren(row, childRecords) {
+    const $xeTable = this;
     const {
       keepSource,
       tableSourceData,
       treeOpts,
       fullDataRowIdData,
-      fullDataRowMap,
-      fullAllDataRowMap,
       fullAllDataRowIdData,
       sourceDataRowIdData
     } = this;
@@ -857,8 +854,8 @@ const Methods = {
       mapChildrenField
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const rest = fullAllDataRowIdData[(0, _util.getRowid)(this, row)];
-    const parentLevel = rest ? rest.level : 0;
+    const parentRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, row)];
+    const parentLevel = parentRest ? parentRest.level : 0;
     return this.createData(childRecords).then(rows => {
       if (keepSource) {
         const rowid = (0, _util.getRowid)(this, row);
@@ -874,8 +871,8 @@ const Methods = {
         });
       }
       _xeUtils.default.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
-        const rowid = (0, _util.getRowid)(this, childRow);
-        const parentRow = parent || row;
+        const rowid = (0, _util.getRowid)($xeTable, childRow);
+        const parentRow = parent || parentRest.row;
         const rest = {
           row: childRow,
           rowid,
@@ -888,9 +885,7 @@ const Methods = {
           level: parentLevel + nodes.length
         };
         fullDataRowIdData[rowid] = rest;
-        fullDataRowMap.set(childRow, rest);
         fullAllDataRowIdData[rowid] = rest;
-        fullAllDataRowMap.set(childRow, rest);
       }, {
         children: childrenField
       });
@@ -1415,6 +1410,7 @@ const Methods = {
     return null;
   },
   getCellLabel(row, fieldOrColumn) {
+    const $xeTable = this;
     const column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
     if (!column) {
       return null;
@@ -1423,17 +1419,17 @@ const Methods = {
     const cellValue = (0, _util.getCellValue)(row, column);
     let cellLabel = cellValue;
     if (formatter) {
-      let rest, formatData;
+      let formatData;
       const {
-        fullAllDataRowMap
-      } = this;
+        fullAllDataRowIdData
+      } = $xeTable;
+      const rowid = (0, _util.getRowid)($xeTable, row);
       const colid = column.id;
-      const cacheFormat = fullAllDataRowMap.has(row);
-      if (cacheFormat) {
-        rest = fullAllDataRowMap.get(row);
+      const rest = fullAllDataRowIdData[rowid];
+      if (rest) {
         formatData = rest.formatData;
         if (!formatData) {
-          formatData = fullAllDataRowMap.get(row).formatData = {};
+          formatData = fullAllDataRowIdData[rowid].formatData = {};
         }
         if (rest && formatData[colid]) {
           if (formatData[colid].value === cellValue) {
@@ -1975,8 +1971,9 @@ const Methods = {
    * @param {Row} row 行对象
    */
   getRowid(row) {
-    const fullAllDataRowMap = this.fullAllDataRowMap;
-    return fullAllDataRowMap.has(row) ? fullAllDataRowMap.get(row).rowid : null;
+    const $xeTable = this;
+    const rowid = _xeUtils.default.get(row, (0, _util.getRowkey)($xeTable));
+    return _xeUtils.default.eqNull(rowid) ? '' : encodeURIComponent(rowid);
   },
   /**
    * 获取处理后的表格数据
@@ -4611,12 +4608,13 @@ const Methods = {
   },
   // 还原展开、选中等相关状态
   handleReserveStatus() {
+    const $xeTable = this;
     const {
       expandColumn,
       treeOpts,
       treeConfig,
       fullDataRowIdData,
-      fullAllDataRowMap,
+      fullAllDataRowIdData,
       currentRow,
       selectRadioRow,
       radioReserveRow,
@@ -4628,7 +4626,7 @@ const Methods = {
       expandOpts
     } = this;
     // 单选框
-    if (selectRadioRow && !fullAllDataRowMap.has(selectRadioRow)) {
+    if (selectRadioRow && !fullAllDataRowIdData[(0, _util.getRowid)($xeTable, selectRadioRow)]) {
       this.selectRadioRow = null; // 刷新单选行状态
     }
     // 还原保留选中状态
@@ -4644,7 +4642,7 @@ const Methods = {
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
     }
-    if (currentRow && !fullAllDataRowMap.has(currentRow)) {
+    if (currentRow && !this.fullAllDataRowIdData[(0, _util.getRowid)($xeTable, currentRow)]) {
       this.currentRow = null; // 刷新当前行状态
     }
     // 行展开
@@ -5546,20 +5544,25 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isRowExpandLoaded(row) {
-    const rest = this.fullAllDataRowMap.get(row);
-    return rest && rest.expandLoaded;
+    const $xeTable = this;
+    const {
+      fullAllDataRowIdData
+    } = this;
+    const rest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, row)];
+    return rest && !!rest.expandLoaded;
   },
   clearRowExpandLoaded(row) {
+    const $xeTable = this;
     const {
       expandOpts,
       rowExpandLazyLoadedMaps,
-      fullAllDataRowMap
+      fullAllDataRowIdData
     } = this;
     const {
       lazy
     } = expandOpts;
-    const rowid = (0, _util.getRowid)(this, row);
-    const rest = fullAllDataRowMap.get(row);
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    const rest = fullAllDataRowIdData[rowid];
     if (lazy && rest) {
       rest.expandLoaded = false;
       const rowTempExpandLazyLoadedMaps = Object.assign({}, rowExpandLazyLoadedMaps);
@@ -5687,48 +5690,43 @@ const Methods = {
     return this.setRowExpand(expandedRows, expanded);
   },
   handleAsyncRowExpand(row) {
-    const {
-      fullAllDataRowMap,
-      expandOpts
-    } = this;
-    const rest = fullAllDataRowMap.get(row);
+    const $xeTable = this;
     return new Promise(resolve => {
+      const {
+        expandOpts
+      } = this;
       const {
         loadMethod
       } = expandOpts;
       if (loadMethod) {
         const {
-          rowExpandLazyLoadedMaps
+          rowExpandLazyLoadedMaps,
+          fullAllDataRowIdData
         } = this;
-        const rowTempExpandLazyLoadedMaps = Object.assign({}, rowExpandLazyLoadedMaps);
-        const rowid = (0, _util.getRowid)(this, row);
-        rowTempExpandLazyLoadedMaps[rowid] = row;
-        this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rest = fullAllDataRowIdData[rowid];
+        rowExpandLazyLoadedMaps[rowid] = row;
         loadMethod({
-          $table: this,
+          $table: $xeTable,
           row,
           rowIndex: this.getRowIndex(row),
           $rowIndex: this.getVMRowIndex(row)
         }).then(() => {
-          rest.expandLoaded = true;
           const {
             rowExpandedMaps
           } = this;
-          const rowTempExpandedMaps = Object.assign({}, rowExpandedMaps);
-          rowTempExpandedMaps[rowid] = row;
-          this.rowExpandedMaps = rowTempExpandedMaps;
+          rest.expandLoaded = true;
+          rowExpandedMaps[rowid] = row;
         }).catch(() => {
           rest.expandLoaded = false;
         }).finally(() => {
           const {
             rowExpandLazyLoadedMaps
           } = this;
-          const rowTempExpandLazyLoadedMaps = Object.assign({}, rowExpandLazyLoadedMaps);
-          if (rowTempExpandLazyLoadedMaps[rowid]) {
-            delete rowTempExpandLazyLoadedMaps[rowid];
+          if (rowExpandLazyLoadedMaps[rowid]) {
+            delete rowExpandLazyLoadedMaps[rowid];
           }
-          this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
-          resolve(this.$nextTick().then(this.recalculate));
+          this.$nextTick().then(() => this.recalculate()).then(() => resolve());
         });
       } else {
         resolve();
@@ -5899,21 +5897,26 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isTreeExpandLoaded(row) {
-    const rest = this.fullAllDataRowMap.get(row);
-    return rest && rest.treeLoaded;
+    const $xeTable = this;
+    const {
+      fullAllDataRowIdData
+    } = this;
+    const rest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, row)];
+    return rest && !!rest.treeLoaded;
   },
   clearTreeExpandLoaded(row) {
+    const $xeTable = this;
     const {
       treeOpts,
       treeExpandedMaps,
-      fullAllDataRowMap
+      fullAllDataRowIdData
     } = this;
     const {
       transform,
       lazy
     } = treeOpts;
-    const rowid = (0, _util.getRowid)(this, row);
-    const rest = fullAllDataRowMap.get(row);
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    const rest = fullAllDataRowIdData[rowid];
     if (lazy && rest) {
       rest.treeLoaded = false;
       if (treeExpandedMaps[rowid]) {
@@ -6036,6 +6039,7 @@ const Methods = {
     }
   },
   handleAsyncTreeExpandChilds(row) {
+    const $xeTable = this;
     const {
       treeOpts,
       checkboxOpts
@@ -6050,20 +6054,19 @@ const Methods = {
     return new Promise(resolve => {
       if (loadMethod) {
         const {
-          fullAllDataRowMap,
-          treeExpandLazyLoadedMaps
+          treeExpandLazyLoadedMaps,
+          fullAllDataRowIdData
         } = this;
-        const rowid = (0, _util.getRowid)(this, row);
-        const rest = fullAllDataRowMap.get(row);
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rest = fullAllDataRowIdData[rowid];
         treeExpandLazyLoadedMaps[rowid] = row;
-        loadMethod({
-          $table: this,
+        Promise.resolve(loadMethod({
+          $table: $xeTable,
           row
-        }).then(childRecords => {
-          // 响应成功后则展开行，并将子节点挂载到该节点下
+        })).then(childRecords => {
           rest.treeLoaded = true;
           if (treeExpandLazyLoadedMaps[rowid]) {
-            treeExpandLazyLoadedMaps[rowid] = null;
+            delete treeExpandLazyLoadedMaps[rowid];
           }
           if (!_xeUtils.default.isArray(childRecords)) {
             childRecords = [];
@@ -6073,14 +6076,12 @@ const Methods = {
               const {
                 treeExpandedMaps
               } = this;
-              const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-              if (childRows.length && !treeTempExpandedMaps[rowid]) {
-                treeTempExpandedMaps[rowid] = row;
-                this.treeExpandedMaps = treeTempExpandedMaps;
+              if (childRows.length && !treeExpandedMaps[rowid]) {
+                treeExpandedMaps[rowid] = row;
               }
               // 如果当前节点已选中，则展开后子节点也被选中
               if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
-                this.handleCheckedCheckboxRow(childRows, true, true);
+                this.handleCheckedCheckboxRow(childRows, true);
               }
               return this.$nextTick().then(() => {
                 if (transform) {
@@ -6090,13 +6091,12 @@ const Methods = {
             });
           }
         }).catch(() => {
-          // 如果响应异常，则不展开，再次点击后将重新触发懒加载
-          rest.treeLoaded = false;
           const {
             treeExpandLazyLoadedMaps
           } = this;
+          rest.treeLoaded = false;
           if (treeExpandLazyLoadedMaps[rowid]) {
-            treeExpandLazyLoadedMaps[rowid] = null;
+            delete treeExpandLazyLoadedMaps[rowid];
           }
         }).finally(() => {
           this.$nextTick().then(() => this.recalculate()).then(() => resolve());
@@ -6138,7 +6138,7 @@ const Methods = {
    */
   handleBaseTreeExpand(rows, expanded) {
     const {
-      fullAllDataRowMap,
+      fullAllDataRowIdData,
       tableFullData,
       treeExpandedMaps,
       treeOpts,
@@ -6183,7 +6183,7 @@ const Methods = {
       validRows.forEach(row => {
         const rowid = (0, _util.getRowid)(this, row);
         if (!treeTempExpandedMaps[rowid]) {
-          const rest = fullAllDataRowMap.get(row);
+          const rest = fullAllDataRowIdData[rowid];
           const isLoad = lazy && row[hasChildField] && !rest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
           // 是否使用懒加载
           if (isLoad) {