vxe-table 4.7.9 → 4.7.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.9",
+  "version": "4.7.11",
   "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.4"
+    "vxe-pc-ui": "^4.0.9"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

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

@@ -49,7 +49,7 @@ export default {
     table: {
       emptyText: 'No Data',
       allTitle: 'Select all / cancel',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'Confirm',
       resetFilter: 'Reset',
       allFilter: 'All',

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

@@ -49,7 +49,7 @@ export default {
     table: {
       emptyText: 'No hay datos',
       allTitle: 'Seleccionar todo / cancelar',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'Confirmar',
       resetFilter: 'Restablecer',
       allFilter: 'Todo',

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

@@ -49,7 +49,7 @@ export default {
     table: {
       emptyText: 'データがありません',
       allTitle: '全て選択/取消',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'OK',
       resetFilter: 'リセット',
       allFilter: '全て',

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

@@ -49,7 +49,7 @@ export default {
     table: {
       emptyText: 'Sem dados',
       allTitle: 'Selecionar todos / cancelar',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'Confirmar',
       resetFilter: 'Redefinir',
       allFilter: 'Todos',

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

@@ -49,7 +49,7 @@ export default {
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
-      seqTitle: '#',
+      seqTitle: '序号',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',

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

@@ -49,7 +49,7 @@ export default {
     table: {
       emptyText: '暫無資料',
       allTitle: '全選/取消',
-      seqTitle: '#',
+      seqTitle: '序號',
       confirmFilter: '篩選',
       resetFilter: '重置',
       allFilter: '全部',

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

@@ -19,7 +19,7 @@ export default defineComponent({
   setup (props) {
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
-    const { props: tableProps, reactData } = $xeTable
+    const { reactData } = $xeTable
     const { computeCustomOpts, computeColumnOpts, computeIsMaxFixedColumn } = $xeTable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
@@ -46,19 +46,6 @@ export default defineComponent({
       }, 300)
     }
 
-    const handleSaveStore = (type: 'confirm' | 'reset') => {
-      const { id } = tableProps
-      const customOpts = computeCustomOpts.value
-      const { storage, updateStore } = customOpts
-      if (storage && id && updateStore) {
-        updateStore({
-          id,
-          type,
-          storeData: $xeTable.getCustomStoreData()
-        })
-      }
-    }
-
     const confirmCustomEvent = (evnt: Event) => {
       const { customColumnList } = reactData
       const customOpts = computeCustomOpts.value
@@ -77,6 +64,7 @@ export default defineComponent({
           if (column.renderVisible && (!column.children || column.children.length)) {
             if (column.renderResizeWidth !== column.renderWidth) {
               column.resizeWidth = column.renderResizeWidth
+              column.renderWidth = column.renderResizeWidth
             }
           }
         }
@@ -86,7 +74,7 @@ export default defineComponent({
       })
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('confirm', evnt)
-      handleSaveStore('confirm')
+      $xeTable.saveCustomStore('confirm')
     }
 
     const cancelCustomEvent = (evnt: Event) => {
@@ -122,7 +110,6 @@ export default defineComponent({
       $xeTable.resetColumn(true)
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('reset', evnt)
-      handleSaveStore('reset')
     }
 
     const resetCustomEvent = (evnt: Event) => {
@@ -164,6 +151,7 @@ export default defineComponent({
       handleOptionCheck(column)
       if (customOpts.immediate) {
         $xeTable.handleCustom()
+        $xeTable.saveCustomStore('update:visible')
       }
       $xeTable.checkCustomStatus()
     }
@@ -497,8 +485,9 @@ export default defineComponent({
       const { customStore } = props
       const { customColumnList } = reactData
       const customOpts = computeCustomOpts.value
-      const { allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
+      const { modalOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
       const columnOpts = computeColumnOpts.value
+      const modalOpts = Object.assign({}, modalOptions)
       const isMaxFixedColumn = computeIsMaxFixedColumn.value
       const trVNs: VNode[] = []
       XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
@@ -617,13 +606,13 @@ export default defineComponent({
       const isAllIndeterminate = customStore.isIndeterminate
       return h(resolveComponent('vxe-modal') as VxeModalComponent, {
         key: 'popup',
-        className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
+        className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
         modelValue: customStore.visible,
-        title: getI18n('vxe.custom.cstmTitle'),
-        width: 700,
-        minWidth: 700,
-        height: 400,
-        minHeight: 400,
+        title: modalOpts.title || getI18n('vxe.custom.cstmTitle'),
+        width: modalOpts.width || '50vw',
+        minWidth: modalOpts.minWidth || 700,
+        height: modalOpts.height || '50vh',
+        minHeight: modalOpts.minHeight || 400,
         mask: true,
         lockView: true,
         showFooter: true,

package/packages/table/src/header.ts

@@ -116,7 +116,7 @@ export default defineComponent({
         tableInternalData._lastResizeTime = Date.now()
         $xeTable.analyColumnWidth()
         $xeTable.recalculate(true).then(() => {
-          $xeTable.saveCustomResizable()
+          $xeTable.saveCustomStore('update:visible')
           $xeTable.updateCellAreas()
           $xeTable.dispatchEvent('resizable-change', { ...params, resizeWidth }, evnt)
         })