vxe-table 3.15.25 → 3.15.27

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;
@@ -6191,7 +6187,11 @@ const Methods = {
         if (!titleElem) {
             return;
         }
-        const cellEl = titleElem.parentElement;
+        const cWrapperEl = titleElem.parentElement;
+        if (!cWrapperEl) {
+            return;
+        }
+        const cellEl = cWrapperEl.parentElement;
         if (!cellEl) {
             return;
         }
@@ -6200,7 +6200,8 @@ const Methods = {
             return;
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--wrapper'), thEl.querySelector('.vxe-cell--title') || cellEl, params);
+            const ctEl = thEl.querySelector('.vxe-cell--title');
+            handleTooltip($xeTable, evnt, thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
         }
     },
     /**

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;

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.25";
+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.25"}`;
+const version = `table v${"3.15.27"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.25";
+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.25"}`;
+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;
@@ -12465,7 +12480,11 @@ const Methods = {
     if (!titleElem) {
       return;
     }
-    const cellEl = titleElem.parentElement;
+    const cWrapperEl = titleElem.parentElement;
+    if (!cWrapperEl) {
+      return;
+    }
+    const cellEl = cWrapperEl.parentElement;
     if (!cellEl) {
       return;
     }
@@ -12474,7 +12493,8 @@ const Methods = {
       return;
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--wrapper'), thEl.querySelector('.vxe-cell--title') || cellEl, params);
+      const ctEl = thEl.querySelector('.vxe-cell--title');
+      handleTooltip($xeTable, evnt, thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
     }
   },
   /**
@@ -27092,6 +27112,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);
+}
 /**
  * 渲染浮固定列
  * 分别渲染左边固定列和右边固定列
@@ -27753,6 +27779,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;
     },
@@ -28437,6 +28469,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() {
@@ -28445,6 +28494,8 @@ function renderBody(h, $xeTable) {
     const internalData = $xeTable;
     Object.assign($xeTable, {
       tZindex: 0,
+      currKeyField: '',
+      isCurrDeepKey: false,
       elemStore: {},
       // 存放横向 X 虚拟滚动相关的信息
       scrollXStore: {
@@ -28551,6 +28602,7 @@ function renderBody(h, $xeTable) {
       swYInterval: 0,
       swYTotal: 0
     });
+    handleKeyField($xeTable);
     const {
       data,
       exportConfig,