vxe-table 4.23.7 → 4.23.9

package/es/table/src/util.js

@@ -833,17 +833,20 @@ function createColumn($xeTable, options, renderOptions) {
 }
 function watchColumn($xeTable, props, column) {
   Object.keys(props).forEach((name) => {
-    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();
+    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) {
@@ -918,20 +921,13 @@ function clearTableDefaultStatus($xeTable) {
     $xeTable.clearPendingRow()
   ];
   if ($xeTable.clearFilter) {
-    actionList.push(
-      $xeTable.clearFilter()
-    );
+    actionList.push($xeTable.clearFilter());
   }
   if ($xeTable.clearSelected && (hasEnableConf(keyboardConfig, keyboardOpts) || hasEnableConf(mouseConfig, mouseOpts))) {
-    actionList.push(
-      $xeTable.clearSelected()
-    );
+    actionList.push($xeTable.clearSelected());
   }
   if ($xeTable.clearCellAreas && hasEnableConf(mouseConfig, mouseOpts)) {
-    actionList.push(
-      $xeTable.clearCellAreas(),
-      $xeTable.clearCopyCellArea()
-    );
+    actionList.push($xeTable.clearCellAreas(), $xeTable.clearCopyCellArea());
   }
   return Promise.all(actionList).then(() => {
     return $xeTable.clearScroll();

package/es/toolbar/index.js

@@ -1,4 +1,4 @@
-import { VxeUI } from "../ui";
+import { VxeUI } from "@vxe-ui/core";
 import VxeToolbarComponent from "./src/toolbar";
 const VxeToolbar = Object.assign({}, VxeToolbarComponent, {
   install(app) {

package/es/toolbar/src/toolbar.js

@@ -1,7 +1,7 @@
 import { h, ref, computed, inject, createCommentVNode, reactive, nextTick, onBeforeUnmount } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getSlotVNs } from "../../ui/src/vn";
 import { createComponentLog } from "../../ui/src/log";
 const { warnLog, errLog } = createComponentLog("toolbar");
@@ -52,10 +52,7 @@ var toolbar_default = defineVxeComponent({
     },
     className: [String, Function]
   },
-  emits: [
-    "button-click",
-    "tool-click"
-  ],
+  emits: ["button-click", "tool-click"],
   setup(props, context) {
     const { slots, emit } = context;
     const xID = XEUtils.uniqueId();
@@ -368,24 +365,32 @@ var toolbar_default = defineVxeComponent({
               const toolbarButtonClassName = compConf.toolbarButtonClassName;
               const params = { $grid: $xeGrid, $gantt: $xeGantt, $table, button: item };
               btnVNs.push(
-                h("span", {
-                  key: `br${item.code || index}`,
-                  class: ["vxe-button--item", toolbarButtonClassName ? XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : ""]
-                }, getSlotVNs(compConf.renderToolbarButton(buttonRender, params)))
+                h(
+                  "span",
+                  {
+                    key: `br${item.code || index}`,
+                    class: ["vxe-button--item", toolbarButtonClassName ? XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : ""]
+                  },
+                  getSlotVNs(compConf.renderToolbarButton(buttonRender, params))
+                )
               );
             } else {
               if (VxeUIButtonComponent) {
                 btnVNs.push(
-                  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)
-                  } : {})
+                  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)
+                    } : {}
+                  )
                 );
               }
             }
@@ -393,15 +398,27 @@ var toolbar_default = defineVxeComponent({
         });
       }
       return [
-        h("div", {
-          class: "vxe-button--prefix-wrapper"
-        }, buttonPrefixSlot ? getSlotVNs(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []),
-        h("div", {
-          class: "vxe-button--item-wrapper"
-        }, buttonsSlot ? getSlotVNs(buttonsSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs),
-        h("div", {
-          class: "vxe-button--suffix-wrapper"
-        }, buttonSuffixSlot ? getSlotVNs(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : [])
+        h(
+          "div",
+          {
+            class: "vxe-button--prefix-wrapper"
+          },
+          buttonPrefixSlot ? getSlotVNs(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        ),
+        h(
+          "div",
+          {
+            class: "vxe-button--item-wrapper"
+          },
+          buttonsSlot ? getSlotVNs(buttonsSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs
+        ),
+        h(
+          "div",
+          {
+            class: "vxe-button--suffix-wrapper"
+          },
+          buttonSuffixSlot ? getSlotVNs(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        )
       ];
     };
     const renderRightTools = () => {
@@ -423,24 +440,32 @@ var toolbar_default = defineVxeComponent({
               const toolbarToolClassName = compConf.toolbarToolClassName;
               const params = { $grid: $xeGrid, $gantt: $xeGantt, $table, tool: item };
               btnVNs.push(
-                h("span", {
-                  key: tIndex,
-                  class: ["vxe-tool--item", toolbarToolClassName ? XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : ""]
-                }, getSlotVNs(compConf.renderToolbarTool(toolRender, params)))
+                h(
+                  "span",
+                  {
+                    key: tIndex,
+                    class: ["vxe-tool--item", toolbarToolClassName ? XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : ""]
+                  },
+                  getSlotVNs(compConf.renderToolbarTool(toolRender, params))
+                )
               );
             } else {
               if (VxeUIButtonComponent) {
                 btnVNs.push(
-                  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)
-                  } : {})
+                  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)
+                    } : {}
+                  )
                 );
               }
             }
@@ -448,15 +473,27 @@ var toolbar_default = defineVxeComponent({
         });
       }
       return [
-        h("div", {
-          class: "vxe-tool--prefix-wrapper"
-        }, toolPrefixSlot ? getSlotVNs(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []),
-        h("div", {
-          class: "vxe-tool--item-wrapper"
-        }, toolsSlot ? getSlotVNs(toolsSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs),
-        h("div", {
-          class: "vxe-tool--suffix-wrapper"
-        }, toolSuffixSlot ? getSlotVNs(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : [])
+        h(
+          "div",
+          {
+            class: "vxe-tool--prefix-wrapper"
+          },
+          toolPrefixSlot ? getSlotVNs(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        ),
+        h(
+          "div",
+          {
+            class: "vxe-tool--item-wrapper"
+          },
+          toolsSlot ? getSlotVNs(toolsSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : btnVNs
+        ),
+        h(
+          "div",
+          {
+            class: "vxe-tool--suffix-wrapper"
+          },
+          toolSuffixSlot ? getSlotVNs(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table })) : []
+        )
       ];
     };
     const renderToolImport = () => {
@@ -532,31 +569,51 @@ var toolbar_default = defineVxeComponent({
     const renderVN = () => {
       const { perfect, loading, refresh, zoom, custom, className } = props;
       const vSize = computeSize.value;
-      return h("div", {
-        ref: refElem,
-        class: ["vxe-toolbar", className ? XEUtils.isFunction(className) ? className({ $toolbar: $xeToolbar }) : className : "", {
-          [`size--${vSize}`]: vSize,
-          "is--perfect": perfect,
-          "is--loading": loading
-        }]
-      }, [
-        h("div", {
-          class: "vxe-buttons--wrapper"
-        }, renderLeftBtns()),
-        h("div", {
-          class: "vxe-tools--wrapper"
-        }, renderRightTools()),
-        h("div", {
-          class: "vxe-tools--operate"
-        }, [
-          props.import ? renderToolImport() : createCommentVNode(),
-          props.export ? renderToolExport() : createCommentVNode(),
-          props.print ? renderToolPrint() : createCommentVNode(),
-          refresh ? renderToolRefresh() : createCommentVNode(),
-          zoom && $xeGGWrapper ? renderToolZoom() : createCommentVNode(),
-          custom ? renderToolCustom() : createCommentVNode()
-        ])
-      ]);
+      return h(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-toolbar",
+            className ? XEUtils.isFunction(className) ? className({ $toolbar: $xeToolbar }) : className : "",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--perfect": perfect,
+              "is--loading": loading
+            }
+          ]
+        },
+        [
+          h(
+            "div",
+            {
+              class: "vxe-buttons--wrapper"
+            },
+            renderLeftBtns()
+          ),
+          h(
+            "div",
+            {
+              class: "vxe-tools--wrapper"
+            },
+            renderRightTools()
+          ),
+          h(
+            "div",
+            {
+              class: "vxe-tools--operate"
+            },
+            [
+              props.import ? renderToolImport() : createCommentVNode(),
+              props.export ? renderToolExport() : createCommentVNode(),
+              props.print ? renderToolPrint() : createCommentVNode(),
+              refresh ? renderToolRefresh() : createCommentVNode(),
+              zoom && $xeGGWrapper ? renderToolZoom() : createCommentVNode(),
+              custom ? renderToolCustom() : createCommentVNode()
+            ]
+          )
+        ]
+      );
     };
     $xeToolbar.renderVN = renderVN;
     nextTick(() => {

package/es/ui/index.d.ts

@@ -82,5 +82,4 @@ export declare const modal: {
      */
     notification(content: any, title: any, options: any): Promise<import("vxe-pc-ui").ModalEventTypes>;
 };
-export * from '@vxe-ui/core';
 export default VxeUI;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from "@vxe-ui/core";
 import { getFuncText } from "./src/utils";
-const version = "4.23.7";
+const version = "4.23.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -466,7 +466,6 @@ const modal = {
     return VxeUI.modal.notification(content, title, options);
   }
 };
-export * from "@vxe-ui/core";
 var ui_default = VxeUI;
 export {
   VXETable,

package/es/ui/src/dom.js

@@ -232,12 +232,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/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from "@vxe-ui/core";
 const { log } = VxeUI;
-const tableVersion = `table v${"4.23.7"}`;
+const tableVersion = `table v${"4.23.9"}`;
 function createComponentLog(name) {
   const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : "";
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : "";

package/es/ui/src/utils.d.ts

@@ -20,4 +20,4 @@ export declare function formatText(value: any, placeholder?: any): string;
  * 判断值为：'' | null | undefined 时都属于空值
  */
 export declare function eqEmptyValue(cellValue: any): boolean;
-export declare function getDefaultConfig<T = any, D = any>(val1: T, def1: D): (T | D);
+export declare function getDefaultConfig<T = any, D = any>(val1: T, def1: D): T | D;

package/es/v-x-e-table/index.d.ts

@@ -1,3 +1,2 @@
 import VxeUI from '../ui';
-export * from '../ui';
 export default VxeUI;

package/es/v-x-e-table/index.js

@@ -1,5 +1,4 @@
 import VxeUI from "../ui";
-export * from "../ui";
 var v_x_e_table_default = VxeUI;
 export {
   v_x_e_table_default as default

package/lib/colgroup/index.js

@@ -33,7 +33,7 @@ __export(colgroup_exports, {
   default: () => colgroup_default
 });
 module.exports = __toCommonJS(colgroup_exports);
-var import_ui = require("../ui");
+var import_core = require("@vxe-ui/core");
 var import_group = __toESM(require("../table/src/group"));
 const VxeColgroup = Object.assign({}, import_group.default, {
   install(app) {
@@ -41,10 +41,10 @@ const VxeColgroup = Object.assign({}, import_group.default, {
     app.component("VxeTableColgroup", import_group.default);
   }
 });
-if (import_ui.VxeUI.dynamicApp) {
-  import_ui.VxeUI.dynamicApp.component(import_group.default.name, import_group.default);
-  import_ui.VxeUI.dynamicApp.component("VxeTableColgroup", import_group.default);
+if (import_core.VxeUI.dynamicApp) {
+  import_core.VxeUI.dynamicApp.component(import_group.default.name, import_group.default);
+  import_core.VxeUI.dynamicApp.component("VxeTableColgroup", import_group.default);
 }
-import_ui.VxeUI.component(import_group.default);
+import_core.VxeUI.component(import_group.default);
 const Colgroup = VxeColgroup;
 var colgroup_default = VxeColgroup;

package/lib/column/index.js

@@ -33,7 +33,7 @@ __export(column_exports, {
   default: () => column_default
 });
 module.exports = __toCommonJS(column_exports);
-var import_ui = require("../ui");
+var import_core = require("@vxe-ui/core");
 var import_column = __toESM(require("../table/src/column"));
 const VxeColumn = Object.assign({}, import_column.default, {
   install(app) {
@@ -41,10 +41,10 @@ const VxeColumn = Object.assign({}, import_column.default, {
     app.component("VxeTableColumn", import_column.default);
   }
 });
-if (import_ui.VxeUI.dynamicApp) {
-  import_ui.VxeUI.dynamicApp.component(import_column.default.name, import_column.default);
-  import_ui.VxeUI.dynamicApp.component("VxeTableColumn", import_column.default);
+if (import_core.VxeUI.dynamicApp) {
+  import_core.VxeUI.dynamicApp.component(import_column.default.name, import_column.default);
+  import_core.VxeUI.dynamicApp.component("VxeTableColumn", import_column.default);
 }
-import_ui.VxeUI.component(import_column.default);
+import_core.VxeUI.component(import_column.default);
 const Column = VxeColumn;
 var column_default = VxeColumn;

package/lib/components.js

@@ -29,9 +29,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var components_exports = {};
 __export(components_exports, {
+  VxeUI: () => import_core.VxeUI,
   install: () => install
 });
 module.exports = __toCommonJS(components_exports);
+var import_core = require("@vxe-ui/core");
 var import_ui = require("./ui");
 var import_column = require("./column");
 var import_colgroup = require("./colgroup");
@@ -45,20 +47,14 @@ __reExport(components_exports, require("./column"), module.exports);
 __reExport(components_exports, require("./colgroup"), module.exports);
 __reExport(components_exports, require("./grid"), module.exports);
 __reExport(components_exports, require("./toolbar"), module.exports);
-const components = [
-  import_column.VxeColumn,
-  import_colgroup.VxeColgroup,
-  import_grid.VxeGrid,
-  import_table.VxeTable,
-  import_toolbar.VxeToolbar
-];
+const components = [import_column.VxeColumn, import_colgroup.VxeColgroup, import_grid.VxeGrid, import_table.VxeTable, import_toolbar.VxeToolbar];
 function install(app, options) {
-  import_ui.VxeUI.setConfig(options);
+  import_core.VxeUI.setConfig(options);
   components.forEach((component) => component.install(app));
 }
-if (!import_ui.VxeUI.hasLanguage("zh-CN")) {
+if (!import_core.VxeUI.hasLanguage("zh-CN")) {
   const defaultLanguage = "zh-CN";
-  import_ui.VxeUI.setI18n(defaultLanguage, import_zh_CN.default);
-  import_ui.VxeUI.setLanguage(defaultLanguage);
+  import_core.VxeUI.setI18n(defaultLanguage, import_zh_CN.default);
+  import_core.VxeUI.setLanguage(defaultLanguage);
 }
-import_ui.VxeUI.setTheme("light");
+import_core.VxeUI.setTheme("light");

package/lib/grid/index.js

@@ -33,16 +33,16 @@ __export(grid_exports, {
   default: () => grid_default
 });
 module.exports = __toCommonJS(grid_exports);
-var import_ui = require("../ui");
+var import_core = require("@vxe-ui/core");
 var import_grid = __toESM(require("./src/grid"));
 const VxeGrid = Object.assign({}, import_grid.default, {
   install(app) {
     app.component(import_grid.default.name, import_grid.default);
   }
 });
-if (import_ui.VxeUI.dynamicApp) {
-  import_ui.VxeUI.dynamicApp.component(import_grid.default.name, import_grid.default);
+if (import_core.VxeUI.dynamicApp) {
+  import_core.VxeUI.dynamicApp.component(import_grid.default.name, import_grid.default);
 }
-import_ui.VxeUI.component(import_grid.default);
+import_core.VxeUI.component(import_grid.default);
 const Grid = VxeGrid;
 var grid_default = VxeGrid;

package/lib/grid/src/emits.js

@@ -22,18 +22,4 @@ __export(emits_exports, {
 });
 module.exports = __toCommonJS(emits_exports);
 var import_emits = require("../../table/src/emits");
-const gridEmits = [
-  ...import_emits.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"
-];
+const gridEmits = [...import_emits.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"];