vxe-table 3.9.10 → 3.9.11

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.10";
+const version = "3.9.11";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.10";
+core_.VxeUI.tableVersion = "3.9.11";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.9.10"}`;
+const log_version = `table v${"3.9.11"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5412,7 +5412,6 @@ const Methods = {
       treeOpts,
       tableFullData,
       fullAllDataRowIdData,
-      fullAllDataRowMap,
       tableFullTreeData
     } = this;
     const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -5456,7 +5455,6 @@ const Methods = {
       this.fullDataRowIdData = fullDataRowIdMaps;
     }
     this.fullAllDataRowIdData = fullAllDataRowIdMaps;
-    fullAllDataRowMap.clear();
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, {
         children: childrenField
@@ -5500,13 +5498,12 @@ const Methods = {
     return this.params;
   },
   loadTreeChildren(row, childRecords) {
+    const $xeTable = this;
     const {
       keepSource,
       tableSourceData,
       treeOpts,
       fullDataRowIdData,
-      fullDataRowMap,
-      fullAllDataRowMap,
       fullAllDataRowIdData,
       sourceDataRowIdData
     } = this;
@@ -5515,8 +5512,8 @@ const Methods = {
       mapChildrenField
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const rest = fullAllDataRowIdData[getRowid(this, row)];
-    const parentLevel = rest ? rest.level : 0;
+    const parentRest = fullAllDataRowIdData[getRowid($xeTable, row)];
+    const parentLevel = parentRest ? parentRest.level : 0;
     return this.createData(childRecords).then(rows => {
       if (keepSource) {
         const rowid = getRowid(this, row);
@@ -5532,8 +5529,8 @@ const Methods = {
         });
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, (childRow, index, items, path, parent, nodes) => {
-        const rowid = getRowid(this, childRow);
-        const parentRow = parent || row;
+        const rowid = getRowid($xeTable, childRow);
+        const parentRow = parent || parentRest.row;
         const rest = {
           row: childRow,
           rowid,
@@ -5546,9 +5543,7 @@ const Methods = {
           level: parentLevel + nodes.length
         };
         fullDataRowIdData[rowid] = rest;
-        fullDataRowMap.set(childRow, rest);
         fullAllDataRowIdData[rowid] = rest;
-        fullAllDataRowMap.set(childRow, rest);
       }, {
         children: childrenField
       });
@@ -6073,6 +6068,7 @@ const Methods = {
     return null;
   },
   getCellLabel(row, fieldOrColumn) {
+    const $xeTable = this;
     const column = handleFieldOrColumn(this, fieldOrColumn);
     if (!column) {
       return null;
@@ -6081,17 +6077,17 @@ const Methods = {
     const cellValue = getCellValue(row, column);
     let cellLabel = cellValue;
     if (formatter) {
-      let rest, formatData;
+      let formatData;
       const {
-        fullAllDataRowMap
-      } = this;
+        fullAllDataRowIdData
+      } = $xeTable;
+      const rowid = 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) {
@@ -6633,8 +6629,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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xeTable));
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowid) ? '' : encodeURIComponent(rowid);
   },
   /**
    * 获取处理后的表格数据
@@ -9271,12 +9268,13 @@ const Methods = {
   },
   // 还原展开、选中等相关状态
   handleReserveStatus() {
+    const $xeTable = this;
     const {
       expandColumn,
       treeOpts,
       treeConfig,
       fullDataRowIdData,
-      fullAllDataRowMap,
+      fullAllDataRowIdData,
       currentRow,
       selectRadioRow,
       radioReserveRow,
@@ -9288,7 +9286,7 @@ const Methods = {
       expandOpts
     } = this;
     // 单选框
-    if (selectRadioRow && !fullAllDataRowMap.has(selectRadioRow)) {
+    if (selectRadioRow && !fullAllDataRowIdData[getRowid($xeTable, selectRadioRow)]) {
       this.selectRadioRow = null; // 刷新单选行状态
     }
     // 还原保留选中状态
@@ -9304,7 +9302,7 @@ const Methods = {
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
     }
-    if (currentRow && !fullAllDataRowMap.has(currentRow)) {
+    if (currentRow && !this.fullAllDataRowIdData[getRowid($xeTable, currentRow)]) {
       this.currentRow = null; // 刷新当前行状态
     }
     // 行展开
@@ -10212,20 +10210,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[getRowid($xeTable, row)];
+    return rest && !!rest.expandLoaded;
   },
   clearRowExpandLoaded(row) {
+    const $xeTable = this;
     const {
       expandOpts,
       rowExpandLazyLoadedMaps,
-      fullAllDataRowMap
+      fullAllDataRowIdData
     } = this;
     const {
       lazy
     } = expandOpts;
-    const rowid = getRowid(this, row);
-    const rest = fullAllDataRowMap.get(row);
+    const rowid = getRowid($xeTable, row);
+    const rest = fullAllDataRowIdData[rowid];
     if (lazy && rest) {
       rest.expandLoaded = false;
       const rowTempExpandLazyLoadedMaps = {
@@ -10355,54 +10358,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 = {
-          ...rowExpandLazyLoadedMaps
-        };
-        const rowid = getRowid(this, row);
-        rowTempExpandLazyLoadedMaps[rowid] = row;
-        this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+        const rowid = 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 = {
-            ...rowExpandedMaps
-          };
-          rowTempExpandedMaps[rowid] = row;
-          this.rowExpandedMaps = rowTempExpandedMaps;
+          rest.expandLoaded = true;
+          rowExpandedMaps[rowid] = row;
         }).catch(() => {
           rest.expandLoaded = false;
         }).finally(() => {
           const {
             rowExpandLazyLoadedMaps
           } = this;
-          const rowTempExpandLazyLoadedMaps = {
-            ...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();
@@ -10575,21 +10567,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[getRowid($xeTable, row)];
+    return rest && !!rest.treeLoaded;
   },
   clearTreeExpandLoaded(row) {
+    const $xeTable = this;
     const {
       treeOpts,
       treeExpandedMaps,
-      fullAllDataRowMap
+      fullAllDataRowIdData
     } = this;
     const {
       transform,
       lazy
     } = treeOpts;
-    const rowid = getRowid(this, row);
-    const rest = fullAllDataRowMap.get(row);
+    const rowid = getRowid($xeTable, row);
+    const rest = fullAllDataRowIdData[rowid];
     if (lazy && rest) {
       rest.treeLoaded = false;
       if (treeExpandedMaps[rowid]) {
@@ -10712,6 +10709,7 @@ const Methods = {
     }
   },
   handleAsyncTreeExpandChilds(row) {
+    const $xeTable = this;
     const {
       treeOpts,
       checkboxOpts
@@ -10726,20 +10724,19 @@ const Methods = {
     return new Promise(resolve => {
       if (loadMethod) {
         const {
-          fullAllDataRowMap,
-          treeExpandLazyLoadedMaps
+          treeExpandLazyLoadedMaps,
+          fullAllDataRowIdData
         } = this;
-        const rowid = getRowid(this, row);
-        const rest = fullAllDataRowMap.get(row);
+        const rowid = 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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(childRecords)) {
             childRecords = [];
@@ -10749,16 +10746,12 @@ const Methods = {
               const {
                 treeExpandedMaps
               } = this;
-              const treeTempExpandedMaps = {
-                ...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) {
@@ -10768,13 +10761,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());
@@ -10816,7 +10808,7 @@ const Methods = {
    */
   handleBaseTreeExpand(rows, expanded) {
     const {
-      fullAllDataRowMap,
+      fullAllDataRowIdData,
       tableFullData,
       treeExpandedMaps,
       treeOpts,
@@ -10863,7 +10855,7 @@ const Methods = {
       validRows.forEach(row => {
         const rowid = 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) {
@@ -20891,7 +20883,6 @@ function handleUupdateResize(_vm) {
       // 渲染所有列
       visibleColumn: [],
       // 缓存数据集
-      fullAllDataRowMap: new Map(),
       fullAllDataRowIdData: {},
       fullDataRowMap: new Map(),
       fullDataRowIdData: {},
@@ -24586,6 +24577,9 @@ render_renderer.mixin({
       })];
     }
   },
+  VxeRate: {
+    renderTableDefault: defaultEditRender
+  },
   // 以下已废弃
   $input: {
     tableAutoFocus: '.vxe-input--inner',