vxe-table 3.12.14 → 3.12.15

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.14";
+const version = "3.12.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2842,7 +2842,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.14"}`;
+const log_version = `table v${"3.12.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6320,7 +6320,7 @@ const calcCellHeight = $xeTable => {
     reactData.calcCellHeightFlag++;
   }
 };
-function getOrderField(_vm, column) {
+function getOrderField($xeTable, column) {
   const {
     sortBy,
     sortType
@@ -6333,7 +6333,7 @@ function getOrderField(_vm, column) {
         column
       }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, sortBy);
     } else {
-      cellValue = _vm.getCellLabel(row, column);
+      cellValue = $xeTable.getCellLabel(row, column);
     }
     if (!sortType || sortType === 'auto') {
       return isNaN(cellValue) ? cellValue : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
@@ -8395,15 +8395,26 @@ const Methods = {
    */
   updateAfterFullData() {
     const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
       tableFullColumn,
       tableFullData,
-      filterOpts,
-      sortOpts,
-      treeConfig,
-      treeOpts,
       tableFullTreeData
-    } = this;
+    } = internalData;
+    const filterOpts = $xeTable.computeFilterOpts;
+    const sortOpts = $xeTable.computeSortOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const {
+      transform,
+      rowField,
+      parentField,
+      mapChildrenField
+    } = treeOpts;
     const {
       remote: allRemoteFilter,
       filterMethod: allFilterMethod
@@ -8414,63 +8425,61 @@ const Methods = {
       multiple: sortMultiple,
       chronological
     } = sortOpts;
-    const {
-      transform
-    } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     let tableData = [];
     let tableTree = [];
-    const filterColumns = [];
-    let orderColumns = [];
-    tableFullColumn.forEach(column => {
-      const {
-        field,
-        sortable,
-        order,
-        filters
-      } = column;
-      if (!allRemoteFilter && filters && filters.length) {
-        const valueList = [];
-        const itemList = [];
-        filters.forEach(item => {
-          if (item.checked) {
-            itemList.push(item);
-            valueList.push(item.value);
+    // 处理数据
+    if (!allRemoteFilter || !allRemoteSort) {
+      const filterColumns = [];
+      let orderColumns = [];
+      tableFullColumn.forEach(column => {
+        const {
+          field,
+          sortable,
+          order,
+          filters
+        } = column;
+        if (!allRemoteFilter && filters && filters.length) {
+          const valueList = [];
+          const itemList = [];
+          filters.forEach(item => {
+            if (item.checked) {
+              itemList.push(item);
+              valueList.push(item.value);
+            }
+          });
+          if (itemList.length) {
+            filterColumns.push({
+              column,
+              valueList,
+              itemList
+            });
           }
-        });
-        if (itemList.length) {
-          filterColumns.push({
+        }
+        if (!allRemoteSort && sortable && order) {
+          orderColumns.push({
             column,
-            valueList,
-            itemList
+            field,
+            property: field,
+            order: order,
+            sortTime: column.sortTime
           });
         }
-      }
-      if (!allRemoteSort && sortable && order) {
-        orderColumns.push({
-          column,
-          field,
-          property: field,
-          order,
-          sortTime: column.sortTime
-        });
-      }
-    });
-    if (sortMultiple && chronological && orderColumns.length > 1) {
-      orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns, 'sortTime');
-    }
-    if (filterColumns.length) {
-      const handleFilter = row => {
-        return filterColumns.every(({
-          column,
-          valueList,
-          itemList
-        }) => {
-          if (valueList.length && !allRemoteFilter) {
+      });
+      if (sortMultiple && chronological && orderColumns.length > 1) {
+        orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(orderColumns, 'sortTime');
+      }
+      // 处理筛选
+      // 支持单列、多列、组合筛选
+      if (!allRemoteFilter && filterColumns.length) {
+        const handleFilter = row => {
+          return filterColumns.every(({
+            column,
+            valueList,
+            itemList
+          }) => {
             const {
               filterMethod,
-              filterRender,
-              field
+              filterRender
             } = column;
             const compConf = isEnableConf(filterRender) ? methods_renderer.get(filterRender.name) : null;
             const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
@@ -8483,7 +8492,7 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             } else if (compFilterMethod) {
               return itemList.some(item => compFilterMethod({
@@ -8492,7 +8501,7 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             } else if (allFilterMethod) {
               return allFilterMethod({
@@ -8509,96 +8518,119 @@ const Methods = {
                 cellValue,
                 row,
                 column,
-                $table: this
+                $table: $xeTable
               }));
             }
-            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, field)) > -1;
-          }
-          return true;
-        });
-      };
-      if (treeConfig && transform) {
-        // 筛选虚拟树
-        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
-          original: true,
-          isEvery: true,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
-        });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
-        tableTree = tableData;
-      }
-    } else {
-      if (treeConfig && transform) {
-        // 还原虚拟树
-        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
-          original: true,
-          isEvery: true,
-          children: treeOpts.mapChildrenField,
-          mapChildren: childrenField
-        });
-        tableData = tableTree;
-      } else {
-        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
-        tableTree = tableData;
-      }
-    }
-    const firstOrderColumn = orderColumns[0];
-    if (!allRemoteSort && firstOrderColumn) {
-      if (treeConfig && transform) {
-        // 虚拟树和列表一样，只能排序根级节点
-        if (allSortMethod) {
-          const sortRests = allSortMethod({
-            data: tableTree,
-            sortList: orderColumns,
-            $table: this
+            return valueList.indexOf(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field)) > -1;
           });
-          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
+        };
+        if (treeConfig && transform) {
+          // 筛选虚拟树
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
+            original: true,
+            isEvery: true,
+            children: mapChildrenField,
+            mapChildren: childrenField
+          });
+          tableData = tableTree;
         } else {
-          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableTree, orderColumns.map(({
-            column,
-            order
-          }) => [getOrderField(this, column), order]));
+          tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+          tableTree = tableData;
         }
-        tableData = tableTree;
       } else {
-        if (allSortMethod) {
-          const sortRests = allSortMethod({
-            data: tableData,
-            column: firstOrderColumn.column,
-            property: firstOrderColumn.field,
-            field: firstOrderColumn.field,
-            order: firstOrderColumn.order,
-            sortList: orderColumns,
-            $table: this
+        if (treeConfig && transform) {
+          // 还原虚拟树
+          tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
+            original: true,
+            isEvery: true,
+            children: mapChildrenField,
+            mapChildren: childrenField
           });
-          tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableData;
+          tableData = tableTree;
         } else {
-          // 兼容 v4
-          if (sortMultiple) {
-            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
+          tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+          tableTree = tableData;
+        }
+      }
+      // 处理排序（不能用于树形结构）
+      // 支持单列、多列、组合排序
+      if (!allRemoteSort && orderColumns.length) {
+        if (treeConfig && transform) {
+          // 虚拟树和列表一样，只能排序根级节点
+          if (allSortMethod) {
+            const sortRests = allSortMethod({
+              data: tableTree,
+              sortList: orderColumns,
+              $table: $xeTable
+            });
+            tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
+          } else {
+            const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+              children: mapChildrenField
+            });
+            tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
               column,
               order
-            }) => [getOrderField(this, column), order]));
+            }) => [getOrderField($xeTable, column), order])), {
+              key: rowField,
+              parentKey: parentField,
+              children: childrenField,
+              mapChildren: mapChildrenField
+            });
+          }
+          tableData = tableTree;
+        } else {
+          if (allSortMethod) {
+            const sortRests = allSortMethod({
+              data: tableData,
+              sortList: orderColumns,
+              $table: $xeTable
+            });
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableData;
           } else {
-            // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
-            let sortByConfs;
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(firstOrderColumn.sortBy)) {
-              sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+            // 兼容 v4
+            if (sortMultiple) {
+              tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
+                column,
+                order
+              }) => [getOrderField(this, column), order]));
+            } else {
+              const firstOrderColumn = orderColumns[0];
+              let sortByConfs;
+              // 已废弃，兼容 v2，在 v4 中废弃， sortBy 不能为数组
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(firstOrderColumn.sortBy)) {
+                sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order]);
+              }
+              tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+                column,
+                order
+              }) => [getOrderField(this, column), order]));
             }
