vxe-table 4.7.40 → 4.7.42

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.40"}`;
+const version = `table v${"4.7.42"}`;
 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.40",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.42",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.40",
+  "version": "4.7.42",
   "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.0.42"
+    "vxe-pc-ui": "^4.0.46"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

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

@@ -1,7 +1,3 @@
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -126,7 +122,8 @@ export default {
         colTitle: 'Title',
         colResizable: 'Column width (px)',
         colVisible: 'Display',
-        colFixed: 'Freeze columns (Max. {0})',
+        colFixed: 'Freeze columns',
+        colFixedMax: 'Freeze columns (Max. {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/es-ES.ts

@@ -1,7 +1,3 @@
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -126,7 +122,8 @@ export default {
         colTitle: 'Title',
         colResizable: 'Column width (px)',
         colVisible: 'Display',
-        colFixed: 'Freeze columns (Max {0})',
+        colFixed: 'Freeze columns',
+        colFixedMax: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/ja-JP.ts

@@ -1,7 +1,3 @@
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -126,7 +122,8 @@ export default {
         colTitle: 'タイトル',
         colResizable: 'Column width (px)',
         colVisible: 'Display',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '指定しない',
         fixedRight: '右側'

package/packages/locale/lang/pt-BR.ts

@@ -1,7 +1,3 @@
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -126,7 +122,8 @@ export default {
         colTitle: 'Title',
         colResizable: 'Column width (px)',
         colVisible: 'Display',
-        colFixed: 'Freeze columns (Max {0})',
+        colFixed: 'Freeze columns',
+        colFixedMax: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/zh-CN.ts

@@ -1,7 +1,3 @@
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -126,7 +122,8 @@ export default {
         colTitle: '标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'
@@ -134,10 +131,10 @@ export default {
     },
     import: {
       modes: {
-        covering: 'Overwrite mode (directly overwrite table data)',
-        insert: 'Bottom append (appends new data to the bottom of the table)',
-        insertTop: 'Top append (appends new data to the top of the table)',
-        insertBottom: 'Bottom append (appends new data to the bottom of the table)'
+        covering: '覆盖方式（直接覆盖表格数据）',
+        insert: '底部追加（在表格的底部追加新数据）',
+        insertTop: '顶部追加（在表格的顶部追加新数据）',
+        insertBottom: '底部追加（在表格的底部追加新数据）'
       },
       impTitle: '导入数据',
       impFile: '文件名',

package/packages/locale/lang/zh-TC.ts

@@ -1,7 +1,3 @@
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -23,7 +19,7 @@ export default {
       useErr: '安裝 "{0}" 模組時發生錯誤，可能順序不正確，依賴的模組需要在Table之前安裝',
       barUnableLink: '工具欄無法關聯表格',
       expandContent: '展開行的插槽應該是 “content”，請檢查是否正確',
-      reqComp: '缺少 "{0}" 組件，請檢查是否正確安裝',
+      reqComp: '缺少 "{0}" 組件，请检查是否正确安装',
       reqModule: '缺少 "{0}" 模組',
       reqProp: '缺少必要的 "{0}" 參數，可能會導致出現錯誤',
       emptyProp: '參數 "{0}" 不允許為空',
@@ -126,7 +122,8 @@ export default {
         colTitle: '標題',
         colResizable: '列宽（像素）',
         colVisible: '是否顯示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '不設定',
         fixedRight: '右側'

package/packages/table/module/custom/panel.ts

@@ -495,6 +495,7 @@ export default defineComponent({
       const customOpts = computeCustomOpts.value
       const { modalOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
       const columnOpts = computeColumnOpts.value
+      const { maxFixedSize } = columnOpts
       const modalOpts = Object.assign({}, modalOptions)
       const isMaxFixedColumn = computeIsMaxFixedColumn.value
       const trVNs: VNode[] = []
@@ -630,12 +631,15 @@ export default defineComponent({
           minWidth: modalOpts.minWidth || 700,
           height: modalOpts.height || '50vh',
           minHeight: modalOpts.minHeight || 400,
-          mask: true,
-          lockView: true,
-          showFooter: true,
-          resize: true,
-          escClosable: true,
+          showZoom: modalOpts.showZoom,
+          showMaximize: modalOpts.showMaximize,
+          showMinimize: modalOpts.showMinimize,
+          mask: modalOpts.mask,
+          lockView: modalOpts.lockView,
+          resize: modalOpts.resize,
+          escClosable: !!modalOpts.escClosable,
           destroyOnClose: true,
+          showFooter: true,
           'onUpdate:modelValue' (value: any) {
             customStore.visible = value
           }
@@ -729,7 +733,7 @@ export default defineComponent({
                         ? h('th', {}, getI18n('vxe.custom.setting.colResizable'))
                         : createCommentVNode(),
                       allowFixed
-                        ? h('th', {}, getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))
+                        ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize]))
                         : createCommentVNode()
                     ])
                   ]),

package/packages/table/module/export/hook.ts

@@ -279,7 +279,7 @@ function checkImportData (columns: any[], fields: string[]) {
   return fields.some(field => tableFields.indexOf(field) > -1)
 }
 
-const tableExportMethodKeys: (keyof TableExportMethods)[] = ['exportData', 'importByFile', 'importData', 'saveFile', 'readFile', 'print', 'openImport', 'openExport', 'openPrint']
+const tableExportMethodKeys: (keyof TableExportMethods)[] = ['exportData', 'importByFile', 'importData', 'saveFile', 'readFile', 'print', 'getPrintHtml', 'openImport', 'openExport', 'openPrint']
 
 hooks.add('tableExportModule', {
   setupTable ($xeTable) {

package/packages/table/module/filter/hook.ts

@@ -3,6 +3,7 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { toFilters, handleFieldOrColumn } from '../../src/util'
 import { getDomNode, triggerEvent } from '../../../ui/src/dom'
+import { isEnableConf } from '../../../ui/src/utils'
 
 import type { TableFilterMethods, TableFilterPrivateMethods } from '../../../../types'
 
@@ -39,7 +40,7 @@ hooks.add('tableFilterModule', {
           const { target: targetElem, pageX } = evnt
           const { visibleWidth } = getDomNode()
           const { filters, filterMultiple, filterRender } = column
-          const compConf = filterRender ? renderer.get(filterRender.name) : null
+          const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
           const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
           internalData._currFilterParams = params
           Object.assign(filterStore, {
@@ -118,7 +119,7 @@ hooks.add('tableFilterModule', {
         if (column) {
           const { filters, filterRender } = column
           if (filters) {
-            const compConf = filterRender ? renderer.get(filterRender.name) : null
+            const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
             const frMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null)
             filters.forEach((item: any) => {
               item._checked = false

package/packages/table/module/filter/panel.ts

@@ -1,6 +1,6 @@
 import { defineComponent, h, computed, inject } from 'vue'
 import { VxeUI } from '../../../ui'
-import { formatText } from '../../../ui/src/utils'
+import { formatText, isEnableConf } from '../../../ui/src/utils'
 import { getPropClass } from '../../../ui/src/dom'
 import { getSlotVNs } from '../../../ui/src/vn'
 
@@ -190,8 +190,8 @@ export default defineComponent({
       const { column, multiple } = filterStore
       const filterOpts = computeFilterOpts.value
       const hasCheckOption = computeHasCheckOption.value
-      const filterRender = column.filterRender
-      const compConf = filterRender ? renderer.get(filterRender.name) : null
+      const { filterRender } = column
+      const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
       return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true)
         ? [
@@ -218,7 +218,7 @@ export default defineComponent({
       const { initStore } = tableReactData
       const { column } = filterStore
       const filterRender = column ? column.filterRender : null
-      const compConf = filterRender ? renderer.get(filterRender.name) : null
+      const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
       const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : ''
       const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable })
       return h('div', {

package/packages/table/src/header.ts

@@ -119,6 +119,7 @@ export default defineComponent({
           $xeTable.saveCustomStore('update:visible')
           $xeTable.updateCellAreas()
           $xeTable.dispatchEvent('resizable-change', { ...params, resizeWidth }, evnt)
+          setTimeout(() => $xeTable.recalculate(true), 300)
         })
         removeClass(tableEl, 'drag--resize')
       }

package/packages/table/src/table.ts

@@ -541,7 +541,7 @@ export default defineComponent({
       let fixedSize = 0
       // 只判断第一层
       collectColumn.forEach((column) => {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++
         }
       })
@@ -898,27 +898,29 @@ export default defineComponent({
     }
 
     const handleCustomRestore = (storeData: VxeTableDefines.CustomStoreData) => {
-      const { tableFullColumn } = internalData
       let { collectColumn } = internalData
       const { resizableData, sortData, visibleData, fixedData } = storeData
       let hasCustomSort = false
       // 处理还原
       if (resizableData || sortData || visibleData || fixedData) {
-        tableFullColumn.forEach(column => {
+        XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
           const colKey = column.getKey()
+          // 支持一级
+          if (!parent) {
+            if (fixedData && fixedData[colKey]) {
+              column.fixed = fixedData[colKey]
+            }
+            if (sortData && XEUtils.isNumber(sortData[colKey])) {
+              hasCustomSort = true
+              column.renderSortNumber = sortData[colKey]
+            }
+          }
           if (resizableData && XEUtils.isNumber(resizableData[colKey])) {
             column.resizeWidth = resizableData[colKey]
           }
           if (visibleData && XEUtils.isBoolean(visibleData[colKey])) {
             column.visible = visibleData[colKey]
           }
-          if (fixedData && fixedData[colKey]) {
-            column.fixed = fixedData[colKey]
-          }
-          if (sortData && XEUtils.isNumber(sortData[colKey])) {
-            hasCustomSort = true
-            column.renderSortNumber = sortData[colKey]
-          }
         })
         // 如果自定义了顺序
         if (hasCustomSort) {
@@ -1364,7 +1366,7 @@ export default defineComponent({
           const handleFilter = (row: any) => {
             return filterColumns.every(({ column, valueList, itemList }) => {
               const { filterMethod, filterRender } = column
-              const compConf = filterRender ? renderer.get(filterRender.name) : null
+              const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
               const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null
               const tdFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
               const cellValue = getCellValue(row, column)
@@ -3318,14 +3320,13 @@ export default defineComponent({
         const targetColumn = getRootColumn($xeTable, column as any)
         const isMaxFixedColumn = computeIsMaxFixedColumn.value
         const columnOpts = computeColumnOpts.value
-        const { maxFixedSize } = columnOpts
         if (targetColumn && targetColumn.fixed !== fixed) {
           // 是否超过最大固定列数量
           if (!targetColumn.fixed && isMaxFixedColumn) {
             if (VxeUI.modal) {
               VxeUI.modal.message({
                 status: 'error',
-                content: getI18n('vxe.table.maxFixedCol', [maxFixedSize])
+                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
               })
             }
             return nextTick()
@@ -4595,7 +4596,7 @@ export default defineComponent({
         let hasFixedt = 0
         let hasVisible = 0
         XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-          // 排序只支持一级
+          // 只支持一级
           if (!parent) {
             collectColumn.forEach((column) => {
               const colKey = column.getKey()
@@ -4604,6 +4605,13 @@ export default defineComponent({
                 sortData[colKey] = column.renderSortNumber
               }
             })
+            if (column.fixed && column.fixed !== column.defaultFixed) {
+              const colKey = column.getKey()
+              if (colKey) {
+                hasFixedt = 1
+                fixedData[colKey] = column.fixed
+              }
+            }
           }
           if (column.resizeWidth) {
             const colKey = column.getKey()
@@ -4612,13 +4620,6 @@ export default defineComponent({
               resizableData[colKey] = column.renderWidth
             }
           }
-          if (column.fixed && column.fixed !== column.defaultFixed) {
-            const colKey = column.getKey()
-            if (colKey) {
-              hasFixedt = 1
-              fixedData[colKey] = column.fixed
-            }
-          }
           if (!checkMethod || checkMethod({ column })) {
             if (!column.visible && column.defaultVisible) {
               const colKey = column.getKey()

package/packages/ui/index.ts

@@ -68,9 +68,16 @@ VxeUI.setConfig({
       allowFixed: true,
       allowSort: true,
       showFooter: true,
-      placement: 'top-right'
+      placement: 'top-right',
       //  storage: false,
-      //  checkMethod () {}
+      //  checkMethod () {},
+      modalOptions: {
+        showMaximize: true,
+        mask: true,
+        lockView: true,
+        resize: true,
+        escClosable: true
+      }
     },
     sortConfig: {
       // remote: false,