vxe-pc-ui 4.20.24 → 4.20.26

package/lib/select/src/util.js

@@ -46,9 +46,12 @@ function createOption($xeSelect, _vm) {
 }
 function watchOption(props, option) {
   Object.keys(props).forEach((name) => {
-    (0, import_vue.watch)(() => props[name], (value) => {
-      option.update(name, value);
-    });
+    (0, import_vue.watch)(
+      () => props[name],
+      (value) => {
+        option.update(name, value);
+      }
+    );
   });
 }
 function assembleOption($xeSelect, el, option, $xeOptgroup) {

package/lib/slider/src/slider.js

@@ -34,8 +34,9 @@ module.exports = __toCommonJS(slider_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");
+const { getConfig, createEvent, renderEmptyElement, useFns } = import_core.VxeUI;
 function createInternalData() {
   return {
     // _isUp: false,
@@ -58,23 +59,23 @@ var slider_default = (0, import_comp.defineVxeComponent)({
     vertical: Boolean,
     max: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().slider.max
+      default: () => getConfig().slider.max
     },
     min: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().slider.min
+      default: () => getConfig().slider.min
     },
     step: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().slider.step
+      default: () => getConfig().slider.step
     },
     size: {
       type: String,
-      default: () => (0, import_ui.getConfig)().slider.size || (0, import_ui.getConfig)().size
+      default: () => getConfig().slider.size || getConfig().size
     },
     range: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().slider.range
+      default: () => getConfig().slider.range
     },
     readonly: {
       type: Boolean,
@@ -86,33 +87,25 @@ var slider_default = (0, import_comp.defineVxeComponent)({
     },
     status: {
       type: String,
-      default: () => (0, import_ui.getConfig)().slider.status
+      default: () => getConfig().slider.status
     },
     immediate: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().slider.immediate
+      default: () => getConfig().slider.immediate
     },
     showTooltip: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().slider.showTooltip
+      default: () => getConfig().slider.showTooltip
     },
     tooltipConfig: Object
   },
-  emits: [
-    "update:modelValue",
-    "update:startValue",
-    "update:endValue",
-    "change",
-    "track-dragstart",
-    "track-dragover",
-    "track-dragend"
-  ],
+  emits: ["update:modelValue", "update:startValue", "update:endValue", "change", "track-dragstart", "track-dragover", "track-dragend"],
   setup(props, context) {
     const { emit } = context;
     const $xeForm = (0, import_vue.inject)("$xeForm", null);
     const formItemInfo = (0, import_vue.inject)("xeFormItemInfo", null);
     const xID = import_xe_utils.default.uniqueId();
-    const { computeSize } = (0, import_ui.useSize)(props);
+    const { computeSize } = useFns.useSize(props);
     const refElem = (0, import_vue.ref)();
     const refBarElem = (0, import_vue.ref)();
     const refTrackElem = (0, import_vue.ref)();
@@ -154,7 +147,7 @@ var slider_default = (0, import_comp.defineVxeComponent)({
       return range ? `${startValue || ""}${endValue || ""}` : "";
     });
     const computeTooltipOpts = (0, import_vue.computed)(() => {
-      return Object.assign({}, (0, import_ui.getConfig)().slider.tooltipConfig, props.tooltipConfig);
+      return Object.assign({}, getConfig().slider.tooltipConfig, props.tooltipConfig);
     });
     const computeMaps = {};
     const $xeSlider = {
@@ -170,7 +163,7 @@ var slider_default = (0, import_comp.defineVxeComponent)({
       emit("update:modelValue", value);
     };
     const dispatchEvent = (type, params, evnt) => {
-      emit(type, (0, import_ui.createEvent)(evnt, { $slider: $xeSlider }, params));
+      emit(type, createEvent(evnt, { $slider: $xeSlider }, params));
     };
     const collapsePaneMethods = {
       dispatchEvent
@@ -302,23 +295,32 @@ var slider_default = (0, import_comp.defineVxeComponent)({
     const handleShowTip = (btnElem) => {
       const { showTooltip } = props;
       if (showTooltip) {
-        if (import_ui.VxeUI.tooltip) {
+        if (import_core.VxeUI.tooltip) {
           const { currValue } = internalData;
           const tooltipOpts = computeTooltipOpts.value;
           const { contentMethod } = tooltipOpts;
-          const content = (0, import_utils.getText)(contentMethod ? contentMethod({
-            $slider: $xeSlider,
-            value: currValue
-          }) : "" + currValue);
+          const content = (0, import_utils.getText)(
+            contentMethod ? contentMethod({
+              $slider: $xeSlider,
+              value: currValue
+            }) : "" + currValue
+          );
           if (content) {
-            import_ui.VxeUI.tooltip.open(btnElem, Object.assign({}, {
-              ...tooltipOpts,
-              content
-            }, {
-              contentMethod: void 0
-            }));
+            import_core.VxeUI.tooltip.open(
+              btnElem,
+              Object.assign(
+                {},
+                {
+                  ...tooltipOpts,
+                  content
+                },
+                {
+                  contentMethod: void 0
+                }
+              )
+            );
           } else {
-            import_ui.VxeUI.tooltip.close();
+            import_core.VxeUI.tooltip.close();
           }
         }
       }
@@ -326,8 +328,8 @@ var slider_default = (0, import_comp.defineVxeComponent)({
     const handleHideTip = () => {
       const { showTooltip } = props;
       if (showTooltip) {
-        if (import_ui.VxeUI.tooltip) {
-          import_ui.VxeUI.tooltip.close();
+        if (import_core.VxeUI.tooltip) {
+          import_core.VxeUI.tooltip.close();
         }
       }
     };
@@ -358,11 +360,15 @@ var slider_default = (0, import_comp.defineVxeComponent)({
             }
             internalData.currValue = currValue;
             btnElem.style.left = getBarPercent(currValue) + "%";
-            dispatchEvent("track-dragover", {
-              currentValue: internalData.currValue,
-              startValue: internalData.startValue,
-              endValue: internalData.endValue
-            }, evnt2);
+            dispatchEvent(
+              "track-dragover",
+              {
+                currentValue: internalData.currValue,
+                startValue: internalData.startValue,
+                endValue: internalData.endValue
+              },
+              evnt2
+            );
           }
           if (immediate) {
             changeEvent(evnt2);
@@ -374,22 +380,30 @@ var slider_default = (0, import_comp.defineVxeComponent)({
           document.onmousemove = null;
           document.onmouseup = null;
           internalData.isDragStatus = false;
-          dispatchEvent("track-dragend", {
-            currentValue: internalData.currValue,
-            startValue: internalData.startValue,
-            endValue: internalData.endValue
-          }, evnt2);
+          dispatchEvent(
+            "track-dragend",
+            {
+              currentValue: internalData.currValue,
+              startValue: internalData.startValue,
+              endValue: internalData.endValue
+            },
+            evnt2
+          );
           changeEvent(evnt2);
           updateTrackStyle();
           if (!internalData.isBtnActive) {
             handleHideTip();
           }
         };
-        dispatchEvent("track-dragstart", {
-          currentValue: internalData.currValue,
-          startValue: internalData.startValue,
-          endValue: internalData.endValue
-        }, evnt);
+        dispatchEvent(
+          "track-dragstart",
+          {
+            currentValue: internalData.currValue,
+            startValue: internalData.startValue,
+            endValue: internalData.endValue
+          },
+          evnt
+        );
         internalData.isDragStatus = false;
       }
     };
@@ -415,52 +429,66 @@ var slider_default = (0, import_comp.defineVxeComponent)({
       const vSize = computeSize.value;
       const formReadonly = computeFormReadonly.value;
       const isDisabled = computeIsDisabled.value;
-      return (0, import_vue.h)("div", {
-        ref: refElem,
-        class: ["vxe-slider", {
-          [`size--${vSize}`]: vSize,
-          [`theme--${status}`]: status,
-          "is--vertical": vertical,
-          "is--readonly": formReadonly,
-          "is--disabled": isDisabled
-        }]
-      }, [
-        (0, import_vue.h)("div", {
-          class: "vxe-slider--inner"
-        }, [
-          (0, import_vue.h)("div", {
-            ref: refBarElem,
-            class: "vxe-slider--bar-wrapper"
-          }),
-          (0, import_vue.h)("div", {
-            ref: refTrackElem,
-            class: "vxe-slider--bar-track"
-          }),
-          formReadonly || !range ? (0, import_ui.renderEmptyElement)($xeSlider) : (0, import_vue.h)("div", {
-            ref: refStartBtnElem,
-            class: "vxe-slider--bar-btn",
-            "data-type": "1",
-            onMouseenter: handleBtnMouseenterEvent,
-            onMouseleave: handleBtnMouseleaveEvent,
-            onMousedown: handleBtnMousedownEvent
-          }),
-          formReadonly ? (0, import_ui.renderEmptyElement)($xeSlider) : (0, import_vue.h)("div", {
-            ref: refEndBtnElem,
-            class: "vxe-slider--bar-btn",
-            "data-type": "2",
-            onMouseenter: handleBtnMouseenterEvent,
-            onMouseleave: handleBtnMouseleaveEvent,
-            onMousedown: handleBtnMousedownEvent
-          })
-        ])
-      ]);
+      return (0, import_vue.h)(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-slider",
+            {
+              [`size--${vSize}`]: vSize,
+              [`theme--${status}`]: status,
+              "is--vertical": vertical,
+              "is--readonly": formReadonly,
+              "is--disabled": isDisabled
+            }
+          ]
+        },
+        [
+          (0, import_vue.h)(
+            "div",
+            {
+              class: "vxe-slider--inner"
+            },
+            [
+              (0, import_vue.h)("div", {
+                ref: refBarElem,
+                class: "vxe-slider--bar-wrapper"
+              }),
+              (0, import_vue.h)("div", {
+                ref: refTrackElem,
+                class: "vxe-slider--bar-track"
+              }),
+              formReadonly || !range ? renderEmptyElement($xeSlider) : (0, import_vue.h)("div", {
+                ref: refStartBtnElem,
+                class: "vxe-slider--bar-btn",
+                "data-type": "1",
+                onMouseenter: handleBtnMouseenterEvent,
+                onMouseleave: handleBtnMouseleaveEvent,
+                onMousedown: handleBtnMousedownEvent
+              }),
+              formReadonly ? renderEmptyElement($xeSlider) : (0, import_vue.h)("div", {
+                ref: refEndBtnElem,
+                class: "vxe-slider--bar-btn",
+                "data-type": "2",
+                onMouseenter: handleBtnMouseenterEvent,
+                onMouseleave: handleBtnMouseleaveEvent,
+                onMousedown: handleBtnMousedownEvent
+              })
+            ]
+          )
+        ]
+      );
     };
-    (0, import_vue.watch)(() => props.modelValue, () => {
-      if (!internalData._isUp) {
-        updateModelValue(1);
+    (0, import_vue.watch)(
+      () => props.modelValue,
+      () => {
+        if (!internalData._isUp) {
+          updateModelValue(1);
+        }
+        internalData._isUp = false;
       }
-      internalData._isUp = false;
-    });
+    );
     (0, import_vue.watch)(computeMVal, () => {
       if (!internalData._isUp) {
         updateModelValue(2);

package/lib/space/src/space.js

@@ -34,71 +34,72 @@ module.exports = __toCommonJS(space_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_dom = require("../../ui/src/dom");
 var import_utils = require("../../ui/src/utils");
+const { getConfig, createEvent, useFns } = import_core.VxeUI;
 var space_default = (0, import_comp.defineVxeComponent)({
   name: "VxeSpace",
   props: {
     size: {
       type: String,
-      default: () => (0, import_ui.getConfig)().space.size || (0, import_ui.getConfig)().size
+      default: () => getConfig().space.size || getConfig().size
     },
     wrap: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().space.wrap
+      default: () => getConfig().space.wrap
     },
     width: [Number, String],
     gap: {
       type: [Number, String, Array, Object],
-      default: () => (0, import_ui.getConfig)().space.gap
+      default: () => getConfig().space.gap
     },
     vertical: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().space.vertical
+      default: () => getConfig().space.vertical
     },
     className: {
       type: String,
-      default: () => (0, import_ui.getConfig)().space.className
+      default: () => getConfig().space.className
     },
     itemClassName: {
       type: String,
-      default: () => (0, import_ui.getConfig)().space.itemClassName
+      default: () => getConfig().space.itemClassName
     },
     separator: {
       type: String,
-      default: () => (0, import_ui.getConfig)().space.separator
+      default: () => getConfig().space.separator
     },
     align: {
       type: String,
-      default: () => (0, import_ui.getConfig)().space.align
+      default: () => getConfig().space.align
     },
     fill: {
       type: Boolean,
-      default: () => (0, import_ui.getConfig)().space.fill
+      default: () => getConfig().space.fill
     },
     itemWidth: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().space.itemWidth
+      default: () => getConfig().space.itemWidth
     },
     itemMinWidth: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().space.itemMinWidth
+      default: () => getConfig().space.itemMinWidth
     },
     itemMaxWidth: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().space.itemMaxWidth
+      default: () => getConfig().space.itemMaxWidth
     },
     separatorWidth: {
       type: [String, Number],
-      default: () => (0, import_ui.getConfig)().space.separatorWidth
+      default: () => getConfig().space.separatorWidth
     }
   },
   emits: [],
   setup(props, context) {
     const { emit, slots } = context;
     const xID = import_xe_utils.default.uniqueId();
-    const { computeSize } = (0, import_ui.useSize)(props);
+    const { computeSize } = useFns.useSize(props);
     const refElem = (0, import_vue.ref)();
     const reactData = (0, import_vue.reactive)({
       activeValue: null
@@ -119,8 +120,8 @@ var space_default = (0, import_comp.defineVxeComponent)({
           rowGap = gap[0];
           columGap = gap[1];
         } else {
-          rowGap = gap.rowGap || "";
-          columGap = gap.columGap || "";
+          rowGap = import_xe_utils.default.eqNull(gap.rowGap) ? "" : gap.rowGap;
+          columGap = import_xe_utils.default.eqNull(gap.columGap) ? "" : gap.columGap;
         }
       }
       if (width) {
@@ -147,7 +148,7 @@ var space_default = (0, import_comp.defineVxeComponent)({
       getComputeMaps: () => computeMaps
     };
     const dispatchEvent = (type, params, evnt) => {
-      emit(type, (0, import_ui.createEvent)(evnt, { $space: $xeSpace }, params));
+      emit(type, createEvent(evnt, { $space: $xeSpace }, params));
     };
     const spaceMethods = {
       dispatchEvent
@@ -161,7 +162,7 @@ var space_default = (0, import_comp.defineVxeComponent)({
       const separatorSlot = slots.separator;
       const srStys = {};
       if (separatorWidth) {
-        srStys.width = (0, import_dom.toCssUnit)(itemWidth);
+        srStys.width = (0, import_dom.toCssUnit)(separatorWidth);
       }
       const itemStys = {};
       if (itemWidth) {
@@ -176,19 +177,27 @@ var space_default = (0, import_comp.defineVxeComponent)({
       if (defaultSlot) {
         import_xe_utils.default.each(defaultSlot({}), (itemVN, index, items) => {
           itemVNs.push(
-            (0, import_vue.h)("div", {
-              key: "i" + index,
-              class: ["vxe-space--item", (0, import_dom.getPropClass)(itemClassName, { index })],
-              style: itemStys
-            }, [itemVN])
+            (0, import_vue.h)(
+              "div",
+              {
+                key: "i" + index,
+                class: ["vxe-space--item", (0, import_dom.getPropClass)(itemClassName, { index })],
+                style: itemStys
+              },
+              [itemVN]
+            )
           );
           if ((separator || separatorSlot) && index < items.length - 1) {
             itemVNs.push(
-              (0, import_vue.h)("div", {
-                key: "s" + index,
-                class: "vxe-space--separator",
-                style: srStys
-              }, separatorSlot ? separatorSlot({}) : "" + separator)
+              (0, import_vue.h)(
+                "div",
+                {
+                  key: "s" + index,
+                  class: "vxe-space--separator",
+                  style: srStys
+                },
+                separatorSlot ? separatorSlot({}) : "" + separator
+              )
             );
           }
         });
@@ -199,17 +208,25 @@ var space_default = (0, import_comp.defineVxeComponent)({
       const { vertical, wrap, className, fill, itemWidth, itemMinWidth, itemMaxWidth } = props;
       const currStyle = computeCurrStyle.value;
       const vSize = computeSize.value;
-      return (0, import_vue.h)("div", {
-        ref: refElem,
-        class: ["vxe-space", (0, import_dom.getPropClass)(className, {}), {
-          [`size--${vSize}`]: vSize,
-          "is--wrap": wrap,
-          "is--vertical": vertical,
-          "is--fill": fill,
-          "is--width": itemWidth || itemMinWidth || itemMaxWidth
-        }],
-        style: currStyle
-      }, renderItems());
+      return (0, import_vue.h)(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-space",
+            (0, import_dom.getPropClass)(className, {}),
+            {
+              [`size--${vSize}`]: vSize,
+              "is--wrap": wrap,
+              "is--vertical": vertical,
+              "is--fill": fill,
+              "is--width": itemWidth || itemMinWidth || itemMaxWidth
+            }
+          ],
+          style: currStyle
+        },
+        renderItems()
+      );
     };
     $xeSpace.renderVN = renderVN;
     return $xeSpace;

package/lib/splitter/src/splitter-panel.js

@@ -33,9 +33,10 @@ __export(splitter_panel_exports, {
 module.exports = __toCommonJS(splitter_panel_exports);
 var import_vue = require("vue");
 var import_comp = require("../../ui/src/comp");
-var import_ui = require("../../ui");
+var import_core = require("@vxe-ui/core");
 var import_util = require("./util");
 var import_xe_utils = __toESM(require("xe-utils"));
+const { createEvent } = import_core.VxeUI;
 var splitter_panel_default = (0, import_comp.defineVxeComponent)({
   name: "VxeSplitterPanel",
   props: {
@@ -102,7 +103,7 @@ var splitter_panel_default = (0, import_comp.defineVxeComponent)({
       getComputeMaps: () => computeMaps
     };
     const dispatchEvent = (type, params, evnt) => {
-      emit(type, (0, import_ui.createEvent)(evnt, { $splitterPanel: $xeSplitterItem }, params));
+      emit(type, createEvent(evnt, { $splitterPanel: $xeSplitterItem }, params));
     };
     const splitterPanelMethods = {
       dispatchEvent
@@ -114,30 +115,54 @@ var splitter_panel_default = (0, import_comp.defineVxeComponent)({
         ref: refElem
       });
     };
-    (0, import_vue.watch)(() => props.name, (val) => {
-      paneConfig.name = val;
-    });
-    (0, import_vue.watch)(() => props.width, (val) => {
-      paneConfig.width = val;
-    });
-    (0, import_vue.watch)(() => props.height, (val) => {
-      paneConfig.height = val;
-    });
-    (0, import_vue.watch)(() => props.minWidth, (val) => {
-      paneConfig.minWidth = val;
-    });
-    (0, import_vue.watch)(() => props.minHeight, (val) => {
-      paneConfig.minHeight = val;
-    });
-    (0, import_vue.watch)(() => props.maxWidth, (val) => {
-      paneConfig.maxWidth = val;
-    });
-    (0, import_vue.watch)(() => props.maxHeight, (val) => {
-      paneConfig.maxHeight = val;
-    });
-    (0, import_vue.watch)(() => props.showAction, (val) => {
-      paneConfig.showAction = val;
-    });
+    (0, import_vue.watch)(
+      () => props.name,
+      (val) => {
+        paneConfig.name = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.width,
+      (val) => {
+        paneConfig.width = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.height,
+      (val) => {
+        paneConfig.height = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.minWidth,
+      (val) => {
+        paneConfig.minWidth = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.minHeight,
+      (val) => {
+        paneConfig.minHeight = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.maxWidth,
+      (val) => {
+        paneConfig.maxWidth = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.maxHeight,
+      (val) => {
+        paneConfig.maxHeight = val;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.showAction,
+      (val) => {
+        paneConfig.showAction = val;
+      }
+    );
     (0, import_vue.onMounted)(() => {
       const elem = refElem.value;
       if ($xeSplitter && elem) {