vxe-table 3.15.26 → 3.15.28

package/es/table/module/filter/mixin.js

@@ -287,8 +287,14 @@ export default {
          * @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);
+            }
         },
         /**
          * 清空指定列的筛选条件
@@ -296,16 +302,20 @@ export default {
          * @param {String} fieldOrColumn 列
          */
         _clearFilter(fieldOrColumn) {
-            const { filterStore } = this;
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { filterStore } = 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, {
@@ -318,12 +328,13 @@ export default {
                     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();
         }
     }
 };

package/es/table/src/cell.js

@@ -1037,7 +1037,9 @@ export const Cell = {
                     ? h('i', {
                         class: 'vxe-cell--edit-icon'
                     }, [
-                        h('i')
+                        h('i', {
+                            class: editOpts.icon || getIcon().TABLE_EDIT
+                        })
                     ])
                     : renderEmptyElement($table)
             ];

package/es/table/src/methods.js

@@ -4188,7 +4188,6 @@ const Methods = {
     },
     /**
      * 检查是否为临时行数据
-     * @param {Row} row 行对象
      */
     isInsertByRow(row) {
         const $xeTable = this;
@@ -4206,18 +4205,15 @@ const Methods = {
     },
     /**
      * 删除所有新增的临时数据
-     * @returns
      */
     removeInsertRow() {
         const $xeTable = this;
         const internalData = $xeTable;
-        internalData.insertRowMaps = {};
-        return $xeTable.remove($xeTable.getInsertRecords());
+        const { insertRowMaps } = internalData;
+        return $xeTable.remove(XEUtils.values(insertRowMaps));
     },
     /**
      * 检查行或列数据是否发生改变
-     * @param {Row} rowOrId 行对象
-     * @param {String} field 字段名
      */
     isUpdateByRow(rowOrId, field) {
         const $xeTable = this;
@@ -6235,7 +6231,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);
         }
     },
     /**
@@ -7375,12 +7376,15 @@ const Methods = {
         const props = $xeTable;
         const { mouseConfig } = props;
         const mouseOpts = $xeTable.computeMouseOpts;
-        const { field, sortable } = column;
+        const { field, sortable, order } = column;
         if (sortable) {
-            const params = { $table: $xeTable, $event: evnt, column, field, property: field, order: column.order, sortList: $xeTable.getSortColumns(), sortTime: column.sortTime };
+            const params = { $table: $xeTable, $event: evnt, column, field, property: field, 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);
         }
     },
@@ -8332,6 +8336,44 @@ 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 (process.env.NODE_ENV === 'development') {
@@ -8399,6 +8441,52 @@ 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 行对象

package/es/table/src/table.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { getFuncText, isEnableConf } from '../../ui/src/utils';
 import { initTpImg } from '../../ui/src/dom';
-import { createHandleGetRowId, getCellHeight } from './util';
+import { createHandleGetRowId, getCellHeight, hasDeepKey } from './util';
 import { VxeUI } from '../../ui';
 import methods from './methods';
 import TableBodyComponent from './body';
@@ -23,6 +23,12 @@ import keyboardMixin from '../module/keyboard/mixin';
 import validatorMixin from '../module/validator/mixin';
 import customMixin from '../module/custom/mixin';
 const { getConfig, getIcon, getI18n, renderer, globalResize, globalEvents, globalMixins, renderEmptyElement } = VxeUI;
+function handleKeyField($xeTable) {
+    const internalData = $xeTable;
+    const keyField = $xeTable.computeRowField;
+    internalData.currKeyField = keyField;
+    internalData.isCurrDeepKey = hasDeepKey(keyField);
+}
 /**
  * 渲染浮固定列
  * 分别渲染左边固定列和右边固定列
@@ -690,6 +696,12 @@ export default {
             }
             return '';
         },
+        computeRowField() {
+            const $xeTable = this;
+            const props = $xeTable;
+            const rowOpts = $xeTable.computeRowOpts;
+            return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
+        },
         validOpts() {
             return this.computeValidOpts;
         },
@@ -1303,6 +1315,20 @@ export default {
         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() {
@@ -1311,6 +1337,8 @@ export default {
         const internalData = $xeTable;
         Object.assign($xeTable, {
             tZindex: 0,
+            currKeyField: '',
+            isCurrDeepKey: false,
             elemStore: {},
             // 存放横向 X 虚拟滚动相关的信息
             scrollXStore: {
@@ -1417,6 +1445,7 @@ export default {
             swYInterval: 0,
             swYTotal: 0
         });
+        handleKeyField($xeTable);
         const { data, exportConfig, importConfig, treeConfig, showOverflow, highlightCurrentRow, highlightCurrentColumn } = props;
         const { scrollXStore, scrollYStore } = internalData;
         const columnOpts = $xeTable.computeColumnOpts;
@@ -1653,6 +1682,7 @@ export default {
         const columnOpts = $xeTable.computeColumnOpts;
         const rowOpts = $xeTable.computeRowOpts;
         const customOpts = $xeTable.computeCustomOpts;
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
         if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
             initTpImg();
         }
@@ -1693,9 +1723,11 @@ export default {
             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');
     },

package/es/table/src/util.js

@@ -86,36 +86,40 @@ export function toTreePathSeq(path) {
 export function getRowUniqueId() {
     return XEUtils.uniqueId('row_');
 }
+export function hasDeepKey(rowKey) {
+    return rowKey.indexOf('.') > -1;
+}
 // 行主键 key
 export 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
 export function getRowid($xeTable, row) {
-    const rowid = XEUtils.get(row, getRowkey($xeTable));
-    return encodeRowid(rowid);
+    const internalData = $xeTable;
+    const { isCurrDeepKey, currKeyField } = internalData;
+    return row ? encodeRowid((isCurrDeepKey ? getDeepRowIdByKey : getFastRowIdByKey)(row, currKeyField)) : '';
 }
 export 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) : '';
         }
     };
 }
 export 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)) : '';
         }
     };
 }
@@ -127,7 +131,7 @@ function getDeepRowIdByKey(row, rowKey) {
     return XEUtils.get(row, rowKey);
 }
 export function updateDeepRowKey(row, rowKey) {
-    let rowid = getDeepRowIdByKey(row, rowKey);
+    let rowid = encodeRowid(getDeepRowIdByKey(row, rowKey));
     if (eqEmptyValue(rowid)) {
         rowid = getRowUniqueId();
         XEUtils.set(row, rowKey, rowid);
@@ -138,7 +142,7 @@ function getFastRowIdByKey(row, rowKey) {
     return row[rowKey];
 }
 export function updateFastRowKey(row, rowKey) {
-    let rowid = getFastRowIdByKey(row, rowKey);
+    let rowid = encodeRowid(getFastRowIdByKey(row, rowKey));
     if (eqEmptyValue(rowid)) {
         rowid = getRowUniqueId();
         row[rowKey] = rowid;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.26";
+export const version = "3.15.27";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.15.26"}`;
+const version = `table v${"3.15.27"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);