vxe-table 3.17.2 → 3.17.4

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.2";
+const version = "3.17.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2669,7 +2669,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.2"}`;
+const log_version = `table v${"3.17.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2879,6 +2879,122 @@ class ColumnInfo {
 
 
 
+function createInternalData() {
+  return {
+    tZindex: 0,
+    currKeyField: '',
+    isCurrDeepKey: false,
+    elemStore: {},
+    // 存放横向 X 虚拟滚动相关的信息
+    scrollXStore: {
+      preloadSize: 0,
+      offsetSize: 0,
+      visibleSize: 0,
+      visibleStartIndex: 0,
+      visibleEndIndex: 0,
+      startIndex: 0,
+      endIndex: 0
+    },
+    // 存放纵向 Y 虚拟滚动相关信息
+    scrollYStore: {
+      preloadSize: 0,
+      offsetSize: 0,
+      visibleSize: 0,
+      visibleStartIndex: 0,
+      visibleEndIndex: 0,
+      startIndex: 0,
+      endIndex: 0
+    },
+    // 表格宽度
+    tableWidth: 0,
+    // 表格高度
+    tableHeight: 0,
+    // 表头高度
+    headerHeight: 0,
+    // 表尾高度
+    footerHeight: 0,
+    customHeight: 0,
+    customMinHeight: 0,
+    customMaxHeight: 0,
+    // 当前 hover 行
+    hoverRow: null,
+    // 最后滚动位置
+    lastScrollLeft: 0,
+    lastScrollTop: 0,
+    // 单选框属性，已选中保留的行
+    radioReserveRow: null,
+    // 复选框属性，已选中保留的行集合
+    checkboxReserveRowMap: {},
+    // 行数据，已展开保留的行集合
+    rowExpandedReserveRowMap: {},
+    // 树结构数据，已展开保留的行集合
+    treeExpandedReserveRowMap: {},
+    // 树结构数据，不确定状态的集合
+    treeIndeterminateRowMaps: {},
+    // 列表完整数据、条件处理后
+    tableFullData: [],
+    afterFullData: [],
+    afterTreeFullData: [],
+    afterGroupFullData: [],
+    // 列表条件处理后数据集合
+    afterFullRowMaps: {},
+    // 树结构完整数据、条件处理后
+    tableFullTreeData: [],
+    // 行分组全量数据、条件处理后
+    tableFullGroupData: [],
+    tableSynchData: [],
+    tableSourceData: [],
+    // 收集的列配置（带分组）
+    collectColumn: [],
+    // 完整所有列（不带分组）
+    tableFullColumn: [],
+    // 渲染所有列
+    visibleColumn: [],
+    // 全量数据集（包括当前和已删除）
+    fullAllDataRowIdData: {},
+    // 数据集（仅当前）
+    fullDataRowIdData: {},
+    // 数据集（仅可视）
+    visibleDataRowIdData: {},
+    // 渲染中缓存数据
+    sourceDataRowIdData: {},
+    fullColumnIdData: {},
+    fullColumnFieldData: {},
+    // 合并单元格的数据
+    mergeBodyList: [],
+    mergeBodyMaps: {},
+    // 合并表尾的数据
+    mergeFooterList: [],
+    mergeFooterMaps: {},
+    // 已合并单元格数据集合
+    mergeBodyCellMaps: {},
+    // 已合并表尾数据集合
+    mergeFooterCellMaps: {},
+    // 已展开的行集合
+    rowExpandedMaps: {},
+    // 懒加载中的展开行的集合
+    rowExpandLazyLoadedMaps: {},
+    // 已展开的分组行
+    rowGroupExpandedMaps: {},
+    // 已展开树节点集合
+    treeExpandedMaps: {},
+    // 懒加载中的树节点的集合
+    treeExpandLazyLoadedMaps: {},
+    // 复选框属性，已选中的行集合
+    selectCheckboxMaps: {},
+    // 已标记的对象集
+    pendingRowMaps: {},
+    // 已新增的临时行
+    insertRowMaps: {},
+    // 已删除行
+    removeRowMaps: {},
+    cvCacheMaps: {},
+    inited: false,
+    tooltipTimeout: null,
+    initStatus: false,
+    isActivated: false
+  };
+}
 const getAllConvertColumns = (columns, parentColumn) => {
   const result = [];
   columns.forEach(column => {
@@ -8789,9 +8905,7 @@ function loadTableData($xeTable, datas, isReset) {
   internalData.cvCacheMaps = {};
   reactData.isRowLoading = true;
   reactData.scrollVMLoading = false;
-  // internalData.treeExpandedMaps = {}
   reactData.treeExpandedFlag++;
-  // internalData.rowExpandedMaps = {}
   reactData.rowExpandedFlag++;
   internalData.insertRowMaps = {};
   reactData.insertRowFlag++;
@@ -9951,6 +10065,7 @@ const Methods = {
       isRowGroupStatus
     } = reactData;
     const {
+      currKeyField,
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData,
@@ -9961,11 +10076,15 @@ const Methods = {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
     const fullDataRowIdMaps = {};
+    const idMaps = {};
     const {
       handleUpdateRowId
     } = createHandleUpdateRowId($xeTable);
     const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
       let rowRest = fullAllDataRowIdMaps[rowid];
+      if (idMaps[rowid]) {
+        errLog('vxe.error.repeatKey', [currKeyField, rowid]);
+      }
       if (!rowRest) {
         rowRest = {
           row,
@@ -9993,6 +10112,7 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      idMaps[rowid] = true;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
@@ -14078,8 +14198,32 @@ const Methods = {
   /**
    * 用于当前行，获取当前行的数据
    */
-  getCurrentRecord() {
-    return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null;
+  getCurrentRecord(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      currentRow
+    } = reactData;
+    const {
+      fullDataRowIdData,
+      afterFullRowMaps
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    if (rowOpts.isCurrent || props.highlightCurrentRow) {
+      const rowid = getRowid($xeTable, currentRow);
+      if (isFull) {
+        if (fullDataRowIdData[rowid]) {
+          return currentRow;
+        }
+      } else {
+        if (afterFullRowMaps[rowid]) {
+          return currentRow;
+        }
+      }
+    }
+    return null;
   },
   /**
    * 用于单选行，获取当已选中的数据
@@ -18009,6 +18153,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     tableData,
     dragRow,
     overflowX,
+    overflowY,
     currentColumn,
     scrollXLoad,
     scrollYLoad,
@@ -18246,11 +18391,11 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (overflowX && !isMergeCell) {
+  if (!isMergeCell) {
     if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-      if (scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
-      } else if (scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      } else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }
@@ -29499,7 +29644,7 @@ function renderBody(h, $xeTable) {
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      this.loadTableData(value || [], false).then(() => {
+      this.loadTableData(value || [], true).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,
@@ -29627,116 +29772,7 @@ function renderBody(h, $xeTable) {
     const $xeTable = this;
     const props = $xeTable;
     const internalData = $xeTable;
-    Object.assign($xeTable, {
-      tZindex: 0,
-      currKeyField: '',
-      isCurrDeepKey: false,
-      elemStore: {},
-      // 存放横向 X 虚拟滚动相关的信息
-      scrollXStore: {
-        preloadSize: 0,
-        offsetSize: 0,
-        visibleSize: 0,
-        visibleStartIndex: 0,
-        visibleEndIndex: 0,
-        startIndex: 0,
-        endIndex: 0
-      },
-      // 存放纵向 Y 虚拟滚动相关信息
-      scrollYStore: {
-        preloadSize: 0,
-        offsetSize: 0,
-        visibleSize: 0,
-        visibleStartIndex: 0,
-        visibleEndIndex: 0,
-        startIndex: 0,
-        endIndex: 0
-      },
-      // 表格宽度
-      tableWidth: 0,
-      // 表格高度
-      tableHeight: 0,
-      // 表头高度
-      headerHeight: 0,
-      // 表尾高度
-      footerHeight: 0,
-      // 当前 hover 行
-      // hoverRow: null,
-      // 最后滚动位置
-      lastScrollLeft: 0,
-      lastScrollTop: 0,
-      // 单选框属性，已选中保留的行
-      radioReserveRow: null,
-      // 复选框属性，已选中保留的行集合
-      checkboxReserveRowMap: {},
-      // 行数据，已展开保留的行集合
-      rowExpandedReserveRowMap: {},
-      // 树结构数据，已展开保留的行集合
-      treeExpandedReserveRowMap: {},
-      // 树结构数据，不确定状态的集合
-      treeIndeterminateRowMaps: {},
-      // 列表完整数据、条件处理后
-      tableFullData: [],
-      afterFullData: [],
-      afterTreeFullData: [],
-      afterGroupFullData: [],
-      // 列表条件处理后数据集合
-      afterFullRowMaps: {},
-      // 树结构完整数据、条件处理后
-      tableFullTreeData: [],
-      // 行分组全量数据、条件处理后
-      tableFullGroupData: [],
-      tableSynchData: [],
-      tableSourceData: [],
-      // 收集的列配置（带分组）
-      collectColumn: [],
-      // 完整所有列（不带分组）
-      tableFullColumn: [],
-      // 渲染所有列
-      visibleColumn: [],
-      // 全量数据集（包括当前和已删除）
-      fullAllDataRowIdData: {},
-      // 数据集（仅当前）
-      fullDataRowIdData: {},
-      // 数据集（仅可视）
-      visibleDataRowIdData: {},
-      // 渲染中缓存数据
-      sourceDataRowIdData: {},
-      fullColumnIdData: {},
-      fullColumnFieldData: {},
-      // 合并单元格的数据
-      mergeBodyList: [],
-      mergeBodyMaps: {},
-      // 合并表尾的数据
-      mergeFooterList: [],
-      mergeFooterMaps: {},
-      // 已合并单元格数据集合
-      mergeBodyCellMaps: {},
-      // 已合并表尾数据集合
-      mergeFooterCellMaps: {},
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开的分组行
-      rowGroupExpandedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
-      // 已标记的对象集
-      pendingRowMaps: {},
-      // 已新增的临时行
-      insertRowMaps: {},
-      // 已删除行
-      removeRowMaps: {},
-      cvCacheMaps: {},
-      swYSize: 0,
-      swYInterval: 0,
-      swYTotal: 0
-    });
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, createInternalData());
     handleKeyField($xeTable);
     const {
       data,
@@ -30085,23 +30121,15 @@ function renderBody(h, $xeTable) {
   },
   beforeDestroy() {
     const $xeTable = this;
-    const internalData = $xeTable;
     const tableViewportEl = $xeTable.$refs.refTableViewportElem;
     if (tableViewportEl) {
       tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
     }
-    internalData.cvCacheMaps = {};
-    internalData.prevDragRow = null;
-    internalData.prevDragCol = null;
     if (this.$resize) {
       this.$resize.disconnect();
     }
     this.closeFilter();
     this.closeMenu();
-    this.preventEvent(null, 'beforeDestroy');
-  },
-  destroyed() {
-    const $xeTable = this;
     table_globalEvents.off($xeTable, 'paste');
     table_globalEvents.off($xeTable, 'copy');
     table_globalEvents.off($xeTable, 'cut');
@@ -30111,7 +30139,13 @@ function renderBody(h, $xeTable) {
     table_globalEvents.off($xeTable, 'keydown');
     table_globalEvents.off($xeTable, 'resize');
     table_globalEvents.off($xeTable, 'contextmenu');
+    this.preventEvent(null, 'beforeDestroy');
+  },
+  destroyed() {
+    const $xeTable = this;
+    const internalData = $xeTable;
     this.preventEvent(null, 'destroyed');
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, createInternalData());
   },
   render(h) {
     // 使用已安装的组件，如果未安装则不渲染
@@ -30418,6 +30452,11 @@ const {
   globalMixins: toolbar_globalMixins,
   renderEmptyElement: toolbar_renderEmptyElement
 } = core_.VxeUI;
+function toolbar_createInternalData() {
+  return {
+    connectTable: null
+  };
+}
 /* harmony default export */ var src_toolbar = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeToolbar',
   mixins: [toolbar_globalMixins.sizeMixin],
@@ -30465,9 +30504,7 @@ const {
       connectFlag: 0,
       columns: []
     };
-    const internalData = {
-      connectTable: null
-    };
+    const internalData = toolbar_createInternalData();
     return {
       xID,
       reactData,
@@ -31288,6 +31325,11 @@ const {
       }
     }
   },
+  destroyed() {
+    const $xeToolbar = this;
+    const internalData = $xeToolbar.internalData;
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, toolbar_createInternalData());
+  },
   render(h) {
     return this.renderVN(h);
   }
@@ -31348,6 +31390,11 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
     return $xeTable && $xeTable[name](...args);
   };
 });
+function grid_createInternalData() {
+  return {
+    connectTable: null
+  };
+}
 /* harmony default export */ var grid = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeGrid',
   mixins: [grid_globalMixins.sizeMixin],
@@ -31412,9 +31459,11 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
         currentPage: 1
       }
     };
+    const internalData = grid_createInternalData();
     return {
       xID,
-      reactData
+      reactData,
+      internalData
     };
   },
   computed: {
@@ -33176,7 +33225,9 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
   },
   destroyed() {
     const $xeGrid = this;
+    const internalData = $xeGrid.internalData;
     grid_globalEvents.off($xeGrid, 'keydown');
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, grid_createInternalData());
   },
   render(h) {
     return this.renderVN(h);