-            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(({
+            tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(({
               column,
               order
-            }) => [getOrderField(this, column), order]));
+            }) => [getOrderField($xeTable, column), order]));
           }
+          tableTree = tableData;
         }
+      }
+    } else {
+      if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
+          original: true,
+          isEvery: true,
+          children: treeOpts.mapChildrenField,
+          mapChildren: childrenField
+        });
+        tableData = tableTree;
+      } else {
+        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
         tableTree = tableData;
       }
     }
-    this.afterFullData = tableData;
-    this.afterTreeFullData = tableTree;
+    internalData.afterFullData = tableData;
+    internalData.afterTreeFullData = tableTree;
     updateAfterDataIndex($xeTable);
   },
   /**
@@ -15550,6 +15582,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
       'is--padding': isCellPadding,
+      'is--progress': fixedHiddenColumn && isAllOverflow || isVNPreEmptyStatus,
       'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
       'is--drag-disabled': isDisabledDrag,
       'col--dirty': isDirty,
@@ -20230,6 +20263,15 @@ const {
   renderer: edit_mixin_renderer,
   getI18n: mixin_getI18n
 } = core_.VxeUI;
+function removeCellSelectedClass($xeTable) {
+  const el = $xeTable.$refs.refElem;
+  if (el) {
+    const cell = el.querySelector('.col--selected');
+    if (cell) {
+      removeClass(cell, 'col--selected');
+    }
+  }
+}
 function insertTreeRow(_vm, newRecords, isAppend) {
   const {
     tableFullTreeData,
@@ -20651,7 +20693,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
         actived,
-        removeList,
+        removeMaps,
         insertMaps
       } = editStore;
       const {
@@ -20666,7 +20708,8 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       // 如果是新增，则保存记录
       rows.forEach(row => {
         if (!$xeTable.isInsertByRow(row)) {
-          removeList.push(row);
+          const rowid = getRowid($xeTable, row);
+          removeMaps[rowid] = row;
         }
       });
       // 如果绑定了多选属性，则更新状态
@@ -20843,7 +20886,19 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
      * 获取已删除的数据
      */
     _getRemoveRecords() {
-      return this.editStore.removeList;
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        editStore
+      } = reactData;
+      const {
+        removeMaps
+      } = editStore;
+      const removeRecords = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(removeMaps, row => {
+        removeRecords.push(row);
+      });
+      return removeRecords;
     },
     /**
      * 获取更新数据
@@ -21310,7 +21365,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
             selected.row = row;
             selected.column = column;
             if (isMouseSelected) {
-              this.addColSdCls();
+              this.addCellSelectedClass();
             }
             this.focus();
             if (evnt) {
@@ -21339,13 +21394,14 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
      * 清除所选中源状态
      */
     _clearSelected() {
+      const $xeTable = this;
       const {
         selected
       } = this.editStore;
       selected.row = null;
       selected.column = null;
       this.reColTitleSdCls();
-      this.reColSdCls();
+      removeCellSelectedClass($xeTable);
       return this.$nextTick();
     },
     reColTitleSdCls() {
@@ -21354,23 +21410,22 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(headerElem.querySelectorAll('.col--title-selected'), elem => removeClass(elem, 'col--title-selected'));
       }
     },
