vxe-table 4.23.8 → 4.23.9

package/lib/table/src/util.js

@@ -904,17 +904,20 @@ function createColumn($xeTable, options, renderOptions) {
 }
 function watchColumn($xeTable, props, column) {
   Object.keys(props).forEach((name) => {
-    (0, import_vue.watch)(() => props[name], (value) => {
-      column.update(name, value);
-      if ($xeTable) {
-        if (name === "filters") {
-          $xeTable.setFilter(column, value);
-          $xeTable.handleUpdateDataQueue();
-        } else if (["visible", "fixed", "width", "minWidth", "maxWidth"].includes(name)) {
-          $xeTable.handleRefreshColumnQueue();
+    (0, import_vue.watch)(
+      () => props[name],
+      (value) => {
+        column.update(name, value);
+        if ($xeTable) {
+          if (name === "filters") {
+            $xeTable.setFilter(column, value);
+            $xeTable.handleUpdateDataQueue();
+          } else if (["visible", "fixed", "width", "minWidth", "maxWidth"].includes(name)) {
+            $xeTable.handleRefreshColumnQueue();
+          }
         }
       }
-    });
+    );
   });
 }
 function assembleColumn($xeTable, elem, column, colgroup) {
@@ -989,20 +992,13 @@ function clearTableDefaultStatus($xeTable) {
     $xeTable.clearPendingRow()
   ];
   if ($xeTable.clearFilter) {
-    actionList.push(
-      $xeTable.clearFilter()
-    );
+    actionList.push($xeTable.clearFilter());
   }
   if ($xeTable.clearSelected && ((0, import_utils.hasEnableConf)(keyboardConfig, keyboardOpts) || (0, import_utils.hasEnableConf)(mouseConfig, mouseOpts))) {
-    actionList.push(
-      $xeTable.clearSelected()
-    );
+    actionList.push($xeTable.clearSelected());
   }
   if ($xeTable.clearCellAreas && (0, import_utils.hasEnableConf)(mouseConfig, mouseOpts)) {
-    actionList.push(
-      $xeTable.clearCellAreas(),
-      $xeTable.clearCopyCellArea()
-    );
+    actionList.push($xeTable.clearCellAreas(), $xeTable.clearCopyCellArea());
   }
   return Promise.all(actionList).then(() => {
     return $xeTable.clearScroll();

package/lib/toolbar/src/toolbar.js

@@ -85,10 +85,7 @@ var toolbar_default = (0, import_comp.defineVxeComponent)({
     },
     className: [String, Function]
   },
-  emits: [
-    "button-click",
-    "tool-click"
-  ],
+  emits: ["button-click", "tool-click"],
   setup(props, context) {
     const { slots, emit } = context;
     const xID = import_xe_utils.default.uniqueId();
@@ -401,24 +398,32 @@ var toolbar_default = (0, import_comp.defineVxeComponent)({
               const toolbarButtonClassName = compConf.toolbarButtonClassName;
               const params = { $grid: $xeGrid, $gantt: $xeGantt, $table, button: item };
               btnVNs.push(
-                (0, import_vue.h)("span", {
-                  key: `br${item.code || index}`,
-                  class: ["vxe-button--item", toolbarButtonClassName ? import_xe_utils.default.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : ""]
-                }, (0, import_vn.getSlotVNs)(compConf.renderToolbarButton(buttonRender, params)))
+                (0, import_vue.h)(
+                  "span",
+                  {
+                    key: `br${item.code || index}`,
+                    class: ["vxe-button--item", toolbarButtonClassName ? import_xe_utils.default.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : ""]
+                  },
+                  (0, import_vn.getSlotVNs)(compConf.renderToolbarButton(buttonRender, params))
+                )
               );
             } else {
               if (VxeUIButtonComponent) {
                 btnVNs.push(
-                  (0, import_vue.h)(VxeUIButtonComponent, {
-                    key: `bd${item.code || index}`,
-                    ...Object.assign({}, item, {
-                      content: item.content || item.name,
-                      options: void 0
-                    }),
-                    onClick: (eventParams) => btnEvent(eventParams, item)
-                  }, dropdowns && dropdowns.length ? {
-                    dropdowns: () => renderDropdowns(item, true)
-                  } : {})
+                  (0, import_vue.h)(
+                    VxeUIButtonComponent,
+                    {
+                      key: `bd${item.code || index}`,
+                      ...Object.assign({}, item, {
+                        content: item.content || item.name,
+                        options: void 0
+                      }),
+                      onClick: (eventParams) => btnEvent(eventParams, item)
+                    },
+                    dropdowns && dropdowns.length ? {
+                      dropdowns: () => renderDropdowns(item, true)
+                    } : {}
+                  )
                 );
               }
             }
@@ -426,15 +431,27 @@ var toolbar_default = (0, import_comp.defineVxeComponent)({
         });
       }
       return [
-        (0, import_vue.h)("div", {
-          class: "vxe-button--prefix-wrapper"
-        }, buttonPrefixSlot ? (0, import_vn.getSlotVNs)(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []),
-        (0, import_vue.h)("div", {
-          class: "vxe-button--item-wrapper"
-        }, buttonsSlot ? (0, import_vn.getSlotVNs)(buttonsSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs),
-        (0, import_vue.h)("div", {
-          class: "vxe-button--suffix-wrapper"
-        }, buttonSuffixSlot ? (0, import_vn.getSlotVNs)(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : [])
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-button--prefix-wrapper"
+          },
+          buttonPrefixSlot ? (0, import_vn.getSlotVNs)(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-button--item-wrapper"
+          },
+          buttonsSlot ? (0, import_vn.getSlotVNs)(buttonsSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-button--suffix-wrapper"
+          },
+          buttonSuffixSlot ? (0, import_vn.getSlotVNs)(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        )
       ];
     };
     const renderRightTools = () => {
@@ -456,24 +473,32 @@ var toolbar_default = (0, import_comp.defineVxeComponent)({
               const toolbarToolClassName = compConf.toolbarToolClassName;
               const params = { $grid: $xeGrid, $gantt: $xeGantt, $table, tool: item };
               btnVNs.push(
-                (0, import_vue.h)("span", {
-                  key: tIndex,
-                  class: ["vxe-tool--item", toolbarToolClassName ? import_xe_utils.default.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : ""]
-                }, (0, import_vn.getSlotVNs)(compConf.renderToolbarTool(toolRender, params)))
+                (0, import_vue.h)(
+                  "span",
+                  {
+                    key: tIndex,
+                    class: ["vxe-tool--item", toolbarToolClassName ? import_xe_utils.default.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : ""]
+                  },
+                  (0, import_vn.getSlotVNs)(compConf.renderToolbarTool(toolRender, params))
+                )
               );
             } else {
               if (VxeUIButtonComponent) {
                 btnVNs.push(
-                  (0, import_vue.h)(VxeUIButtonComponent, {
-                    key: tIndex,
-                    ...Object.assign({}, item, {
-                      content: item.content || item.name,
-                      options: void 0
-                    }),
-                    onClick: (eventParams) => tolEvent(eventParams, item)
-                  }, dropdowns && dropdowns.length ? {
-                    dropdowns: () => renderDropdowns(item, false)
-                  } : {})
+                  (0, import_vue.h)(
+                    VxeUIButtonComponent,
+                    {
+                      key: tIndex,
+                      ...Object.assign({}, item, {
+                        content: item.content || item.name,
+                        options: void 0
+                      }),
+                      onClick: (eventParams) => tolEvent(eventParams, item)
+                    },
+                    dropdowns && dropdowns.length ? {
+                      dropdowns: () => renderDropdowns(item, false)
+                    } : {}
+                  )
                 );
               }
             }
@@ -481,15 +506,27 @@ var toolbar_default = (0, import_comp.defineVxeComponent)({
         });
       }
       return [
-        (0, import_vue.h)("div", {
-          class: "vxe-tool--prefix-wrapper"
-        }, toolPrefixSlot ? (0, import_vn.getSlotVNs)(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []),
-        (0, import_vue.h)("div", {
-          class: "vxe-tool--item-wrapper"
-        }, toolsSlot ? (0, import_vn.getSlotVNs)(toolsSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs),
-        (0, import_vue.h)("div", {
-          class: "vxe-tool--suffix-wrapper"
-        }, toolSuffixSlot ? (0, import_vn.getSlotVNs)(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : [])
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-tool--prefix-wrapper"
+          },
+          toolPrefixSlot ? (0, import_vn.getSlotVNs)(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-tool--item-wrapper"
+          },
+          toolsSlot ? (0, import_vn.getSlotVNs)(toolsSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-tool--suffix-wrapper"
+          },
+          toolSuffixSlot ? (0, import_vn.getSlotVNs)(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        )
       ];
     };
     const renderToolImport = () => {
@@ -565,31 +602,51 @@ var toolbar_default = (0, import_comp.defineVxeComponent)({
     const renderVN = () => {
       const { perfect, loading, refresh, zoom, custom, className } = props;
       const vSize = computeSize.value;
-      return (0, import_vue.h)("div", {
-        ref: refElem,
-        class: ["vxe-toolbar", className ? import_xe_utils.default.isFunction(className) ? className({ $toolbar: $xeToolbar }) : className : "", {
-          [`size--${vSize}`]: vSize,
-          "is--perfect": perfect,
-          "is--loading": loading
-        }]
-      }, [
-        (0, import_vue.h)("div", {
-          class: "vxe-buttons--wrapper"
-        }, renderLeftBtns()),
-        (0, import_vue.h)("div", {
-          class: "vxe-tools--wrapper"
-        }, renderRightTools()),
-        (0, import_vue.h)("div", {
-          class: "vxe-tools--operate"
-        }, [
-          props.import ? renderToolImport() : (0, import_vue.createCommentVNode)(),
-          props.export ? renderToolExport() : (0, import_vue.createCommentVNode)(),
-          props.print ? renderToolPrint() : (0, import_vue.createCommentVNode)(),
-          refresh ? renderToolRefresh() : (0, import_vue.createCommentVNode)(),
-          zoom && $xeGGWrapper ? renderToolZoom() : (0, import_vue.createCommentVNode)(),
-          custom ? renderToolCustom() : (0, import_vue.createCommentVNode)()
-        ])
-      ]);
+      return (0, import_vue.h)(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-toolbar",
+            className ? import_xe_utils.default.isFunction(className) ? className({ $toolbar: $xeToolbar }) : className : "",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--perfect": perfect,
+              "is--loading": loading
+            }
+          ]
+        },
+        [
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-buttons--wrapper"
+            },
+            renderLeftBtns()
+          ),
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-tools--wrapper"
+            },
+            renderRightTools()
+          ),
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-tools--operate"
+            },
+            [
+              props.import ? renderToolImport() : (0, import_vue.createCommentVNode)(),
+              props.export ? renderToolExport() : (0, import_vue.createCommentVNode)(),
+              props.print ? renderToolPrint() : (0, import_vue.createCommentVNode)(),
+              refresh ? renderToolRefresh() : (0, import_vue.createCommentVNode)(),
+              zoom && $xeGGWrapper ? renderToolZoom() : (0, import_vue.createCommentVNode)(),
+              custom ? renderToolCustom() : (0, import_vue.createCommentVNode)()
+            ]
+          )
+        ]
+      );
     };
     $xeToolbar.renderVN = renderVN;
     (0, import_vue.nextTick)(() => {

package/lib/ui/index.js

@@ -33,7 +33,7 @@ __export(ui_exports, {
 module.exports = __toCommonJS(ui_exports);
 var import_core = require("@vxe-ui/core");
 var import_utils = require("./src/utils");
-const version = "4.23.8";
+const version = "4.23.9";
 import_core.VxeUI.version = version;
 import_core.VxeUI.tableVersion = version;
 import_core.VxeUI.setConfig({

package/lib/ui/src/dom.js

@@ -297,12 +297,15 @@ function wheelScrollTopTo(diffNum, cb) {
   });
 }
 function updatePanelPlacement(targetElem, panelElem, options) {
-  const { defaultTop, defaultLeft, placement, defaultPlacement, appendTo, teleportTo, marginSize, isMinWidth } = Object.assign({
-    appendTo: "",
-    teleportTo: false,
-    marginSize: 18,
-    isMinWidth: true
-  }, options);
+  const { defaultTop, defaultLeft, placement, defaultPlacement, appendTo, teleportTo, marginSize, isMinWidth } = Object.assign(
+    {
+      appendTo: "",
+      teleportTo: false,
+      marginSize: 18,
+      isMinWidth: true
+    },
+    options
+  );
   let panelPlacement = "bottom";
   let top = "";
   let bottom = "";

package/lib/ui/src/log.js

@@ -25,7 +25,7 @@ __export(log_exports, {
 module.exports = __toCommonJS(log_exports);
 var import_core = require("@vxe-ui/core");
 const { log } = import_core.VxeUI;
-const tableVersion = `table v${"4.23.8"}`;
+const tableVersion = `table v${"4.23.9"}`;
 function createComponentLog(name) {
   const uiVersion = import_core.VxeUI.uiVersion ? `ui v${import_core.VxeUI.uiVersion}` : "";
   const ganttVersion = import_core.VxeUI.ganttVersion ? `gantt v${import_core.VxeUI.ganttVersion}` : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.23.8",
+  "version": "4.23.9",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -75,7 +75,7 @@
     "typescript": "~5.9.3",
     "vue": "3.4.27",
     "vue-router": "~4.5.1",
-    "vxe-pc-ui": "4.20.26"
+    "vxe-pc-ui": "4.20.27"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/colgroup/index.ts

@@ -1,22 +1,22 @@
-import { App } from 'vue'
-import { VxeUI } from '@vxe-ui/core'
-import VxeColgroupComponent from '../table/src/group'
-
-export const VxeColgroup = Object.assign({}, VxeColgroupComponent, {
-  install (app: App) {
-    app.component(VxeColgroupComponent.name as string, VxeColgroupComponent)
-    // 兼容旧用法
-    app.component('VxeTableColgroup', VxeColgroupComponent)
-  }
-})
-
-if (VxeUI.dynamicApp) {
-  VxeUI.dynamicApp.component(VxeColgroupComponent.name as string, VxeColgroupComponent)
-  // 兼容旧用法
-  VxeUI.dynamicApp.component('VxeTableColgroup', VxeColgroupComponent)
-}
-
-VxeUI.component(VxeColgroupComponent)
-
-export const Colgroup = VxeColgroup
-export default VxeColgroup
+import { App } from 'vue'
+import { VxeUI } from '@vxe-ui/core'
+import VxeColgroupComponent from '../table/src/group'
+
+export const VxeColgroup = Object.assign({}, VxeColgroupComponent, {
+  install(app: App) {
+    app.component(VxeColgroupComponent.name as string, VxeColgroupComponent)
+    // 兼容旧用法
+    app.component('VxeTableColgroup', VxeColgroupComponent)
+  }
+})
+
+if (VxeUI.dynamicApp) {
+  VxeUI.dynamicApp.component(VxeColgroupComponent.name as string, VxeColgroupComponent)
+  // 兼容旧用法
+  VxeUI.dynamicApp.component('VxeTableColgroup', VxeColgroupComponent)
+}
+
+VxeUI.component(VxeColgroupComponent)
+
+export const Colgroup = VxeColgroup
+export default VxeColgroup

package/packages/column/index.ts

@@ -1,22 +1,22 @@
-import { App } from 'vue'
-import { VxeUI } from '@vxe-ui/core'
-import VxeColumnComponent from '../table/src/column'
-
-export const VxeColumn = Object.assign({}, VxeColumnComponent, {
-  install (app: App) {
-    app.component(VxeColumnComponent.name as string, VxeColumnComponent)
-    // 兼容旧用法
-    app.component('VxeTableColumn', VxeColumnComponent)
-  }
-})
-
-if (VxeUI.dynamicApp) {
-  VxeUI.dynamicApp.component(VxeColumnComponent.name as string, VxeColumnComponent)
-  // 兼容旧用法
-  VxeUI.dynamicApp.component('VxeTableColumn', VxeColumnComponent)
-}
-
-VxeUI.component(VxeColumnComponent)
-
-export const Column = VxeColumn
-export default VxeColumn
+import { App } from 'vue'
+import { VxeUI } from '@vxe-ui/core'
+import VxeColumnComponent from '../table/src/column'
+
+export const VxeColumn = Object.assign({}, VxeColumnComponent, {
+  install(app: App) {
+    app.component(VxeColumnComponent.name as string, VxeColumnComponent)
+    // 兼容旧用法
+    app.component('VxeTableColumn', VxeColumnComponent)
+  }
+})
+
+if (VxeUI.dynamicApp) {
+  VxeUI.dynamicApp.component(VxeColumnComponent.name as string, VxeColumnComponent)
+  // 兼容旧用法
+  VxeUI.dynamicApp.component('VxeTableColumn', VxeColumnComponent)
+}
+
+VxeUI.component(VxeColumnComponent)
+
+export const Column = VxeColumn
+export default VxeColumn

package/packages/components.ts

@@ -1,44 +1,41 @@
-import { App } from 'vue'
-import { VxeUI } from '@vxe-ui/core'
-import './ui'
-
-import { VxeColumn } from './column'
-import { VxeColgroup } from './colgroup'
-import { VxeGrid } from './grid'
-import { VxeTable } from './table'
-import { VxeToolbar } from './toolbar'
-
-import zhCN from './locale/lang/zh-CN'
-
-import type { VxeGlobalConfig } from '../types'
-
-const components = [
-  VxeColumn,
-  VxeColgroup,
-  VxeGrid,
-  VxeTable,
-  VxeToolbar
-]
-
-// 默认安装
-export function install (app: App, options?: VxeGlobalConfig) {
-  VxeUI.setConfig(options)
-  components.forEach(component => component.install(app))
-}
-
-// 保留兼容老版本
-if (!VxeUI.hasLanguage('zh-CN')) {
-  const defaultLanguage = 'zh-CN'
-  VxeUI.setI18n(defaultLanguage, zhCN)
-  VxeUI.setLanguage(defaultLanguage)
-}
-VxeUI.setTheme('light')
-
-export { VxeUI }
-
-// Components
-export * from './table'
-export * from './column'
-export * from './colgroup'
-export * from './grid'
-export * from './toolbar'
+import { App } from 'vue'
+import { VxeUI } from '@vxe-ui/core'
+import './ui'
+
+import { VxeColumn } from './column'
+import { VxeColgroup } from './colgroup'
+import { VxeGrid } from './grid'
+import { VxeTable } from './table'
+import { VxeToolbar } from './toolbar'
+
+import zhCN from './locale/lang/zh-CN'
+
+import type { VxeGlobalConfig } from '../types'
+
+const components = [VxeColumn, VxeColgroup, VxeGrid, VxeTable, VxeToolbar]
+
+// 默认安装
+export function install(app: App, options?: VxeGlobalConfig) {
+  VxeUI.setConfig(options)
+  components.forEach((component) => component.install(app))
+}
+
+// 保留兼容老版本
+if (!VxeUI.hasLanguage('zh-CN')) {
+  const defaultLanguage = 'zh-CN'
+  VxeUI.setI18n(defaultLanguage, zhCN)
+  VxeUI.setLanguage(defaultLanguage)
+}
+VxeUI.setTheme('light')
+
+export { VxeUI }
+
+// 兼容老版本
+export * from './ui'
+
+// Components
+export * from './table'
+export * from './column'
+export * from './colgroup'
+export * from './grid'
+export * from './toolbar'

package/packages/grid/index.ts

@@ -1,18 +1,18 @@
-import { App } from 'vue'
-import { VxeUI } from '@vxe-ui/core'
-import VxeGridComponent from './src/grid'
-
-export const VxeGrid = Object.assign({}, VxeGridComponent, {
-  install (app: App) {
-    app.component(VxeGridComponent.name as string, VxeGridComponent)
-  }
-})
-
-if (VxeUI.dynamicApp) {
-  VxeUI.dynamicApp.component(VxeGridComponent.name as string, VxeGridComponent)
-}
-
-VxeUI.component(VxeGridComponent)
-
-export const Grid = VxeGrid
-export default VxeGrid
+import { App } from 'vue'
+import { VxeUI } from '@vxe-ui/core'
+import VxeGridComponent from './src/grid'
+
+export const VxeGrid = Object.assign({}, VxeGridComponent, {
+  install(app: App) {
+    app.component(VxeGridComponent.name as string, VxeGridComponent)
+  }
+})
+
+if (VxeUI.dynamicApp) {
+  VxeUI.dynamicApp.component(VxeGridComponent.name as string, VxeGridComponent)
+}
+
+VxeUI.component(VxeGridComponent)
+
+export const Grid = VxeGrid
+export default VxeGrid

package/packages/grid/src/emits.ts

@@ -1,19 +1,5 @@
-import { tableEmits } from '../../table/src/emits'
-
-import type { VxeGridEmits } from '../../../types'
-
-export const gridEmits: VxeGridEmits = [
-  ...tableEmits,
-  'page-change',
-  'form-submit',
-  'form-submit-invalid',
-  'form-reset',
-  'form-collapse',
-  'form-toggle-collapse',
-  'proxy-query',
-  'proxy-delete',
-  'proxy-save',
-  'toolbar-button-click',
-  'toolbar-tool-click',
-  'zoom'
-]
+import { tableEmits } from '../../table/src/emits'
+
+import type { VxeGridEmits } from '../../../types'
+
+export const gridEmits: VxeGridEmits = [...tableEmits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom']