vxe-table 4.23.7 → 4.23.9

package/es/table/module/export/import-panel.js

@@ -1,6 +1,6 @@
 import { h, ref, computed, inject, reactive, nextTick } from "vue";
 import { defineVxeComponent } from "../../../ui/src/comp";
-import { VxeUI } from "../../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import XEUtils from "xe-utils";
 import { getDefaultConfig, parseFile } from "../../../ui/src/utils";
 import { createComponentLog } from "../../../ui/src/log";
@@ -99,135 +99,164 @@ var import_panel_default = defineVxeComponent({
       const bottomSlot = slots.bottom;
       const defaultSlot = slots.default;
       const footerSlot = slots.footer;
-      return VxeUIModalComponent ? h(VxeUIModalComponent, {
-        id: "VXE_IMPORT_MODAL",
-        modelValue: storeData.visible,
-        title: modelOptions.title || getI18n("vxe.import.impTitle"),
-        className: "vxe-table-export-popup-wrapper",
-        width: modelOptions.width || 540,
-        height: modelOptions.height,
-        minWidth: modelOptions.minWidth || 360,
-        minHeight: modelOptions.minHeight || 240,
-        mask: getDefaultConfig(modelOptions.mask, true),
-        lockView: getDefaultConfig(modelOptions.lockView, true),
-        showFooter: true,
-        escClosable: true,
-        maskClosable: true,
-        position: modelOptions.position,
-        fullscreen: modelOptions.fullscreen,
-        remember: modelOptions.remember,
-        showMinimize: modelOptions.showMinimize,
-        showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
-        resize: getDefaultConfig(modelOptions.resize, true),
-        loading: reactData.loading,
-        "onUpdate:modelValue"(value) {
-          storeData.visible = value;
+      return VxeUIModalComponent ? h(
+        VxeUIModalComponent,
+        {
+          id: "VXE_IMPORT_MODAL",
+          modelValue: storeData.visible,
+          title: modelOptions.title || getI18n("vxe.import.impTitle"),
+          className: "vxe-table-export-popup-wrapper",
+          width: modelOptions.width || 540,
+          height: modelOptions.height,
+          minWidth: modelOptions.minWidth || 360,
+          minHeight: modelOptions.minHeight || 240,
+          mask: getDefaultConfig(modelOptions.mask, true),
+          lockView: getDefaultConfig(modelOptions.lockView, true),
+          showFooter: true,
+          escClosable: true,
+          maskClosable: true,
+          position: modelOptions.position,
+          fullscreen: modelOptions.fullscreen,
+          remember: modelOptions.remember,
+          showMinimize: modelOptions.showMinimize,
+          showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+          resize: getDefaultConfig(modelOptions.resize, true),
+          loading: reactData.loading,
+          "onUpdate:modelValue"(value) {
+            storeData.visible = value;
+          },
+          onShow: showEvent
         },
-        onShow: showEvent
-      }, {
-        default: () => {
-          const params = {
-            $table: $xeTable,
-            $grid: $xeGrid,
-            $gantt: $xeGantt,
-            options: defaultOptions,
-            params: defaultOptions.params
-          };
-          return h("div", {
-            class: "vxe-table-export--panel"
-          }, [
-            topSlot ? h("div", {
-              class: "vxe-table-export--panel-top"
-            }, $xeTable.callSlot(topSlot, params)) : renderEmptyElement($xeTable),
-            h(
+        {
+          default: () => {
+            const params = {
+              $table: $xeTable,
+              $grid: $xeGrid,
+              $gantt: $xeGantt,
+              options: defaultOptions,
+              params: defaultOptions.params
+            };
+            return h(
               "div",
               {
-                class: "vxe-table-export--panel-body"
+                class: "vxe-table-export--panel"
               },
-              defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [
-                h("table", {
-                  class: "vxe-table-export--panel-table",
-                  cellspacing: 0,
-                  cellpadding: 0,
-                  border: 0
-                }, [
-                  h("tbody", [
-                    h("tr", [
-                      h("td", getI18n("vxe.import.impFile")),
-                      h("td", [
-                        hasFile ? h("div", {
-                          class: "vxe-table-export--selected--file",
-                          title: selectName
-                        }, [
-                          h("span", selectName),
-                          h("i", {
-                            class: getIcon().INPUT_CLEAR,
-                            onClick: clearFileEvent
-                          })
-                        ]) : h("button", {
-                          ref: refFileBtn,
-                          class: "vxe-table-export--select--file",
-                          onClick: selectFileEvent
-                        }, getI18n("vxe.import.impSelect"))
-                      ])
-                    ]),
-                    h("tr", [
-                      h("td", getI18n("vxe.import.impType")),
-                      h("td", parseTypeLabel)
-                    ]),
-                    settingOptions.showMode === false ? renderEmptyElement($xeTable) : h("tr", [
-                      h("td", getI18n("vxe.import.impMode")),
-                      h("td", [
-                        VxeUISelectComponent ? h(VxeUISelectComponent, {
-                          modelValue: defaultOptions.mode,
-                          options: storeData.modeList,
-                          "onUpdate:modelValue"(value) {
-                            defaultOptions.mode = value;
-                          }
-                        }) : renderEmptyElement($xeTable)
-                      ])
-                    ])
-                  ])
-                ])
+              [
+                topSlot ? h(
+                  "div",
+                  {
+                    class: "vxe-table-export--panel-top"
+                  },
+                  $xeTable.callSlot(topSlot, params)
+                ) : renderEmptyElement($xeTable),
+                h(
+                  "div",
+                  {
+                    class: "vxe-table-export--panel-body"
+                  },
+                  defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [
+                    h(
+                      "table",
+                      {
+                        class: "vxe-table-export--panel-table",
+                        cellspacing: 0,
+                        cellpadding: 0,
+                        border: 0
+                      },
+                      [
+                        h("tbody", [
+                          h("tr", [
+                            h("td", getI18n("vxe.import.impFile")),
+                            h("td", [
+                              hasFile ? h(
+                                "div",
+                                {
+                                  class: "vxe-table-export--selected--file",
+                                  title: selectName
+                                },
+                                [
+                                  h("span", selectName),
+                                  h("i", {
+                                    class: getIcon().INPUT_CLEAR,
+                                    onClick: clearFileEvent
+                                  })
+                                ]
+                              ) : h(
+                                "button",
+                                {
+                                  ref: refFileBtn,
+                                  class: "vxe-table-export--select--file",
+                                  onClick: selectFileEvent
+                                },
+                                getI18n("vxe.import.impSelect")
+                              )
+                            ])
+                          ]),
+                          h("tr", [h("td", getI18n("vxe.import.impType")), h("td", parseTypeLabel)]),
+                          settingOptions.showMode === false ? renderEmptyElement($xeTable) : h("tr", [
+                            h("td", getI18n("vxe.import.impMode")),
+                            h("td", [
+                              VxeUISelectComponent ? h(VxeUISelectComponent, {
+                                modelValue: defaultOptions.mode,
+                                options: storeData.modeList,
+                                "onUpdate:modelValue"(value) {
+                                  defaultOptions.mode = value;
+                                }
+                              }) : renderEmptyElement($xeTable)
+                            ])
+                          ])
+                        ])
+                      ]
+                    )
+                  ]
+                ),
+                bottomSlot ? h(
+                  "div",
+                  {
+                    class: "vxe-table-export--panel-bottom"
+                  },
+                  $xeTable.callSlot(bottomSlot, params)
+                ) : renderEmptyElement($xeTable)
               ]
-            ),
-            bottomSlot ? h("div", {
-              class: "vxe-table-export--panel-bottom"
-            }, $xeTable.callSlot(bottomSlot, params)) : renderEmptyElement($xeTable)
-          ]);
-        },
-        footer() {
-          const params = {
-            $table: $xeTable,
-            $grid: $xeGrid,
-            $gantt: $xeGantt,
-            options: defaultOptions,
-            params: defaultOptions.params
-          };
-          return h(
-            "div",
-            {
-              class: "vxe-table-export--panel-footer"
-            },
-            footerSlot ? $xeTable.callSlot(footerSlot, params) : [
-              h("div", {
-                class: "vxe-table-export--panel-btns"
-              }, [
-                VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-                  content: getI18n("vxe.import.impCancel"),
-                  onClick: cancelEvent
-                }) : renderEmptyElement($xeTable),
-                VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-                  status: "primary",
-                  disabled: !hasFile || reactData.loading,
-                  content: getI18n("vxe.import.impConfirm"),
-                  onClick: importEvent
-                }) : renderEmptyElement($xeTable)
-              ])
-            ]
-          );
+            );
+          },
+          footer() {
+            const params = {
+              $table: $xeTable,
+              $grid: $xeGrid,
+              $gantt: $xeGantt,
+              options: defaultOptions,
+              params: defaultOptions.params
+            };
+            return h(
+              "div",
+              {
+                class: "vxe-table-export--panel-footer"
+              },
+              footerSlot ? $xeTable.callSlot(footerSlot, params) : [
+                h(
+                  "div",
+                  {
+                    class: "vxe-table-export--panel-btns"
+                  },
+                  [
+                    VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                      content: getI18n("vxe.import.impCancel"),
+                      onClick: cancelEvent
+                    }) : renderEmptyElement($xeTable),
+                    VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                      status: "primary",
+                      disabled: !hasFile || reactData.loading,
+                      content: getI18n("vxe.import.impConfirm"),
+                      onClick: importEvent
+                    }) : renderEmptyElement($xeTable)
+                  ]
+                )
+              ]
+            );
+          }
         }