-    reColSdCls() {
-      const cell = this.$el.querySelector('.col--selected');
-      if (cell) {
-        removeClass(cell, 'col--selected');
-      }
-    },
-    addColSdCls() {
+    addCellSelectedClass() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        editStore
+      } = reactData;
       const {
         selected
-      } = this.editStore;
+      } = editStore;
       const {
         row,
         column
       } = selected;
-      this.reColSdCls();
+      removeCellSelectedClass($xeTable);
       if (row && column) {
-        const cell = this.getCellElement(row, column);
+        const cell = $xeTable.getCellElement(row, column);
         if (cell) {
           addClass(cell, 'col--selected');
         }
@@ -21409,6 +21464,7 @@ function createHtmlPage(opts, content) {
 
 
 
+
 const {
   getI18n: export_mixin_getI18n,
   renderer: export_mixin_renderer
@@ -21541,7 +21597,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
                     const cell = $xeTable.getCellElement(row, column);
-                    if (cell) {
+                    if (cell && !hasClass(cell, 'is--progress')) {
                       cellValue = cell.innerText.trim();
                     }
                   }
@@ -21611,7 +21667,7 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
                 cellValue = htmlCellElem.innerText.trim();
               } else {
                 const cell = $xeTable.getCellElement(row, column);
-                if (cell) {
+                if (cell && !hasClass(cell, 'is--progress')) {
                   cellValue = cell.innerText.trim();
                 }
               }
@@ -23938,11 +23994,15 @@ function validErrorRuleValue(rule, val) {
         treeConfig
       } = props;
       const {
+        editStore,
         pendingRowMaps
       } = reactData;
       const {
         afterFullData
       } = internalData;
+      const {
+        removeMaps
+      } = editStore;
       const treeOpts = $xeTable.computeTreeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let validList;
@@ -23967,6 +24027,10 @@ function validErrorRuleValue(rule, val) {
         const columns = cols && cols.length ? cols : this.getColumns();
         const handleVaild = row => {
           const rowid = getRowid($xeTable, row);
+          // 是否删除
+          if (removeMaps[rowid]) {
+            return;
+          }
           // 是否标记删除
           if (pendingRowMaps[rowid]) {
             return;
@@ -25151,7 +25215,6 @@ function renderBody(h, $xeTable) {
           column: null
         },
         insertMaps: {},
-        removeList: [],
         removeMaps: {}
       },
       // 存放 tooltip 相关信息