vxe-table 4.7.85 → 4.7.87

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.7.85"}`;
+const version = `table v${"4.7.87"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.85",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.87",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.85",
+  "version": "4.7.87",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.2.10"
+    "vxe-pc-ui": "^4.2.19"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/grid/src/grid.ts

@@ -130,19 +130,19 @@ export default defineComponent({
     })
 
     const computePagerOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().grid.pagerConfig, true), props.pagerConfig) as VxeGridPropTypes.PagerConfig
+      return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig) as VxeGridPropTypes.PagerConfig
     })
 
     const computeFormOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().grid.formConfig, true), props.formConfig) as VxeGridPropTypes.FormOpts
+      return Object.assign({}, getConfig().grid.formConfig, props.formConfig) as VxeGridPropTypes.FormOpts
     })
 
     const computeToolbarOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().grid.toolbarConfig, true), props.toolbarConfig) as VxeGridPropTypes.ToolbarOpts
+      return Object.assign({}, getConfig().grid.toolbarConfig, props.toolbarConfig) as VxeGridPropTypes.ToolbarOpts
     })
 
     const computeZoomOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().grid.zoomConfig, true), props.zoomConfig)
+      return Object.assign({}, getConfig().grid.zoomConfig, props.zoomConfig)
     })
 
     const computeStyles = computed(() => {

package/packages/locale/lang/en-US.ts

@@ -89,7 +89,7 @@ export default {
       goto: 'Go to',
       gotoTitle: 'Number',
       pagesize: '{0}/page',
-      total: 'Total {0} record',
+      total: 'Total {0} records',
       pageClassifier: '',
       homePage: 'Home',
       homePageTitle: 'Home page',
@@ -320,6 +320,9 @@ export default {
         fileTitle: 'Upload file'
       }
     },
+    empty: {
+      defText: 'No Data'
+    },
     formDesign: {
       formName: 'Form name',
       defFormTitle: 'Unnamed form',

package/packages/table/module/export/import-panel.ts

@@ -102,7 +102,7 @@ export default defineComponent({
           modelValue: storeData.visible,
           title: getI18n('vxe.import.impTitle'),
           className: 'vxe-table-import-popup-wrapper',
-          width: 520,
+          width: 540,
           mask: true,
           lockView: true,
           showFooter: false,

package/packages/table/src/table.ts

@@ -382,15 +382,15 @@ export default defineComponent({
     })
 
     const computeValidOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.validConfig, true), props.validConfig) as VxeTablePropTypes.ValidOpts
+      return Object.assign({}, getConfig().table.validConfig, props.validConfig) as VxeTablePropTypes.ValidOpts
     })
 
     const computeSXOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.scrollX, true), props.scrollX) as VxeTablePropTypes.SXOpts
+      return Object.assign({}, getConfig().table.scrollX, props.scrollX) as VxeTablePropTypes.SXOpts
     })
 
     const computeSYOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.scrollY, true), props.scrollY) as VxeTablePropTypes.SYOpts
+      return Object.assign({}, getConfig().table.scrollY, props.scrollY) as VxeTablePropTypes.SYOpts
     })
 
     const computeRowHeightMaps = computed(() => {
@@ -403,37 +403,37 @@ export default defineComponent({
     })
 
     const computeColumnOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.columnConfig, true), props.columnConfig) as VxeTablePropTypes.ColumnOpts
+      return Object.assign({}, getConfig().table.columnConfig, props.columnConfig) as VxeTablePropTypes.ColumnOpts
     })
 
     const computeRowOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.rowConfig, true), props.rowConfig) as VxeTablePropTypes.RowOpts
+      return Object.assign({}, getConfig().table.rowConfig, props.rowConfig) as VxeTablePropTypes.RowOpts
     })
 
     const computeResizeOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.resizeConfig, true), props.resizeConfig) as VxeTablePropTypes.ResizeOpts
+      return Object.assign({}, getConfig().table.resizeConfig, props.resizeConfig) as VxeTablePropTypes.ResizeOpts
     })
 
     const computeResizableOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.resizableConfig, true), props.resizableConfig) as VxeTablePropTypes.ResizableOpts
+      return Object.assign({}, getConfig().table.resizableConfig, props.resizableConfig) as VxeTablePropTypes.ResizableOpts
     })
 
     const computeSeqOpts = computed(() => {
-      return Object.assign({ startIndex: 0 }, XEUtils.clone(getConfig().table.seqConfig, true), props.seqConfig) as VxeTablePropTypes.SeqOpts
+      return Object.assign({ startIndex: 0 }, getConfig().table.seqConfig, props.seqConfig) as VxeTablePropTypes.SeqOpts
     })
 
     const computeRadioOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.radioConfig, true), props.radioConfig) as VxeTablePropTypes.RadioOpts
+      return Object.assign({}, getConfig().table.radioConfig, props.radioConfig) as VxeTablePropTypes.RadioOpts
     })
 
     const computeCheckboxOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.checkboxConfig, true), props.checkboxConfig) as VxeTablePropTypes.CheckboxOpts
+      return Object.assign({}, getConfig().table.checkboxConfig, props.checkboxConfig) as VxeTablePropTypes.CheckboxOpts
     })
 
     let computeTooltipOpts = ref() as ComputedRef<VxeTablePropTypes.TooltipOpts>
 
     computeTooltipOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().tooltip, true), XEUtils.clone(getConfig().table.tooltipConfig, true), props.tooltipConfig)
+      return Object.assign({}, getConfig().tooltip, getConfig().table.tooltipConfig, props.tooltipConfig)
     })
 
     const computeTipConfig = computed(() => {
@@ -449,39 +449,39 @@ export default defineComponent({
     })
 
     const computeEditOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.editConfig, true), props.editConfig) as VxeTablePropTypes.EditOpts
+      return Object.assign({}, getConfig().table.editConfig, props.editConfig) as VxeTablePropTypes.EditOpts
     })
 
     const computeSortOpts = computed(() => {
-      return Object.assign({ orders: ['asc', 'desc', null] }, XEUtils.clone(getConfig().table.sortConfig, true), props.sortConfig) as VxeTablePropTypes.SortOpts
+      return Object.assign({ orders: ['asc', 'desc', null] }, getConfig().table.sortConfig, props.sortConfig) as VxeTablePropTypes.SortOpts
     })
 
     const computeFilterOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.filterConfig, true), props.filterConfig) as VxeTablePropTypes.FilterOpts
+      return Object.assign({}, getConfig().table.filterConfig, props.filterConfig) as VxeTablePropTypes.FilterOpts
     })
 
     const computeMouseOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.mouseConfig, true), props.mouseConfig) as VxeTablePropTypes.MouseOpts
+      return Object.assign({}, getConfig().table.mouseConfig, props.mouseConfig) as VxeTablePropTypes.MouseOpts
     })
 
     const computeAreaOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.areaConfig, true), props.areaConfig) as VxeTablePropTypes.AreaOpts
+      return Object.assign({}, getConfig().table.areaConfig, props.areaConfig) as VxeTablePropTypes.AreaOpts
     })
 
     const computeKeyboardOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.keyboardConfig, true), props.keyboardConfig) as VxeTablePropTypes.KeyboardOpts
+      return Object.assign({}, getConfig().table.keyboardConfig, props.keyboardConfig) as VxeTablePropTypes.KeyboardOpts
     })
 
     const computeClipOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.clipConfig, true), props.clipConfig)
+      return Object.assign({}, getConfig().table.clipConfig, props.clipConfig)
     })
 
     const computeFNROpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.fnrConfig, true), props.fnrConfig) as VxeTablePropTypes.FNROpts
+      return Object.assign({}, getConfig().table.fnrConfig, props.fnrConfig) as VxeTablePropTypes.FNROpts
     })
 
     const computeMenuOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.menuConfig, true), props.menuConfig) as VxeTablePropTypes.MenuOpts
+      return Object.assign({}, getConfig().table.menuConfig, props.menuConfig) as VxeTablePropTypes.MenuOpts
     })
 
     const computeHeaderMenu = computed(() => {
@@ -522,31 +522,31 @@ export default defineComponent({
     })
 
     const computeExportOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.exportConfig, true), props.exportConfig) as VxeTablePropTypes.ExportOpts
+      return Object.assign({}, getConfig().table.exportConfig, props.exportConfig) as VxeTablePropTypes.ExportOpts
     })
 
     const computeImportOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.importConfig, true), props.importConfig) as VxeTablePropTypes.ImportOpts
+      return Object.assign({}, getConfig().table.importConfig, props.importConfig) as VxeTablePropTypes.ImportOpts
     })
 
     const computePrintOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.printConfig, true), props.printConfig) as VxeTablePropTypes.PrintOpts
+      return Object.assign({}, getConfig().table.printConfig, props.printConfig) as VxeTablePropTypes.PrintOpts
     })
 
     const computeExpandOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.expandConfig, true), props.expandConfig) as VxeTablePropTypes.ExpandOpts
+      return Object.assign({}, getConfig().table.expandConfig, props.expandConfig) as VxeTablePropTypes.ExpandOpts
     })
 
     const computeTreeOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.treeConfig, true), props.treeConfig) as VxeTablePropTypes.TreeOpts
+      return Object.assign({}, getConfig().table.treeConfig, props.treeConfig) as VxeTablePropTypes.TreeOpts
     })
 
     const computeEmptyOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.emptyRender, true), props.emptyRender) as VxeTablePropTypes.EmptyOpts
+      return Object.assign({}, getConfig().table.emptyRender, props.emptyRender) as VxeTablePropTypes.EmptyOpts
     })
 
     const computeLoadingOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.loadingConfig, true), props.loadingConfig) as VxeTablePropTypes.LoadingOpts
+      return Object.assign({}, getConfig().table.loadingConfig, props.loadingConfig) as VxeTablePropTypes.LoadingOpts
     })
 
     const computeCellOffsetWidth = computed(() => {
@@ -554,7 +554,7 @@ export default defineComponent({
     })
 
     const computeCustomOpts = computed(() => {
-      return Object.assign({}, XEUtils.clone(getConfig().table.customConfig, true), props.customConfig)
+      return Object.assign({}, getConfig().table.customConfig, props.customConfig)
     })
 
     const computeAutoWidthColumnList = computed(() => {
@@ -770,9 +770,9 @@ export default defineComponent({
             }
           }
         }
-        return { toVisibleIndex: Math.max(0, toVisibleIndex), visibleSize: Math.max(8, visibleSize) }
+        return { toVisibleIndex: Math.max(0, toVisibleIndex), visibleSize: Math.max(6, visibleSize) }
       }
-      return { toVisibleIndex: 0, visibleSize: 8 }
+      return { toVisibleIndex: 0, visibleSize: 6 }
     }
 
     const computeVirtualY = () => {
@@ -5446,11 +5446,13 @@ export default defineComponent({
       cacheRowMap (isSource) {
         const { treeConfig } = props
         const treeOpts = computeTreeOpts.value
-        let { fullDataRowIdData, fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
+        const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
         const childrenField = treeOpts.children || treeOpts.childrenField
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
         const rowkey = getRowkey($xeTable)
         const isLazy = treeConfig && treeOpts.lazy
+        const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
+        const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
         const handleRow = (row: any, index: any, items: any, path?: any[], parent?: any, nodes?: any[]) => {
           let rowid = getRowid($xeTable, row)
           const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
@@ -5462,16 +5464,20 @@ export default defineComponent({
           if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
             row[childrenField] = null
           }
-          const rest = { row, rowid, seq, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items, parent, level }
+          let cacheItem = fullAllDataRowIdData[rowid]
+          if (!cacheItem) {
+            cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent, level }
+          }
           if (isSource) {
-            fullDataRowIdData[rowid] = rest
+            cacheItem.index = treeConfig && parent ? -1 : index
+            fullDataRowIdMaps[rowid] = cacheItem
           }
-          fullAllDataRowIdData[rowid] = rest
+          fullAllDataRowIdMaps[rowid] = cacheItem
         }
         if (isSource) {
-          fullDataRowIdData = internalData.fullDataRowIdData = {}
+          internalData.fullDataRowIdData = fullDataRowIdMaps
         }
-        fullAllDataRowIdData = internalData.fullAllDataRowIdData = {}
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
         if (treeConfig) {
           XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField })
         } else {
@@ -7179,7 +7185,7 @@ export default defineComponent({
           resizeObserver = globalResize.create(handleOptimizeResize
             ? () => {
                 if (props.autoResize) {
-                  requestAnimationFrame(handleOptimizeResize)
+                  handleOptimizeResize()
                 }
               }
             : () => {

package/types/all.d.ts

@@ -7,6 +7,7 @@ declare global {
      * @deprecated
      */
     VXETable: VxeUIExport;
+    VxeUITable: VxeUIExport;
   }
 }