-      }) : renderEmptyElement($xeTable);
+      ) : renderEmptyElement($xeTable);
     };
     nextTick(() => {
       if (!VxeUIModalComponent) {

package/es/table/module/filter/hook.js

@@ -1,11 +1,25 @@
 import { nextTick } from "vue";
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { toFilters, handleFieldOrColumn, getRefElem } from "../../src/util";
 import { toCssUnit, triggerEvent, updatePanelPlacement } from "../../../ui/src/dom";
 import { hasEnableConf, isEnableConf } from "../../../ui/src/utils";
 const { renderer, hooks } = VxeUI;
-const tableFilterMethodKeys = ["openFilter", "setFilter", "clearFilter", "saveFilter", "saveFilterByEvent", "saveFilterPanel", "saveFilterPanelByEvent", "resetFilter", "resetFilterByEvent", "resetFilterPanel", "resetFilterPanelByEvent", "getCheckedFilters", "updateFilterOptionStatus"];
+const tableFilterMethodKeys = [
+  "openFilter",
+  "setFilter",
+  "clearFilter",
+  "saveFilter",
+  "saveFilterByEvent",
+  "saveFilterPanel",
+  "saveFilterPanelByEvent",
+  "resetFilter",
+  "resetFilterByEvent",
+  "resetFilterPanel",
+  "resetFilterPanelByEvent",
+  "getCheckedFilters",
+  "updateFilterOptionStatus"
+];
 const sourceType = "table";
 hooks.add("tableFilterModule", {
   setupTable($xeTable) {
@@ -198,7 +212,7 @@ hooks.add("tableFilterModule", {
         $xeTable.closeFilter();
         return $xeTable.updateFooter().then(() => {
           const { scrollXLoad, scrollYLoad } = reactData;
-          if (oldScrollXLoad || scrollXLoad || (oldScrollYLoad || scrollYLoad)) {
+          if (oldScrollXLoad || scrollXLoad || oldScrollYLoad || scrollYLoad) {
             if (oldScrollXLoad || scrollXLoad) {
               $xeTable.updateScrollXSpace();
             }

package/es/table/module/filter/panel.js

@@ -1,6 +1,6 @@
 import { h, ref, computed, inject, Teleport } from "vue";
 import { defineVxeComponent } from "../../../ui/src/comp";
-import { VxeUI } from "../../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { formatText, isEnableConf } from "../../../ui/src/utils";
 import { getPropClass } from "../../../ui/src/dom";
 import { getSlotVNs } from "../../../ui/src/vn";
@@ -102,15 +102,23 @@ var panel_default = defineVxeComponent({
       const rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
       if (filterSlot) {
         return [
-          h("div", {
-            class: "vxe-table--filter-template"
-          }, $xeTable.callSlot(filterSlot, params))
+          h(
+            "div",
+            {
+              class: "vxe-table--filter-template"
+            },
+            $xeTable.callSlot(filterSlot, params)
+          )
         ];
       } else if (filterRender && rtFilter) {
         return [
-          h("div", {
-            class: "vxe-table--filter-template"
-          }, getSlotVNs(rtFilter(filterRender, params)))
+          h(
+            "div",
+            {
+              class: "vxe-table--filter-template"
+            },
+            getSlotVNs(rtFilter(filterRender, params))
+          )
         ];
       }
       const isAllChecked = filterMultiple ? filterStore.isAllSelected : !filterOptions.some((item) => item._checked);
@@ -118,55 +126,89 @@ var panel_default = defineVxeComponent({
       const optVNs = filterOptions.map((item) => {
         const isChecked = item._checked;
         const isIndeterminate = false;
-        return h("div", {
-          class: ["vxe-table--filter-option", {
-            "is--checked": item._checked
-          }],
-          title: item.label,
-          onClick: (evnt) => {
-            changeOption(evnt, !item._checked, item);
-          }
-        }, (filterMultiple ? [
-          h("span", {
-            class: ["vxe-checkbox--icon", isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-          })
-        ] : []).concat([
-          h("span", {
-            class: "vxe-checkbox--label"
-          }, formatText(item.label, 1))
-        ]));
-      });
-      return [
-        h("div", {
-          class: "vxe-table--filter-header"
-        }, [
-          h("div", {
-            class: ["vxe-table--filter-option", {
-              "is--checked": isAllChecked,
-              "is--indeterminate": isAllIndeterminate
-            }],
-            title: getI18n(filterMultiple ? "vxe.table.allTitle" : "vxe.table.allFilter"),
+        return h(
+          "div",
+          {
+            class: [
+              "vxe-table--filter-option",
+              {
+                "is--checked": item._checked
+              }
+            ],
+            title: item.label,
             onClick: (evnt) => {
-              changeAllOption(evnt, !filterStore.isAllSelected);
+              changeOption(evnt, !item._checked, item);
             }
-          }, (filterMultiple ? [
+          },
+          (filterMultiple ? [
             h("span", {
-              class: ["vxe-checkbox--icon", isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+              class: ["vxe-checkbox--icon", isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
             })
           ] : []).concat([
-            h("span", {
-              class: "vxe-checkbox--label"
-            }, getI18n("vxe.table.allFilter"))
-          ]))
-        ]),
-        useScrollbar ? h(VxeUIScrollbarComponent, {
-          class: "vxe-table--scrollbar-filter-body",
-          viewClassName: "vxe-table--scrollbar-filter-body-view"
-        }, {
-          default: () => optVNs
-        }) : h("div", {
-          class: "vxe-table--filter-body"
-        }, optVNs)
+            h(
+              "span",
+              {
+                class: "vxe-checkbox--label"
+              },
+              formatText(item.label, 1)
+            )
+          ])
+        );
+      });
+      return [
+        h(
+          "div",
+          {
+            class: "vxe-table--filter-header"
+          },
+          [
+            h(
+              "div",
+              {
+                class: [
+                  "vxe-table--filter-option",
+                  {
+                    "is--checked": isAllChecked,
+                    "is--indeterminate": isAllIndeterminate
+                  }
+                ],
+                title: getI18n(filterMultiple ? "vxe.table.allTitle" : "vxe.table.allFilter"),
+                onClick: (evnt) => {
+                  changeAllOption(evnt, !filterStore.isAllSelected);
+                }
+              },
+              (filterMultiple ? [
+                h("span", {
+                  class: ["vxe-checkbox--icon", isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+                })
+              ] : []).concat([
+                h(
+                  "span",
+                  {
+                    class: "vxe-checkbox--label"
+                  },
+                  getI18n("vxe.table.allFilter")
+                )
+              ])
+            )
+          ]
+        ),
+        useScrollbar ? h(
+          VxeUIScrollbarComponent,
+          {
+            class: "vxe-table--scrollbar-filter-body",
+            viewClassName: "vxe-table--scrollbar-filter-body-view"
+          },
+          {
+            default: () => optVNs
+          }
+        ) : h(
+          "div",
+          {
+            class: "vxe-table--filter-body"
+          },
+          optVNs
+        )
       ];
     };
     const renderFooters = () => {
@@ -189,20 +231,32 @@ var panel_default = defineVxeComponent({
         showFlFoot = !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false);
       }
       return showFlFoot ? [
-        h("div", {
-          class: "vxe-table--filter-footer"
-        }, [
-          h("button", {
-            class: {
-              "is--disabled": isDisabled
-            },
-            disabled: isDisabled,
-            onClick: confirmFilter
-          }, confirmButtonText || getI18n("vxe.table.confirmFilter")),
-          h("button", {
-            onClick: resetFilter
-          }, resetButtonText || getI18n("vxe.table.resetFilter"))
-        ])
+        h(
+          "div",
+          {
+            class: "vxe-table--filter-footer"
+          },
+          [
+            h(
+              "button",
+              {
+                class: {
+                  "is--disabled": isDisabled
+                },
+                disabled: isDisabled,
+                onClick: confirmFilter
+              },
+              confirmButtonText || getI18n("vxe.table.confirmFilter")
+            ),
+            h(
+              "button",
+              {
+                onClick: resetFilter
+              },
+              resetButtonText || getI18n("vxe.table.resetFilter")
+            )
+          ]
+        )
       ] : [];
     };
     const renderVN = () => {
@@ -222,27 +276,35 @@ var panel_default = defineVxeComponent({
       const vSize = computeSize.value;
       const filterOpts = computeFilterOpts.value;
       const { transfer, destroyOnClose, className } = filterOpts;
-      return h(Teleport, {
-        to: "body",
-        disabled: !transfer
-      }, [
-        h("div", {
-          ref: refElem,
-          class: [
-            "vxe-table--filter-wrapper",
-            "filter--prevent-default",
-            className,
-            getPropClass(filterClassName, params),
+      return h(
+        Teleport,
+        {
+          to: "body",
+          disabled: !transfer
+        },
+        [
+          h(
+            "div",
             {
-              [`size--${vSize}`]: vSize,
-              "is--animat": tableProps.animat,
-              "is--multiple": column.filterMultiple,
-              "is--active": visible
-            }
-          ],
-          style: filterStore.style
-        }, initStore.filter && (destroyOnClose ? visible : true) && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
-      ]);
+              ref: refElem,
+              class: [
+                "vxe-table--filter-wrapper",
+                "filter--prevent-default",
+                className,
+                getPropClass(filterClassName, params),
+                {
+                  [`size--${vSize}`]: vSize,
+                  "is--animat": tableProps.animat,
+                  "is--multiple": column.filterMultiple,
+                  "is--active": visible
+                }
+              ],
+              style: filterStore.style
+            },
+            initStore.filter && (destroyOnClose ? visible : true) && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : []
+          )
+        ]
+      );
     };
     $xeFilterPanel.renderVN = renderVN;
     return $xeFilterPanel;

package/es/table/module/keyboard/hook.js

@@ -1,5 +1,5 @@
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getRefElem } from "../../src/util";
 import { getAbsolutePos, addClass, removeClass, hasControlKey } from "../../../ui/src/dom";
 import { hasEnableConf } from "../../../ui/src/utils";
@@ -109,10 +109,14 @@ hooks.add("tableKeyboardModule", {
         let isMouseScrollDown = false;
         let mouseScrollSpaceSize = 1;
         const triggerEvent = (type, evnt2) => {
-          $xeTable.dispatchEvent(`checkbox-range-${type}`, {
-            records: () => $xeTable.getCheckboxRecords(),
-            reserves: () => $xeTable.getCheckboxReserveRecords()
-          }, evnt2);
+          $xeTable.dispatchEvent(
+            `checkbox-range-${type}`,
+            {
+              records: () => $xeTable.getCheckboxRecords(),
+              reserves: () => $xeTable.getCheckboxReserveRecords()
+            },
+            evnt2
+          );
         };
         const handleChecked = (evnt2) => {
           const { clientX, clientY } = evnt2;

package/es/table/module/menu/hook.js

@@ -1,6 +1,6 @@
 import { nextTick } from "vue";
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getDomNode, getAbsolutePos, getEventTargetNode, toCssUnit } from "../../../ui/src/dom";
 import { isEnableConf, hasChildrenList, hasEnableConf } from "../../../ui/src/utils";
 const { menus, hooks, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;