vxe-pc-ui 4.20.24 → 4.20.26

package/es/notice-bar/src/notice-bar.js

@@ -1,8 +1,9 @@
 import { ref, h, reactive, computed, onMounted, watch, onBeforeUnmount, inject } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { getConfig, useSize, createEvent, globalEvents, renderEmptyElement } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { toCssUnit } from "../../ui/src/dom";
+const { getConfig, useFns, createEvent, globalEvents, renderEmptyElement } = VxeUI;
 var notice_bar_default = defineVxeComponent({
   name: "VxeNoticeBar",
   props: {
@@ -25,15 +26,12 @@ var notice_bar_default = defineVxeComponent({
       default: () => getConfig().noticeBar.size || getConfig().size
     }
   },
-  emits: [
-    "start",
-    "end"
-  ],
+  emits: ["start", "end"],
   setup(props, context) {
     const { slots, emit } = context;
     const $xeTabs = inject("$xeTabs", null);
     const xID = XEUtils.uniqueId();
-    const { computeSize } = useSize(props);
+    const { computeSize } = useFns.useSize(props);
     const refElem = ref();
     const refContentElem = ref();
     const reactData = reactive({
@@ -96,37 +94,66 @@ var notice_bar_default = defineVxeComponent({
       const defaultSlot = slots.default;
       const prefixSlot = slots.prefix;
       const suffixSlot = slots.suffix;
-      return h("div", {
-        ref: refElem,
-        class: ["vxe-notice-bar", `is--${vertical ? "vertical" : "horizontal"}`, `dir--${direction || "left"}`, {
-          [`size--${vSize}`]: vSize,
-          "is--loop": loop
-        }]
-      }, [
-        prefixSlot ? h("div", {
-          class: "vxe-notice-bar--prefix"
-        }, prefixSlot({})) : renderEmptyElement($xeNoticeBar),
-        h("div", {
-          class: "vxe-notice-bar--content"
-        }, [
-          h("div", {
-            ref: refContentElem,
-            class: "vxe-notice-bar--inner"
-          }, [
-            h("div", {
-              class: ["vxe-notice-bar--wrapper", `is--${animationStatus ? "progress" : "end"}`],
-              style: {
-                animationDuration: duration ? toCssUnit(duration, "s") : `${animationDuration}s`
-              },
-              onAnimationstart: animationStartEvent,
-              onAnimationend: animationEndEvent
-            }, defaultSlot ? defaultSlot({}) : noticeText)
-          ])
-        ]),
-        suffixSlot ? h("div", {
-          class: "vxe-notice-bar--suffix"
-        }, suffixSlot({})) : renderEmptyElement($xeNoticeBar)
-      ]);
+      return h(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-notice-bar",
+            `is--${vertical ? "vertical" : "horizontal"}`,
+            `dir--${direction || "left"}`,
+            {
+              [`size--${vSize}`]: vSize,
+              "is--loop": loop
+            }
+          ]
+        },
+        [
+          prefixSlot ? h(
+            "div",
+            {
+              class: "vxe-notice-bar--prefix"
+            },
+            prefixSlot({})
+          ) : renderEmptyElement($xeNoticeBar),
+          h(
+            "div",
+            {
+              class: "vxe-notice-bar--content"
+            },
+            [
+              h(
+                "div",
+                {
+                  ref: refContentElem,
+                  class: "vxe-notice-bar--inner"
+                },
+                [
+                  h(
+                    "div",
+                    {
+                      class: ["vxe-notice-bar--wrapper", `is--${animationStatus ? "progress" : "end"}`],
+                      style: {
+                        animationDuration: duration ? toCssUnit(duration, "s") : `${animationDuration}s`
+                      },
+                      onAnimationstart: animationStartEvent,
+                      onAnimationend: animationEndEvent
+                    },
+                    defaultSlot ? defaultSlot({}) : noticeText
+                  )
+                ]
+              )
+            ]
+          ),
+          suffixSlot ? h(
+            "div",
+            {
+              class: "vxe-notice-bar--suffix"
+            },
+            suffixSlot({})
+          ) : renderEmptyElement($xeNoticeBar)
+        ]
+      );
     };
     watch(computeTabsResizeFlag, () => {
       updateAnimationStyle();

package/es/number-input/src/number-input.js

@@ -1,12 +1,13 @@
 import { h, ref, computed, reactive, inject, nextTick, watch, onMounted, onBeforeUnmount } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { VxeUI, getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize, renderEmptyElement } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getFuncText, eqEmptyValue, isEnableConf, getText } from "../../ui/src/utils";
 import { createComponentLog } from "../../ui/src/log";
 import { hasClass, getEventTargetNode, hasControlKey, toCssUnit } from "../../ui/src/dom";
 import { getSlotVNs } from "../../ui/src/vn";
 import { handleNumber, toFloatValueFixed } from "./util";
+const { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useFns, renderEmptyElement } = VxeUI;
 const { errLog } = createComponentLog("number-input");
 var number_input_default = defineVxeComponent({
   name: "VxeNumberInput",
@@ -152,7 +153,7 @@ var number_input_default = defineVxeComponent({
     const $xeForm = inject("$xeForm", null);
     const formItemInfo = inject("xeFormItemInfo", null);
     const xID = XEUtils.uniqueId();
-    const { computeSize } = useSize(props);
+    const { computeSize } = useFns.useSize(props);
     const reactData = reactive({
       isFocus: false,
       isActivated: false,
@@ -522,7 +523,7 @@ var number_input_default = defineVxeComponent({
           handleChange(inpNumVal, `${inpValue || ""}`, { type: "check" });
           return;
         }
-        if (inputValue || (min || max)) {
+        if (inputValue || min || max) {
           let inpNumVal = type === "integer" ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue));
           if (!validMinNum(inpNumVal)) {
             inpNumVal = min;
@@ -627,20 +628,29 @@ var number_input_default = defineVxeComponent({
           const tooltipOpts = computeTooltipOpts.value;
           const { contentMethod } = tooltipOpts;
           const inputElem = refInputTarget.value;
-          const content = getText(contentMethod ? contentMethod({
-            $numberInput: $xeNumberInput,
-            type,
-            inputValue: inputElem.value,
-            value: inputValue || "",
-            label: numLabel
-          }) : numLabel);
+          const content = getText(
+            contentMethod ? contentMethod({
+              $numberInput: $xeNumberInput,
+              type,
+              inputValue: inputElem.value,
+              value: inputValue || "",
+              label: numLabel
+            }) : numLabel
+          );
           if (content) {
-            VxeUI.tooltip.open(inputElem, Object.assign({}, {
-              ...tooltipOpts,
-              content
-            }, {
-              contentMethod: void 0
-            }));
+            VxeUI.tooltip.open(
+              inputElem,
+              Object.assign(
+                {},
+                {
+                  ...tooltipOpts,
+                  content
+                },
+                {
+                  contentMethod: void 0
+                }
+              )
+            );
           } else {
             VxeUI.tooltip.close();
           }
@@ -669,7 +679,7 @@ var number_input_default = defineVxeComponent({
       const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
       const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
       if (!isControlKey && !isShiftKey && !isAltKey) {
-        if (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || !negative && key === "-" || type === "integer" && key === "." || (!exponential || keyCode !== 69) && (keyCode >= 65 && keyCode <= 90) || keyCode >= 186 && keyCode <= 188 || keyCode >= 191) {
+        if (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || !negative && key === "-" || type === "integer" && key === "." || (!exponential || keyCode !== 69) && keyCode >= 65 && keyCode <= 90 || keyCode >= 186 && keyCode <= 188 || keyCode >= 191) {
           evnt.preventDefault();
         }
       }
@@ -852,21 +862,33 @@ var number_input_default = defineVxeComponent({
       const prefixSlot = slots.prefix;
       const preIcon = prefixIcon || prefixOpts.icon;
       const sufContent = prefixOpts.content;
-      return prefixSlot || preIcon || sufContent ? h("div", {
-        class: "vxe-number-input--prefix",
-        onClick: clickPrefixEvent
-      }, [
-        h("div", {
-          class: "vxe-number-input--prefix-icon"
-        }, prefixSlot ? getSlotVNs(prefixSlot({})) : [
-          preIcon ? h("i", {
-            class: preIcon
-          }) : renderEmptyElement($xeNumberInput),
-          sufContent ? h("span", {
-            class: "vxe-prefix-input--suffix-text"
-          }, `${sufContent}`) : renderEmptyElement($xeNumberInput)
-        ])
-      ]) : renderEmptyElement($xeNumberInput);
+      return prefixSlot || preIcon || sufContent ? h(
+        "div",
+        {
+          class: "vxe-number-input--prefix",
+          onClick: clickPrefixEvent
+        },
+        [
+          h(
+            "div",
+            {
+              class: "vxe-number-input--prefix-icon"
+            },
+            prefixSlot ? getSlotVNs(prefixSlot({})) : [
+              preIcon ? h("i", {
+                class: preIcon
+              }) : renderEmptyElement($xeNumberInput),
+              sufContent ? h(
+                "span",
+                {
+                  class: "vxe-prefix-input--suffix-text"
+                },
+                `${sufContent}`
+              ) : renderEmptyElement($xeNumberInput)
+            ]
+          )
+        ]
+      ) : renderEmptyElement($xeNumberInput);
     };
     const renderSuffixIcon = () => {
       const { suffixIcon } = props;
@@ -877,31 +899,50 @@ var number_input_default = defineVxeComponent({
       const isClearable = computeIsClearable.value;
       const sufIcon = suffixIcon || suffixOpts.icon;
       const sufContent = suffixOpts.content;
-      return h("div", {
-        class: ["vxe-number-input--suffix", {
-          "is--clear": isClearable && !isDisabled && !(inputValue === "" || XEUtils.eqNull(inputValue))
-        }]
-      }, [
-        isClearable ? h("div", {
-          class: "vxe-number-input--clear-icon",
-          onClick: clearValueEvent
-        }, [
-          h("i", {
-            class: getIcon().INPUT_CLEAR
-          })
-        ]) : renderEmptyElement($xeNumberInput),
-        suffixSlot || sufIcon || sufContent ? h("div", {
-          class: "vxe-number-input--suffix-icon",
-          onClick: clickSuffixEvent
-        }, suffixSlot ? getSlotVNs(suffixSlot({})) : [
-          sufIcon ? h("i", {
-            class: sufIcon
-          }) : renderEmptyElement($xeNumberInput),
-          sufContent ? h("span", {
-            class: "vxe-number-input--suffix-text"
-          }, `${sufContent}`) : renderEmptyElement($xeNumberInput)
-        ]) : renderEmptyElement($xeNumberInput)
-      ]);
+      return h(
+        "div",
+        {
+          class: [
+            "vxe-number-input--suffix",
+            {
+              "is--clear": isClearable && !isDisabled && !(inputValue === "" || XEUtils.eqNull(inputValue))
+            }
+          ]
+        },
+        [
+          isClearable ? h(
+            "div",
+            {
+              class: "vxe-number-input--clear-icon",
+              onClick: clearValueEvent
+            },
+            [
+              h("i", {
+                class: getIcon().INPUT_CLEAR
+              })
+            ]
+          ) : renderEmptyElement($xeNumberInput),
+          suffixSlot || sufIcon || sufContent ? h(
+            "div",
+            {
+              class: "vxe-number-input--suffix-icon",
+              onClick: clickSuffixEvent
+            },
+            suffixSlot ? getSlotVNs(suffixSlot({})) : [
+              sufIcon ? h("i", {
+                class: sufIcon
+              }) : renderEmptyElement($xeNumberInput),
+              sufContent ? h(
+                "span",
+                {
+                  class: "vxe-number-input--suffix-text"
+                },
+                `${sufContent}`
+              ) : renderEmptyElement($xeNumberInput)
+            ]
+          ) : renderEmptyElement($xeNumberInput)
+        ]
+      );
     };
     const renderInput = () => {
       const { type, name, autocomplete, autoComplete } = props;
@@ -912,92 +953,119 @@ var number_input_default = defineVxeComponent({
       const inpMaxLength = computeInpMaxLength.value;
       const inpPlaceholder = computeInpPlaceholder.value;
       const inpClassName = computeInpClassNamevalue.value;
-      return h("div", {
-        key: "ni",
-        class: "vxe-number-input--input-wrapper"
-      }, [
-        renderPrefixIcon(),
-        h("div", {
-          class: "vxe-number-input--input-inner"
-        }, [
-          h("input", {
-            ref: refInputTarget,
-            class: inpClassName,
-            name,
-            type: "text",
-            value: !isFocus && type === "amount" ? numLabel : inputValue,
-            placeholder: inpPlaceholder,
-            maxlength: inpMaxLength,
-            readonly: inputReadonly,
-            disabled: isDisabled,
-            autocomplete: autoComplete || autocomplete,
-            onKeydown: keydownEvent,
-            onKeyup: keyupEvent,
-            onClick: clickEvent,
-            onInput: inputEvent,
-            onChange: changeEvent,
-            onFocus: focusEvent,
-            onBlur: blurEvent
-          }),
-          renderFloat()
-        ]),
-        renderSuffixIcon()
-      ]);
+      return h(
+        "div",
+        {
+          key: "ni",
+          class: "vxe-number-input--input-wrapper"
+        },
+        [
+          renderPrefixIcon(),
+          h(
+            "div",
+            {
+              class: "vxe-number-input--input-inner"
+            },
+            [
+              h("input", {
+                ref: refInputTarget,
+                class: inpClassName,
+                name,
+                type: "text",
+                value: !isFocus && type === "amount" ? numLabel : inputValue,
+                placeholder: inpPlaceholder,
+                maxlength: inpMaxLength,
+                readonly: inputReadonly,
+                disabled: isDisabled,
+                autocomplete: autoComplete || autocomplete,
+                onKeydown: keydownEvent,
+                onKeyup: keyupEvent,
+                onClick: clickEvent,
+                onInput: inputEvent,
+                onChange: changeEvent,
+                onFocus: focusEvent,
+                onBlur: blurEvent
+              }),
+              renderFloat()
+            ]
+          ),
+          renderSuffixIcon()
+        ]
+      );
     };
     const renderMinusBtn = () => {
       const { minusIcon } = props;
       const isDisabledSubtractNumber = computeIsDisabledSubtractNumber.value;
-      return h("button", {
-        key: "prev",
-        class: ["vxe-number-input--minus-btn is--minus", {
-          "is--disabled": isDisabledSubtractNumber
-        }],
-        type: "button",
-        onClick: numberClickEvent,
-        onMousedown: numberMousedownEvent,
-        onMouseup: numberStopAll,
-        onMouseleave: numberStopAll
-      }, [
-        h("i", {
-          class: minusIcon || getIcon().NUMBER_INPUT_MINUS_NUM
-        })
-      ]);
+      return h(
+        "button",
+        {
+          key: "prev",
+          class: [
+            "vxe-number-input--minus-btn is--minus",
+            {
+              "is--disabled": isDisabledSubtractNumber
+            }
+          ],
+          type: "button",
+          onClick: numberClickEvent,
+          onMousedown: numberMousedownEvent,
+          onMouseup: numberStopAll,
+          onMouseleave: numberStopAll
+        },
+        [
+          h("i", {
+            class: minusIcon || getIcon().NUMBER_INPUT_MINUS_NUM
+          })
+        ]
+      );
     };
     const renderPlusBtn = () => {
       const { plusIcon } = props;
       const isDisabledAddNumber = computeIsDisabledAddNumber.value;
-      return h("button", {
-        key: "next",
-        class: ["vxe-number-input--plus-btn is--plus", {
-          "is--disabled": isDisabledAddNumber
-        }],
-        type: "button",
-        onClick: numberClickEvent,
-        onMousedown: numberMousedownEvent,
-        onMouseup: numberStopAll,
-        onMouseleave: numberStopAll
-      }, [
-        h("i", {
-          class: plusIcon || getIcon().NUMBER_INPUT_PLUS_NUM
-        })
-      ]);
+      return h(
+        "button",
+        {
+          key: "next",
+          class: [
+            "vxe-number-input--plus-btn is--plus",
+            {
+              "is--disabled": isDisabledAddNumber
+            }
+          ],
+          type: "button",
+          onClick: numberClickEvent,
+          onMousedown: numberMousedownEvent,
+          onMouseup: numberStopAll,
+          onMouseleave: numberStopAll
+        },
+        [
+          h("i", {
+            class: plusIcon || getIcon().NUMBER_INPUT_PLUS_NUM
+          })
+        ]
+      );
     };
     const renderSideControl = () => {
-      return h("div", {
-        key: "cplr",
-        class: "vxe-number-input--side-control"
-      }, [
-        renderPlusBtn(),
-        renderMinusBtn()
-      ]);
+      return h(
+        "div",
+        {
+          key: "cplr",
+          class: "vxe-number-input--side-control"
+        },
+        [renderPlusBtn(), renderMinusBtn()]
+      );
     };
     const renderFloat = () => {
       const { floatContent } = props;
       const floatSlot = slots.float;
       if (floatContent || floatSlot) {
-        return h("span", {
-          class: "vxe-number-input--float-wrapper"
-        }, floatSlot ? floatSlot({}) : getText(floatContent));
+        return h(
+          "span",
+          {
+            class: "vxe-number-input--float-wrapper"
+          },
+          floatSlot ? floatSlot({}) : getText(floatContent)
+        );
       }
       return renderEmptyElement($xeNumberInput);
     };
@@ -1013,58 +1081,67 @@ var number_input_default = defineVxeComponent({
       const prefixSlot = slots.prefix;
       const suffixSlot = slots.suffix;
       if (formReadonly) {
-        return h("div", {
-          ref: refElem,
-          class: ["vxe-number-input--readonly", `type--${type}`, className]
-        }, numLabel);
+        return h(
+          "div",
+          {
+            ref: refElem,
+            class: ["vxe-number-input--readonly", `type--${type}`, className]
+          },
+          numLabel
+        );
       }
       const currStyle = computeCurrStyle.value;
       const inputReadonly = computeInputReadonly.value;
       const isClearable = computeIsClearable.value;
       const isControls = isEnableConf(controlOpts) && (controls === false ? controls : showButton);
-      return h("div", {
-        ref: refElem,
-        class: ["vxe-number-input", `type--${type}`, isControls ? `ctl--${layout === "right" || layout === "left" ? layout : "default"}` : "", floatContent ? `fla--${floatAlign || "center"}` : "", className, {
-          [`size--${vSize}`]: vSize,
-          [`is--${align}`]: align,
-          "is--controls": isControls && !inputReadonly,
-          "is--prefix": !!prefixSlot || prefixIcon,
-          "is--suffix": !!suffixSlot || suffixIcon,
-          "is--disabled": isDisabled,
-          "is--active": isActivated,
-          "show--clear": isClearable && !isDisabled && !(inputValue === "" || XEUtils.eqNull(inputValue))
-        }],
-        style: currStyle,
-        spellcheck: false,
-        onMouseenter: mouseenterEvent,
-        onMouseleave: mouseleaveEvent
-      }, isControls ? layout === "right" ? [
-        renderInput(),
-        renderSideControl()
-      ] : layout === "left" ? [
-        renderSideControl(),
-        renderInput()
-      ] : [
-        renderMinusBtn(),
-        renderInput(),
-        renderPlusBtn()
-      ] : [
-        renderInput()
-      ]);
+      return h(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-number-input",
+            `type--${type}`,
+            isControls ? `ctl--${layout === "right" || layout === "left" ? layout : "default"}` : "",
+            floatContent ? `fla--${floatAlign || "center"}` : "",
+            className,
+            {
+              [`size--${vSize}`]: vSize,
+              [`is--${align}`]: align,
+              "is--controls": isControls && !inputReadonly,
+              "is--prefix": !!prefixSlot || prefixIcon,
+              "is--suffix": !!suffixSlot || suffixIcon,
+              "is--disabled": isDisabled,
+              "is--active": isActivated,
+              "show--clear": isClearable && !isDisabled && !(inputValue === "" || XEUtils.eqNull(inputValue))
+            }
+          ],
+          style: currStyle,
+          spellcheck: false,
+          onMouseenter: mouseenterEvent,
+          onMouseleave: mouseleaveEvent
+        },
+        isControls ? layout === "right" ? [renderInput(), renderSideControl()] : layout === "left" ? [renderSideControl(), renderInput()] : [renderMinusBtn(), renderInput(), renderPlusBtn()] : [renderInput()]
+      );
     };
     $xeNumberInput.renderVN = renderVN;
-    watch(() => props.modelValue, (val) => {
-      if (!internalData.isUM) {
-        updateModel(val);
+    watch(
+      () => props.modelValue,
+      (val) => {
+        if (!internalData.isUM) {
+          updateModel(val);
+        }
+        internalData.isUM = false;
       }
-      internalData.isUM = false;
-    });
-    watch(() => props.type, () => {
-      Object.assign(reactData, {
-        inputValue: props.modelValue
-      });
-      initValue();
-    });
+    );
+    watch(
+      () => props.type,
+      () => {
+        Object.assign(reactData, {
+          inputValue: props.modelValue
+        });
+        initValue();
+      }
+    );
     onMounted(() => {
       if (props.showTooltip) {
         if (!VxeUI.tooltip) {