vxe-pc-ui 4.20.24 → 4.20.26

package/lib/divider/src/divider.js

@@ -34,25 +34,26 @@ module.exports = __toCommonJS(divider_exports);
 var import_vue = require("vue");
 var import_comp = require("../../ui/src/comp");
 var import_xe_utils = __toESM(require("xe-utils"));
-var import_ui = require("../../ui");
+var import_core = require("@vxe-ui/core");
+const { getConfig, createEvent, useFns } = import_core.VxeUI;
 var divider_default = (0, import_comp.defineVxeComponent)({
   name: "VxeDivider",
   props: {
     vertical: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().divider.vertical
+      default: () => getConfig().divider.vertical
     },
     titleContent: {
       type: String,
-      default: () => (0, import_ui.getConfig)().divider.titleContent
+      default: () => getConfig().divider.titleContent
     },
     titleAlign: {
       type: String,
-      default: () => (0, import_ui.getConfig)().divider.titleAlign
+      default: () => getConfig().divider.titleAlign
     },
     size: {
       type: String,
-      default: () => (0, import_ui.getConfig)().divider.size || (0, import_ui.getConfig)().size
+      default: () => getConfig().divider.size || getConfig().size
     }
   },
   emits: [],
@@ -60,7 +61,7 @@ var divider_default = (0, import_comp.defineVxeComponent)({
     const { emit, slots } = context;
     const xID = import_xe_utils.default.uniqueId();
     const refElem = (0, import_vue.ref)();
-    const { computeSize } = (0, import_ui.useSize)(props);
+    const { computeSize } = useFns.useSize(props);
     const refMaps = {
       refElem
     };
@@ -73,7 +74,7 @@ var divider_default = (0, import_comp.defineVxeComponent)({
       getComputeMaps: () => computeMaps
     };
     const dispatchEvent = (type, params, evnt) => {
-      emit(type, (0, import_ui.createEvent)(evnt, { $divider: $xeDivider }, params));
+      emit(type, createEvent(evnt, { $divider: $xeDivider }, params));
     };
     const dividerMethods = {
       dispatchEvent
@@ -84,16 +85,29 @@ var divider_default = (0, import_comp.defineVxeComponent)({
       const { vertical, titleContent, titleAlign } = props;
       const vSize = computeSize.value;
       const titleSlot = slots.title;
-      return (0, import_vue.h)("div", {
-        ref: refElem,
-        class: ["vxe-divider", vertical ? "is--vertical" : "is--horizontal", `t--align-${titleAlign || "center"}`, {
-          [`size--${vSize}`]: vSize
-        }]
-      }, (titleContent || titleSlot) && !vertical ? [
-        (0, import_vue.h)("span", {
-          class: "vxe-divider--content"
-        }, titleSlot ? titleSlot({}) : titleContent)
-      ] : []);
+      return (0, import_vue.h)(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-divider",
+            vertical ? "is--vertical" : "is--horizontal",
+            `t--align-${titleAlign || "center"}`,
+            {
+              [`size--${vSize}`]: vSize
+            }
+          ]
+        },
+        (titleContent || titleSlot) && !vertical ? [
+          (0, import_vue.h)(
+            "span",
+            {
+              class: "vxe-divider--content"
+            },
+            titleSlot ? titleSlot({}) : titleContent
+          )
+        ] : []
+      );
     };
     $xeDivider.renderVN = renderVN;
     return $xeDivider;

package/lib/drawer/src/drawer.js

@@ -34,7 +34,7 @@ module.exports = __toCommonJS(drawer_exports);
 var import_vue = require("vue");
 var import_comp = require("../../ui/src/comp");
 var import_xe_utils = __toESM(require("xe-utils"));
-var import_ui = require("../../ui");
+var import_core = require("@vxe-ui/core");
 var import_utils = require("../../ui/src/utils");
 var import_dom = require("../../ui/src/dom");
 var import_store = require("./store");
@@ -42,7 +42,7 @@ var import_vn = require("../../ui/src/vn");
 var import_button = __toESM(require("../../button"));
 var import_loading = __toESM(require("../../loading"));
 var import_scrollbar = __toESM(require("../../scrollbar"));
-const { getIcon, getConfig, getI18n, useFns, globalEvents, GLOBAL_EVENT_KEYS, createEvent, renderEmptyElement } = import_ui.VxeUI;
+const { getIcon, getConfig, getI18n, useFns, globalEvents, GLOBAL_EVENT_KEYS, createEvent, renderEmptyElement } = import_core.VxeUI;
 var drawer_default = (0, import_comp.defineVxeComponent)({
   name: "VxeDrawer",
   props: {
@@ -182,16 +182,7 @@ var drawer_default = (0, import_comp.defineVxeComponent)({
     },
     scrollbarConfig: Object
   },
-  emits: [
-    "update:modelValue",
-    "show",
-    "hide",
-    "before-hide",
-    "close",
-    "confirm",
-    "cancel",
-    "resize"
-  ],
+  emits: ["update:modelValue", "show", "hide", "before-hide", "close", "confirm", "cancel", "resize"],
   setup(props, context) {
     const { slots, emit } = context;
     const xID = import_xe_utils.default.uniqueId();
@@ -521,36 +512,59 @@ var drawer_default = (0, import_comp.defineVxeComponent)({
       const titleSlot = slots.title || propSlots.title;
       const cornerSlot = slots.corner || propSlots.corner;
       return [
-        (0, import_vue.h)("div", {
-          class: "vxe-drawer--header-title"
-        }, titleSlot ? (0, import_vn.getSlotVNs)(titleSlot({ $drawer: $xeDrawer })) : title ? (0, import_utils.getFuncText)(title) : getI18n("vxe.alert.title")),
-        (0, import_vue.h)("div", {
-          class: "vxe-drawer--header-right"
-        }, [
-          cornerSlot ? (0, import_vue.h)("div", {
-            class: "vxe-drawer--corner-wrapper"
-          }, (0, import_vn.getSlotVNs)(cornerSlot({ $drawer: $xeDrawer }))) : renderEmptyElement($xeDrawer),
-          showClose ? (0, import_vue.h)("div", {
-            class: ["vxe-drawer--close-btn", "trigger--btn"],
-            title: getI18n("vxe.drawer.close"),
-            onClick: closeEvent
-          }, [
-            (0, import_vue.h)("i", {
-              class: getIcon().DRAWER_CLOSE
-            })
-          ]) : renderEmptyElement($xeDrawer)
-        ])
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-drawer--header-title"
+          },
+          titleSlot ? (0, import_vn.getSlotVNs)(titleSlot({ $drawer: $xeDrawer })) : title ? (0, import_utils.getFuncText)(title) : getI18n("vxe.alert.title")
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-drawer--header-right"
+          },
+          [
+            cornerSlot ? (0, import_vue.h)(
+              "div",
+              {
+                class: "vxe-drawer--corner-wrapper"
+              },
+              (0, import_vn.getSlotVNs)(cornerSlot({ $drawer: $xeDrawer }))
+            ) : renderEmptyElement($xeDrawer),
+            showClose ? (0, import_vue.h)(
+              "div",
+              {
+                class: ["vxe-drawer--close-btn", "trigger--btn"],
+                title: getI18n("vxe.drawer.close"),
+                onClick: closeEvent
+              },
+              [
+                (0, import_vue.h)("i", {
+                  class: getIcon().DRAWER_CLOSE
+                })
+              ]
+            ) : renderEmptyElement($xeDrawer)
+          ]
+        )
       ];
     };
     const renderHeader = () => {
       const { slots: propSlots = {}, showTitleOverflow } = props;
       const headerSlot = slots.header || propSlots.header;
       if (props.showHeader) {
-        return (0, import_vue.h)("div", {
-          class: ["vxe-drawer--header", {
-            "is--ellipsis": showTitleOverflow
-          }]
-        }, headerSlot ? (0, import_vn.getSlotVNs)(headerSlot({ $drawer: $xeDrawer })) : renderTitles());
+        return (0, import_vue.h)(
+          "div",
+          {
+            class: [
+              "vxe-drawer--header",
+              {
+                "is--ellipsis": showTitleOverflow
+              }
+            ]
+          },
+          headerSlot ? (0, import_vn.getSlotVNs)(headerSlot({ $drawer: $xeDrawer })) : renderTitles()
+        );
       }
       return renderEmptyElement($xeDrawer);
     };
@@ -564,20 +578,24 @@ var drawer_default = (0, import_comp.defineVxeComponent)({
       const contVNs = [];
       if (useHtml && !defaultSlot) {
         contVNs.push(
-          isVScrollbar ? (0, import_vue.h)(import_scrollbar.default, {
-            key: "shc",
-            class: "vxe-drawer--scrollbar-content",
-            ...scrollbarProps
-          }, {
-            default() {
-              return [
-                (0, import_vue.h)("div", {
-                  class: "vxe-drawer--scrollbar-content-html",
-                  innerHTML: (0, import_utils.getFuncText)(content)
-                })
-              ];
+          isVScrollbar ? (0, import_vue.h)(
+            import_scrollbar.default,
+            {
+              key: "shc",
+              class: "vxe-drawer--scrollbar-content",
+              ...scrollbarProps
+            },
+            {
+              default() {
+                return [
+                  (0, import_vue.h)("div", {
+                    class: "vxe-drawer--scrollbar-content-html",
+                    innerHTML: (0, import_utils.getFuncText)(content)
+                  })
+                ];
+              }
             }
-          }) : (0, import_vue.h)("div", {
+          ) : (0, import_vue.h)("div", {
             key: "hc",
             class: "vxe-drawer--content",
             innerHTML: (0, import_utils.getFuncText)(content)
@@ -585,35 +603,59 @@ var drawer_default = (0, import_comp.defineVxeComponent)({
         );
       } else {
         contVNs.push(
-          isVScrollbar ? (0, import_vue.h)(import_scrollbar.default, {
-            key: "sdc",
-            class: "vxe-drawer--scrollbar-content",
-            ...scrollbarProps
-          }, {
-            default: () => defaultSlot ? (0, import_vn.getSlotVNs)(defaultSlot({ $drawer: $xeDrawer })) : (0, import_utils.getFuncText)(content)
-          }) : (0, import_vue.h)("div", {
-            key: "dc",
-            class: "vxe-drawer--content"
-          }, defaultSlot ? (0, import_vn.getSlotVNs)(defaultSlot({ $drawer: $xeDrawer })) : (0, import_utils.getFuncText)(content))
+          isVScrollbar ? (0, import_vue.h)(
+            import_scrollbar.default,
+            {
+              key: "sdc",
+              class: "vxe-drawer--scrollbar-content",
+              ...scrollbarProps
+            },
+            {
+              default: () => defaultSlot ? (0, import_vn.getSlotVNs)(defaultSlot({ $drawer: $xeDrawer })) : (0, import_utils.getFuncText)(content)
+            }
+          ) : (0, import_vue.h)(
+            "div",
+            {
+              key: "dc",
+              class: "vxe-drawer--content"
+            },
+            defaultSlot ? (0, import_vn.getSlotVNs)(defaultSlot({ $drawer: $xeDrawer })) : (0, import_utils.getFuncText)(content)
+          )
         );
       }
-      return (0, import_vue.h)("div", {
-        class: "vxe-drawer--body"
-      }, [
-        leftSlot ? (0, import_vue.h)("div", {
-          class: "vxe-drawer--body-left"
-        }, (0, import_vn.getSlotVNs)(leftSlot({ $drawer: $xeDrawer }))) : renderEmptyElement($xeDrawer),
-        (0, import_vue.h)("div", {
-          class: "vxe-drawer--body-default"
-        }, contVNs),
-        rightSlot ? (0, import_vue.h)("div", {
-          class: "vxe-drawer--body-right"
-        }, (0, import_vn.getSlotVNs)(rightSlot({ $drawer: $xeDrawer }))) : renderEmptyElement($xeDrawer),
-        (0, import_vue.h)(import_loading.default, {
-          class: "vxe-drawer--loading",
-          modelValue: props.loading
-        })
-      ]);
+      return (0, import_vue.h)(
+        "div",
+        {
+          class: "vxe-drawer--body"
+        },
+        [
+          leftSlot ? (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-drawer--body-left"
+            },
+            (0, import_vn.getSlotVNs)(leftSlot({ $drawer: $xeDrawer }))
+          ) : renderEmptyElement($xeDrawer),
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-drawer--body-default"
+            },
+            contVNs
+          ),
+          rightSlot ? (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-drawer--body-right"
+            },
+            (0, import_vn.getSlotVNs)(rightSlot({ $drawer: $xeDrawer }))
+          ) : renderEmptyElement($xeDrawer),
+          (0, import_vue.h)(import_loading.default, {
+            class: "vxe-drawer--loading",
+            modelValue: props.loading
+          })
+        ]
+      );
     };
     const renderDefaultFooter = () => {
       const { slots: propSlots = {}, showCancelButton, showConfirmButton, loading } = props;
@@ -642,24 +684,40 @@ var drawer_default = (0, import_comp.defineVxeComponent)({
           })
         );
       }
-      return (0, import_vue.h)("div", {
-        class: "vxe-drawer--footer-wrapper"
-      }, [
-        (0, import_vue.h)("div", {
-          class: "vxe-drawer--footer-left"
-        }, lfSlot ? (0, import_vn.getSlotVNs)(lfSlot({ $drawer: $xeDrawer })) : []),
-        (0, import_vue.h)("div", {
-          class: "vxe-drawer--footer-right"
-        }, rfSlot ? (0, import_vn.getSlotVNs)(rfSlot({ $drawer: $xeDrawer })) : btnVNs)
-      ]);
+      return (0, import_vue.h)(
+        "div",
+        {
+          class: "vxe-drawer--footer-wrapper"
+        },
+        [
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-drawer--footer-left"
+            },
+            lfSlot ? (0, import_vn.getSlotVNs)(lfSlot({ $drawer: $xeDrawer })) : []
+          ),
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-drawer--footer-right"
+            },
+            rfSlot ? (0, import_vn.getSlotVNs)(rfSlot({ $drawer: $xeDrawer })) : btnVNs
+          )
+        ]
+      );
     };
     const renderFooter = () => {
       const { slots: propSlots = {} } = props;
       const footerSlot = slots.footer || propSlots.footer;
       if (props.showFooter) {
-        return (0, import_vue.h)("div", {
-          class: "vxe-drawer--footer"
-        }, footerSlot ? (0, import_vn.getSlotVNs)(footerSlot({ $drawer: $xeDrawer })) : [renderDefaultFooter()]);
+        return (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-drawer--footer"
+          },
+          footerSlot ? (0, import_vn.getSlotVNs)(footerSlot({ $drawer: $xeDrawer })) : [renderDefaultFooter()]
+        );
       }
       return renderEmptyElement($xeDrawer);
     };
@@ -670,76 +728,118 @@ var drawer_default = (0, import_comp.defineVxeComponent)({
       const vSize = computeSize.value;
       const dragType = computeDragType.value;
       const btnTransfer = computeBtnTransfer.value;
-      return (0, import_vue.h)(import_vue.Teleport, {
-        to: (0, import_dom.getPopupContainer)(appendTo),
-        disabled: btnTransfer ? !initialized : true
-      }, [
-        (0, import_vue.h)("div", {
-          ref: refElem,
-          class: ["vxe-drawer--wrapper", `pos--${position}`, isWithinAppendTo ? "ctx--within" : "ctx--free", className || "", {
-            [`size--${vSize}`]: vSize,
-            "is--padding": padding,
-            "is--border": border,
-            "is--title-bg": showTitleBackground,
-            "lock--scroll": lockScroll,
-            "lock--view": lockView,
-            "is--resize": resize,
-            "is--mask": mask,
-            "is--visible": contentVisible,
-            "is--active": visible,
-            "is--loading": loading
-          }],
-          style: {
-            zIndex: reactData.drawerZIndex
-          },
-          onClick: selfClickEvent
-        }, [
-          (0, import_vue.h)("div", {
-            ref: refDrawerBox,
-            class: "vxe-drawer--box",
-            onMousedown: boxMousedownEvent
-          }, [
-            asideSlot ? (0, import_vue.h)("div", {
-              class: "vxe-drawer--aside"
-            }, (0, import_vn.getSlotVNs)(asideSlot({ $drawer: $xeDrawer }))) : renderEmptyElement($xeDrawer),
-            (0, import_vue.h)("div", {
-              class: "vxe-drawer--container"
-            }, !reactData.initialized || destroyOnClose && !reactData.visible ? [] : [
-              renderHeader(),
-              renderBody(),
-              renderFooter(),
-              resize ? (0, import_vue.h)("span", {
-                class: "vxe-drawer--resize"
-              }, [
-                (0, import_vue.h)("span", {
-                  class: `${dragType}-resize`,
-                  type: dragType,
-                  onMousedown: dragEvent
-                })
-              ]) : renderEmptyElement($xeDrawer)
-            ])
-          ])
-        ])
-      ]);
+      return (0, import_vue.h)(
+        import_vue.Teleport,
+        {
+          to: (0, import_dom.getPopupContainer)(appendTo),
+          disabled: btnTransfer ? !initialized : true
+        },
+        [
+          (0, import_vue.h)(
+            "div",
+            {
+              ref: refElem,
+              class: [
+                "vxe-drawer--wrapper",
+                `pos--${position}`,
+                isWithinAppendTo ? "ctx--within" : "ctx--free",
+                className || "",
+                {
+                  [`size--${vSize}`]: vSize,
+                  "is--padding": padding,
+                  "is--border": border,
+                  "is--title-bg": showTitleBackground,
+                  "lock--scroll": lockScroll,
+                  "lock--view": lockView,
+                  "is--resize": resize,
+                  "is--mask": mask,
+                  "is--visible": contentVisible,
+                  "is--active": visible,
+                  "is--loading": loading
+                }
+              ],
+              style: {
+                zIndex: reactData.drawerZIndex
+              },
+              onClick: selfClickEvent
+            },
+            [
+              (0, import_vue.h)(
+                "div",
+                {
+                  ref: refDrawerBox,
+                  class: "vxe-drawer--box",
+                  onMousedown: boxMousedownEvent
+                },
+                [
+                  asideSlot ? (0, import_vue.h)(
+                    "div",
+                    {
+                      class: "vxe-drawer--aside"
+                    },
+                    (0, import_vn.getSlotVNs)(asideSlot({ $drawer: $xeDrawer }))
+                  ) : renderEmptyElement($xeDrawer),
+                  (0, import_vue.h)(
+                    "div",
+                    {
+                      class: "vxe-drawer--container"
+                    },
+                    !reactData.initialized || destroyOnClose && !reactData.visible ? [] : [
+                      renderHeader(),
+                      renderBody(),
+                      renderFooter(),
+                      resize ? (0, import_vue.h)(
+                        "span",
+                        {
+                          class: "vxe-drawer--resize"
+                        },
+                        [
+                          (0, import_vue.h)("span", {
+                            class: `${dragType}-resize`,
+                            type: dragType,
+                            onMousedown: dragEvent
+                          })
+                        ]
+                      ) : renderEmptyElement($xeDrawer)
+                    ]
+                  )
+                ]
+              )
+            ]
+          )
+        ]
+      );
     };
     const reFlag = (0, import_vue.ref)(0);
-    (0, import_vue.watch)(() => props.width, () => {
-      reFlag.value++;
-    });
-    (0, import_vue.watch)(() => props.height, () => {
-      reFlag.value++;
-    });
-    (0, import_vue.watch)(() => props.position, () => {
-      reFlag.value++;
-    });
+    (0, import_vue.watch)(
+      () => props.width,
+      () => {
+        reFlag.value++;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.height,
+      () => {
+        reFlag.value++;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.position,
+      () => {
+        reFlag.value++;
+      }
+    );
     (0, import_vue.watch)(reFlag, recalculate);
-    (0, import_vue.watch)(() => props.modelValue, (value) => {
-      if (value) {
-        openDrawer();
-      } else {
-        closeDrawer("model");
+    (0, import_vue.watch)(
+      () => props.modelValue,
+      (value) => {
+        if (value) {
+          openDrawer();
+        } else {
+          closeDrawer("model");
+        }
       }
-    });
+    );
     (0, import_vue.onMounted)(() => {
       reactData.initialized = !!props.preload;
       (0, import_vue.nextTick)(() => {

package/lib/dynamics/index.js

@@ -52,25 +52,30 @@ const VxeDynamics = (0, import_comp.defineVxeComponent)({
       if (globalContextMenu) {
         const events = globalContextMenu.events || {};
         const { optionClick, show, hide } = events;
-        cmOpts = Object.assign({}, globalContextMenu, {
-          key: "cm",
-          onShow(params) {
-            if (show) {
-              show(params);
+        cmOpts = Object.assign(
+          {},
+          globalContextMenu,
+          {
+            key: "cm",
+            onShow(params) {
+              if (show) {
+                show(params);
+              }
+            },
+            onHide(params) {
+              if (hide) {
+                hide(params);
+              }
+              dynamicStore.globalContextMenu = null;
+            },
+            onOptionClick(params) {
+              if (optionClick) {
+                optionClick(params);
+              }
             }
           },
-          onHide(params) {
-            if (hide) {
-              hide(params);
-            }
-            dynamicStore.globalContextMenu = null;
-          },
-          onOptionClick(params) {
-            if (optionClick) {
-              optionClick(params);
-            }
-          }
-        }, { events: void 0 });
+          { events: void 0 }
+        );
       }
       let tpOpts = globalTooltip || {};
       if (globalTooltip) {
@@ -81,14 +86,22 @@ const VxeDynamics = (0, import_comp.defineVxeComponent)({
         });
       }
       return [
-        modals.length ? (0, import_vue.h)("div", {
-          key: "ml",
-          class: "vxe-dynamics--modal"
-        }, modals.map((item) => (0, import_vue.h)(VxeUIModalComponent, item))) : (0, import_vue.createCommentVNode)(),
-        drawers.length ? (0, import_vue.h)("div", {
-          key: "dr",
-          class: "vxe-dynamics--drawer"
-        }, drawers.map((item) => (0, import_vue.h)(VxeUIDrawerComponent, item))) : (0, import_vue.createCommentVNode)(),
+        modals.length ? (0, import_vue.h)(
+          "div",
+          {
+            key: "ml",
+            class: "vxe-dynamics--modal"
+          },
+          modals.map((item) => (0, import_vue.h)(VxeUIModalComponent, item))
+        ) : (0, import_vue.createCommentVNode)(),
+        drawers.length ? (0, import_vue.h)(
+          "div",
+          {
+            key: "dr",
+            class: "vxe-dynamics--drawer"
+          },
+          drawers.map((item) => (0, import_vue.h)(VxeUIDrawerComponent, item))
+        ) : (0, import_vue.createCommentVNode)(),
         globalWatermark ? (0, import_vue.h)(VxeUIWatermarkComponent, globalWatermark) : (0, import_vue.createCommentVNode)(),
         globalLoading ? (0, import_vue.h)(VxeUILoadingComponent, globalLoading) : (0, import_vue.createCommentVNode)(),
         globalContextMenu ? (0, import_vue.h)(VxeUIContextMenuComponent, cmOpts) : (0, import_vue.createCommentVNode)(),