vxe-table 3.15.26 → 3.15.28

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.26";
+const version = "3.15.27";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2864,7 +2864,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.26"}`;
+const log_version = `table v${"3.15.27"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3129,36 +3129,51 @@ function toTreePathSeq(path) {
 function getRowUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('row_');
 }
+function hasDeepKey(rowKey) {
+  return rowKey.indexOf('.') > -1;
+}
 // 行主键 key
 function getRowkey($xeTable) {
-  const props = $xeTable;
-  const rowOpts = $xeTable.computeRowOpts;
-  return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
+  const internalData = $xeTable;
+  const {
+    currKeyField
+  } = internalData;
+  return currKeyField;
 }
 // 行主键 value
 function getRowid($xeTable, row) {
-  const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xeTable));
-  return encodeRowid(rowid);
+  const internalData = $xeTable;
+  const {
+    isCurrDeepKey,
+    currKeyField
+  } = internalData;
+  return row ? encodeRowid((isCurrDeepKey ? getDeepRowIdByKey : getFastRowIdByKey)(row, currKeyField)) : '';
 }
 function createHandleUpdateRowId($xeTable) {
-  const rowKey = getRowkey($xeTable);
-  const isDeepKey = rowKey.indexOf('.') > -1;
-  const updateRId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+  const internalData = $xeTable;
+  const {
+    isCurrDeepKey,
+    currKeyField
+  } = internalData;
+  const updateRId = isCurrDeepKey ? updateDeepRowKey : updateFastRowKey;
   return {
-    rowKey,
+    rowKey: currKeyField,
     handleUpdateRowId(row) {
-      return row ? updateRId(row, rowKey) : null;
+      return row ? updateRId(row, currKeyField) : '';
     }
   };
 }
 function createHandleGetRowId($xeTable) {
-  const rowKey = getRowkey($xeTable);
-  const isDeepKey = rowKey.indexOf('.') > -1;
-  const getRId = isDeepKey ? getDeepRowIdByKey : getFastRowIdByKey;
+  const internalData = $xeTable;
+  const {
+    isCurrDeepKey,
+    currKeyField
+  } = internalData;
+  const getRId = isCurrDeepKey ? getDeepRowIdByKey : getFastRowIdByKey;
   return {
-    rowKey,
+    rowKey: currKeyField,
     handleGetRowId(row) {
-      return row ? getRId(row, rowKey) : null;
+      return row ? encodeRowid(getRId(row, currKeyField)) : '';
     }
   };
 }
@@ -3170,7 +3185,7 @@ function getDeepRowIdByKey(row, rowKey) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, rowKey);
 }
 function updateDeepRowKey(row, rowKey) {
-  let rowid = getDeepRowIdByKey(row, rowKey);
+  let rowid = encodeRowid(getDeepRowIdByKey(row, rowKey));
   if (eqEmptyValue(rowid)) {
     rowid = getRowUniqueId();
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowKey, rowid);
@@ -3181,7 +3196,7 @@ function getFastRowIdByKey(row, rowKey) {
   return row[rowKey];
 }
 function updateFastRowKey(row, rowKey) {
-  let rowid = getFastRowIdByKey(row, rowKey);
+  let rowid = encodeRowid(getFastRowIdByKey(row, rowKey));
   if (eqEmptyValue(rowid)) {
     rowid = getRowUniqueId();
     row[rowKey] = rowid;
@@ -4926,7 +4941,9 @@ const Cell = {
         class: 'vxe-cell--required-icon'
       })]) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? h('i', {
         class: 'vxe-cell--edit-icon'
-      }, [h('i')]) : renderEmptyElement($table)];
+      }, [h('i', {
+        class: editOpts.icon || cell_getIcon().TABLE_EDIT
+      })]) : renderEmptyElement($table)];
     }
     return renderHeaderCellBaseVNs(h, params, editIconVNs.concat(Cell.renderHeaderTitle(h, params)).concat(sortable ? Cell.renderSortIcon(h, params) : []).concat(filters ? Cell.renderFilterIcon(h, params) : []));
   },
@@ -10203,7 +10220,6 @@ const Methods = {
   },
   /**
    * 检查是否为临时行数据
-   * @param {Row} row 行对象
    */
   isInsertByRow(row) {
     const $xeTable = this;
@@ -10221,18 +10237,17 @@ const Methods = {
   },
   /**
    * 删除所有新增的临时数据
-   * @returns
    */
   removeInsertRow() {
     const $xeTable = this;
     const internalData = $xeTable;
-    internalData.insertRowMaps = {};
-    return $xeTable.remove($xeTable.getInsertRecords());
+    const {
+      insertRowMaps
+    } = internalData;
+    return $xeTable.remove(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().values(insertRowMaps));
   },
   /**
    * 检查行或列数据是否发生改变
-   * @param {Row} rowOrId 行对象
-   * @param {String} field 字段名
    */
   isUpdateByRow(rowOrId, field) {
     const $xeTable = this;
@@ -12520,7 +12535,12 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
+      let ovEl = null;
+      if (column.treeNode) {
+        ovEl = tdEl.querySelector('.vxe-tree-cell');
+      }
+      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   /**
@@ -13910,7 +13930,8 @@ const Methods = {
     const mouseOpts = $xeTable.computeMouseOpts;
     const {
       field,
-      sortable
+      sortable,
+      order
     } = column;
     if (sortable) {
       const params = {
@@ -13919,13 +13940,16 @@ const Methods = {
         column,
         field,
         property: field,
-        order: column.order,
+        order,
         sortList: $xeTable.getSortColumns(),
         sortTime: column.sortTime
       };
       if (mouseConfig && mouseOpts.area && $xeTable.handleSortEvent) {
         $xeTable.handleSortEvent(evnt, params);
       }
+      if (!order) {
+        $xeTable.dispatchEvent('clear-sort', params, evnt);
+      }
       $xeTable.dispatchEvent('sort-change', params, evnt);
     }
   },
@@ -15023,6 +15047,49 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
+  clearSortByEvent(evnt, fieldOrColumn) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      tableFullColumn
+    } = internalData;
+    const sortOpts = $xeTable.computeSortOpts;
+    const sortCols = [];
+    let column = null;
+    if (evnt) {
+      if (fieldOrColumn) {
+        column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (column) {
+          column.order = null;
+        }
+      } else {
+        tableFullColumn.forEach(column => {
+          if (column.order) {
+            column.order = null;
+            sortCols.push(column);
+          }
+        });
+      }
+      if (!sortOpts.remote) {
+        $xeTable.handleTableData(true);
+      }
+      if (sortCols.length) {
+        const params = {
+          $table: $xeTable,
+          $event: evnt,
+          cols: sortCols,
+          sortList: []
+        };
+        $xeTable.dispatchEvent('clear-all-sort', params, evnt);
+      } else if (column) {
+        $xeTable.handleColumnSortEvent(evnt, column);
+      }
+    }
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable);
+      return updateStyle($xeTable);
+    });
+  },
   // 在 v3 中废弃
   getSortColumn() {
     if (true) {
@@ -15107,6 +15174,61 @@ const Methods = {
   isFilter(fieldOrColumn) {
     return this.isActiveFilterByColumn(fieldOrColumn);
   },
+  clearFilterByEvent(evnt, fieldOrColumn) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      filterStore
+    } = reactData;
+    const {
+      tableFullColumn
+    } = internalData;
+    const filterOpts = $xeTable.computeFilterOpts;
+    const filterCols = [];
+    let column = null;
+    if (fieldOrColumn) {
+      column = handleFieldOrColumn($xeTable, fieldOrColumn);
+      if (column) {
+        $xeTable.handleClearFilter(column);
+      }
+    } else {
+      tableFullColumn.forEach(column => {
+        if (column.filters) {
+          filterCols.push(column);
+          $xeTable.handleClearFilter(column);
+        }
+      });
+    }
+    if (!fieldOrColumn || column !== filterStore.column) {
+      Object.assign(filterStore, {
+        isAllSelected: false,
+        isIndeterminate: false,
+        style: null,
+        options: [],
+        column: null,
+        multiple: false,
+        visible: false
+      });
+    }
+    if (!filterOpts.remote) {
+      $xeTable.updateData();
+    }
+    if (filterCols.length) {
+      const params = {
+        $table: $xeTable,
+        $event: evnt,
+        cols: filterCols,
+        filterList: []
+      };
+      $xeTable.dispatchEvent('clear-all-filter', params, evnt);
+    } else if (column) {
+      $xeTable.dispatchEvent('clear-filter', {
+        filterList: () => $xeTable.getCheckedFilters()
+      }, evnt);
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 判断展开行是否懒加载完成
    * @param {Row} row 行对象
@@ -21933,8 +22055,18 @@ const {
      * @param {Event} evnt 事件
      */
     handleFilterResetFilter(evnt) {
-      this.handleClearFilter(this.filterStore.column);
-      this.confirmFilterEvent(evnt);
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        filterStore
+      } = reactData;
+      $xeTable.handleClearFilter(filterStore.column);
+      $xeTable.confirmFilterEvent(evnt);
+      if (evnt) {
+        $xeTable.dispatchEvent('clear-filter', {
+          filterList: []
+        }, evnt);
+      }
     },
     /**
      * 清空指定列的筛选条件
@@ -21942,17 +22074,23 @@ const {
      * @param {String} fieldOrColumn 列
      */
     _clearFilter(fieldOrColumn) {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
       const {
         filterStore
-      } = this;
+      } = reactData;
+      const {
+        tableFullColumn
+      } = internalData;
       let column;
       if (fieldOrColumn) {
-        column = handleFieldOrColumn(this, fieldOrColumn);
+        column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column) {
-          this.handleClearFilter(column);
+          $xeTable.handleClearFilter(column);
         }
       } else {
-        this.visibleColumn.forEach(this.handleClearFilter);
+        tableFullColumn.forEach($xeTable.handleClearFilter);
       }
       if (!fieldOrColumn || column !== filterStore.column) {
         Object.assign(filterStore, {
@@ -21965,12 +22103,13 @@ const {
           visible: false
         });
       }
-      return this.updateData();
+      return $xeTable.updateData();
     },
     _updateFilterOptionStatus(item, checked) {
+      const $xeTable = this;
       item._checked = checked;
       item.checked = checked;
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     }
   }
 });
@@ -27097,6 +27236,12 @@ const {
   globalMixins: table_globalMixins,
   renderEmptyElement: table_renderEmptyElement
 } = core_.VxeUI;
+function handleKeyField($xeTable) {
+  const internalData = $xeTable;
+  const keyField = $xeTable.computeRowField;
+  internalData.currKeyField = keyField;
+  internalData.isCurrDeepKey = hasDeepKey(keyField);
+}
 /**
  * 渲染浮固定列
  * 分别渲染左边固定列和右边固定列
@@ -27758,6 +27903,12 @@ function renderBody(h, $xeTable) {
       }
       return '';
     },
+    computeRowField() {
+      const $xeTable = this;
+      const props = $xeTable;
+      const rowOpts = $xeTable.computeRowOpts;
+      return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
+    },
     validOpts() {
       return this.computeValidOpts;
     },
@@ -28442,6 +28593,23 @@ function renderBody(h, $xeTable) {
     computeRowGroupFields(val) {
       const $xeTable = this;
       $xeTable.handleUpdateRowGroup(val);
+    },
+    computeRowField() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      // 行主键被改变，重载表格
+      const {
+        inited,
+        tableFullData
+      } = internalData;
+      if (inited) {
+        handleKeyField($xeTable);
+        reactData.tableData = [];
+        $xeTable.$nextTick(() => {
+          $xeTable.reloadData(tableFullData);
+        });
+      }
     }
   },
   created() {
@@ -28450,6 +28618,8 @@ function renderBody(h, $xeTable) {
     const internalData = $xeTable;
     Object.assign($xeTable, {
       tZindex: 0,
+      currKeyField: '',
+      isCurrDeepKey: false,
       elemStore: {},
       // 存放横向 X 虚拟滚动相关的信息
       scrollXStore: {
@@ -28556,6 +28726,7 @@ function renderBody(h, $xeTable) {
       swYInterval: 0,
       swYTotal: 0
     });
+    handleKeyField($xeTable);
     const {
       data,
       exportConfig,
@@ -28805,6 +28976,7 @@ function renderBody(h, $xeTable) {
     const columnOpts = $xeTable.computeColumnOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const customOpts = $xeTable.computeCustomOpts;
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
       initTpImg();
     }
@@ -28844,11 +29016,13 @@ function renderBody(h, $xeTable) {
       resizeObserver.observe(this.getParentElem());
       this.$resize = resizeObserver;
     }
-    const tableViewportEl = $xeTable.$refs.refTableViewportElem;
-    if (tableViewportEl) {
-      tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, {
-        passive: false
-      });
+    if (virtualYOpts.mode !== 'scroll') {
+      const tableViewportEl = $xeTable.$refs.refTableViewportElem;
+      if (tableViewportEl) {
+        tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, {
+          passive: false
+        });
+      }
     }
     this.preventEvent(null, 'mounted');
   },
@@ -32928,9 +33102,16 @@ render_renderer.mixin({
 let isReg = false;
 const VxeTable = Object.assign({}, table, {
   install(app) {
-    if (typeof window !== 'undefined' && window.VXETableMixin) {
-      table.mixins.push(window.VXETableMixin);
-      delete window.VXETableMixin;
+    if (typeof window !== 'undefined') {
+      if (window.VxeTableExtendCellArea && window.VxeTableExtendCellArea.use) {
+        window.VxeTableExtendCellArea.use(core_.VxeUI);
+      } else if (window.VXETableMixin) {
+        table.mixins.push(window.VXETableMixin);
+        delete window.VXETableMixin;
+      }
+      if (window.VxeTableExtendPivotTable && window.VxeTableExtendPivotTable.use) {
+        window.VxeTableExtendPivotTable.use(core_.VxeUI);
+      }
     }
     // 兼容老版本
     if (typeof window !== 'undefined' && window.VxeTableExtendCellArea && window.VxeTableExtendCellArea.init) {