vxe-pc-ui 4.20.24 → 4.20.26

package/es/form/src/render.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { getIcon, getI18n, formats, renderer, renderEmptyElement } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { eqEmptyValue, getFuncText, isEnableConf } from "../../ui/src/utils";
 import { toCssUnit } from "../../ui/src/dom";
 import { getSlotVNs } from "../../ui/src/vn";
@@ -7,25 +7,34 @@ import { isActiveItem } from "./util";
 import VxeTooltipComponent from "../../tooltip";
 import VxeIconComponent from "../../icon";
 import XEUtils from "xe-utils";
+const { getIcon, getI18n, formats, renderer, renderEmptyElement } = VxeUI;
 function renderPrefixIcon(titlePrefix) {
-  return h("span", {
-    class: "vxe-form--item-title-tip-prefix"
-  }, [
-    h(VxeIconComponent, {
-      class: titlePrefix.icon || getIcon().FORM_PREFIX,
-      status: titlePrefix.iconStatus
-    })
-  ]);
+  return h(
+    "span",
+    {
+      class: "vxe-form--item-title-tip-prefix"
+    },
+    [
+      h(VxeIconComponent, {
+        class: titlePrefix.icon || getIcon().FORM_PREFIX,
+        status: titlePrefix.iconStatus
+      })
+    ]
+  );
 }
 function renderSuffixIcon(titleSuffix) {
-  return h("span", {
-    class: "vxe-form--item-title-tip-suffix"
-  }, [
-    h(VxeIconComponent, {
-      class: titleSuffix.icon || getIcon().FORM_SUFFIX,
-      status: titleSuffix.iconStatus
-    })
-  ]);
+  return h(
+    "span",
+    {
+      class: "vxe-form--item-title-tip-suffix"
+    },
+    [
+      h(VxeIconComponent, {
+        class: titleSuffix.icon || getIcon().FORM_SUFFIX,
+        status: titleSuffix.iconStatus
+      })
+    ]
+  );
 }
 function getItemClass($xeForm, item, isGroup) {
   const formProps = $xeForm.props;
@@ -133,50 +142,70 @@ function renderTitle($xeForm, item, isGroup) {
   const titVNs = [];
   if (prefixSlot) {
     titVNs.push(
-      h("span", {
-        key: "pt",
-        class: "vxe-form--item-title-prefix"
-      }, $xeForm.callSlot(prefixSlot, params))
+      h(
+        "span",
+        {
+          key: "pt",
+          class: "vxe-form--item-title-prefix"
+        },
+        $xeForm.callSlot(prefixSlot, params)
+      )
     );
   }
   if (titlePrefix) {
     titVNs.push(
-      titlePrefix.content || titlePrefix.message ? h(VxeTooltipComponent, {
-        key: "pm",
-        ...tooltipOpts,
-        ...titlePrefix,
-        content: getFuncText(titlePrefix.content || titlePrefix.message)
-      }, {
-        default: () => renderPrefixIcon(titlePrefix)
-      }) : renderPrefixIcon(titlePrefix)
+      titlePrefix.content || titlePrefix.message ? h(
+        VxeTooltipComponent,
+        {
+          key: "pm",
+          ...tooltipOpts,
+          ...titlePrefix,
+          content: getFuncText(titlePrefix.content || titlePrefix.message)
+        },
+        {
+          default: () => renderPrefixIcon(titlePrefix)
+        }
+      ) : renderPrefixIcon(titlePrefix)
     );
   }
   const rftTitle = compConf ? compConf.renderFormItemTitle || compConf.renderItemTitle : null;
   titVNs.push(
-    h("span", {
-      key: "pl",
-      class: "vxe-form--item-title-label"
-    }, titleSlot ? $xeForm.callSlot(titleSlot, params) : rftTitle ? getSlotVNs(rftTitle(itemRender, params)) : getFuncText(item.title))
+    h(
+      "span",
+      {
+        key: "pl",
+        class: "vxe-form--item-title-label"
+      },
+      titleSlot ? $xeForm.callSlot(titleSlot, params) : rftTitle ? getSlotVNs(rftTitle(itemRender, params)) : getFuncText(item.title)
+    )
   );
   const fixVNs = [];
   if (titleSuffix) {
     fixVNs.push(
-      titleSuffix.content || titleSuffix.message ? h(VxeTooltipComponent, {
-        key: "sm",
-        ...tooltipOpts,
-        ...titleSuffix,
-        content: getFuncText(titleSuffix.content || titleSuffix.message)
-      }, {
-        default: () => renderSuffixIcon(titleSuffix)
-      }) : renderSuffixIcon(titleSuffix)
+      titleSuffix.content || titleSuffix.message ? h(
+        VxeTooltipComponent,
+        {
+          key: "sm",
+          ...tooltipOpts,
+          ...titleSuffix,
+          content: getFuncText(titleSuffix.content || titleSuffix.message)
+        },
+        {
+          default: () => renderSuffixIcon(titleSuffix)
+        }
+      ) : renderSuffixIcon(titleSuffix)
     );
   }
   if (suffixSlot) {
     fixVNs.push(
-      h("span", {
-        key: "st",
-        class: "vxe-form--item-title-suffix"
-      }, $xeForm.callSlot(suffixSlot, params))
+      h(
+        "span",
+        {
+          key: "st",
+          class: "vxe-form--item-title-suffix"
+        },
+        $xeForm.callSlot(suffixSlot, params)
+      )
     );
   }
   const ons = ovTooltip ? {
@@ -185,35 +214,43 @@ function renderTitle($xeForm, item, isGroup) {
     },
     onMouseleave: $xeForm.handleTitleTipLeaveEvent
   } : {};
-  const itStyle = Object.assign(
-    {},
-    XEUtils.isFunction(itemTitleStyle) ? itemTitleStyle(params) : itemTitleStyle,
-    XEUtils.isFunction(titleStyle) ? titleStyle(params) : titleStyle
-  );
+  const itStyle = Object.assign({}, XEUtils.isFunction(itemTitleStyle) ? itemTitleStyle(params) : itemTitleStyle, XEUtils.isFunction(titleStyle) ? titleStyle(params) : titleStyle);
   if (titleWidth && titleWidth !== "auto" && showContent !== false) {
     itStyle.width = toCssUnit(titleWidth);
   }
-  return isTitle ? h("div", {
-    class: [
-      isGroup || hasGroup ? "vxe-form--group-title" : "",
-      "vxe-form--item-title",
-      titleAlign ? `align--${titleAlign}` : "",
-      hasEllipsis ? "is--ellipsis" : "",
-      itemTitleClassName ? XEUtils.isFunction(itemTitleClassName) ? itemTitleClassName(params) : itemTitleClassName : "",
-      titleClassName ? XEUtils.isFunction(titleClassName) ? titleClassName(params) : titleClassName : ""
-    ],
-    style: itStyle,
-    itemid: item.id,
-    title: ovTitle ? getFuncText(title) : null,
-    ...ons
-  }, [
-    h("div", {
-      class: "vxe-form--item-title-content"
-    }, titVNs),
-    h("div", {
-      class: "vxe-form--item-title-postfix"
-    }, fixVNs)
-  ]) : renderEmptyElement($xeForm);
+  return isTitle ? h(
+    "div",
+    {
+      class: [
+        isGroup || hasGroup ? "vxe-form--group-title" : "",
+        "vxe-form--item-title",
+        titleAlign ? `align--${titleAlign}` : "",
+        hasEllipsis ? "is--ellipsis" : "",
+        itemTitleClassName ? XEUtils.isFunction(itemTitleClassName) ? itemTitleClassName(params) : itemTitleClassName : "",
+        titleClassName ? XEUtils.isFunction(titleClassName) ? titleClassName(params) : titleClassName : ""
+      ],
+      style: itStyle,
+      itemid: item.id,
+      title: ovTitle ? getFuncText(title) : null,
+      ...ons
+    },
+    [
+      h(
+        "div",
+        {
+          class: "vxe-form--item-title-content"
+        },
+        titVNs
+      ),
+      h(
+        "div",
+        {
+          class: "vxe-form--item-title-postfix"
+        },
+        fixVNs
+      )
+    ]
+  ) : renderEmptyElement($xeForm);
 }
 function renderItemErrorIcon($xeForm, item) {
   const { computeValidOpts } = $xeForm.getComputeMaps();
@@ -223,31 +260,50 @@ function renderItemErrorIcon($xeForm, item) {
   if (!showErrorIcon) {
     return renderEmptyElement($xeForm);
   }
-  return h("div", {
-    key: "emi",
-    class: ["vxe-form-item--valid-error-icon-wrapper", {
-      "is--show": showIconMsg,
-      "is--hide": !showIconMsg
-    }]
-  }, [
-    h("span", {
-      class: "vxe-form-item--valid-error-icon-btn",
-      onClick(evnt) {
-        $xeForm.handleValidIconEvent(evnt, { item });
-      }
-    }, [
-      h("i", {
-        class: errorIcon || getIcon().FORM_VALID_ERROR_ICON
-      })
-    ]),
-    h("div", {
-      class: "vxe-form-item--valid-error-icon-msg-tip"
-    }, errRule ? [
-      h("div", {
-        class: `vxe-form-item--valid-error-icon-msg vxe-form-item--valid-error-icon-theme-${validOpts.theme || "normal"}`
-      }, errRule.content || errRule.message)
-    ] : [])
-  ]);
+  return h(
+    "div",
+    {
+      key: "emi",
+      class: [
+        "vxe-form-item--valid-error-icon-wrapper",
+        {
+          "is--show": showIconMsg,
+          "is--hide": !showIconMsg
+        }
+      ]
+    },
+    [
+      h(
+        "span",
+        {
+          class: "vxe-form-item--valid-error-icon-btn",
+          onClick(evnt) {
+            $xeForm.handleValidIconEvent(evnt, { item });
+          }
+        },
+        [
+          h("i", {
+            class: errorIcon || getIcon().FORM_VALID_ERROR_ICON
+          })
+        ]
+      ),
+      h(
+        "div",
+        {
+          class: "vxe-form-item--valid-error-icon-msg-tip"
+        },
+        errRule ? [
+          h(
+            "div",
+            {
+              class: `vxe-form-item--valid-error-icon-msg vxe-form-item--valid-error-icon-theme-${validOpts.theme || "normal"}`
+            },
+            errRule.content || errRule.message
+          )
+        ] : []
+      )
+    ]
+  );
 }
 function renderItemContent($xeForm, item) {
   const formProps = $xeForm.props;
@@ -312,44 +368,68 @@ function renderItemContent($xeForm, item) {
   }
   if (collapseNode) {
     contentVNs.push(
-      h("div", {
-        class: "vxe-form--item-trigger-node",
-        onClick: $xeForm.toggleCollapseEvent
-      }, [
-        h("span", {
-          class: "vxe-form--item-trigger-text"
-        }, collapseAll ? collapseOpts.unfoldButtonText || getI18n("vxe.form.unfolding") : collapseOpts.foldButtonText || getI18n("vxe.form.folding")),
-        h("i", {
-          class: ["vxe-form--item-trigger-icon", collapseAll ? collapseOpts.foldIcon || getIcon().FORM_FOLDING : collapseOpts.unfoldIcon || getIcon().FORM_UNFOLDING]
-        })
-      ])
+      h(
+        "div",
+        {
+          class: "vxe-form--item-trigger-node",
+          onClick: $xeForm.toggleCollapseEvent
+        },
+        [
+          h(
+            "span",
+            {
+              class: "vxe-form--item-trigger-text"
+            },
+            collapseAll ? collapseOpts.unfoldButtonText || getI18n("vxe.form.unfolding") : collapseOpts.foldButtonText || getI18n("vxe.form.folding")
+          ),
+          h("i", {
+            class: ["vxe-form--item-trigger-icon", collapseAll ? collapseOpts.foldIcon || getIcon().FORM_FOLDING : collapseOpts.unfoldIcon || getIcon().FORM_UNFOLDING]
+          })
+        ]
+      )
     );
   }
   if (errRule && (XEUtils.isBoolean(showErrorMessage) ? showErrorMessage : showMessage)) {
     const validParams = { ...params, rule: errRule };
     contentVNs.push(
-      h("div", {
-        class: "vxe-form-item--valid-error-tip",
-        style: errRule.maxWidth ? {
-          width: toCssUnit(errRule.maxWidth)
-        } : null
-      }, [
-        h("div", {
-          class: `vxe-form-item--valid-error-wrapper vxe-form-item--valid-error-theme-${validOpts.theme || "normal"}`
-        }, [
-          validSlot ? $xeForm.callSlot(validSlot, validParams) : [
-            h("span", {
-              class: "vxe-form--item--valid-error-msg"
-            }, errRule.content || errRule.message)
-          ]
-        ])
-      ])
+      h(
+        "div",
+        {
+          class: "vxe-form-item--valid-error-tip",
+          style: errRule.maxWidth ? {
+            width: toCssUnit(errRule.maxWidth)
+          } : null
+        },
+        [
+          h(
+            "div",
+            {
+              class: `vxe-form-item--valid-error-wrapper vxe-form-item--valid-error-theme-${validOpts.theme || "normal"}`
+            },
+            [
+              validSlot ? $xeForm.callSlot(validSlot, validParams) : [
+                h(
+                  "span",
+                  {
+                    class: "vxe-form--item--valid-error-msg"
+                  },
+                  errRule.content || errRule.message
+                )
+              ]
+            ]
+          )
+        ]
+      )
     );
   }
-  return h("div", {
-    key: "ct",
-    class: "vxe-form--item-inner"
-  }, contentVNs);
+  return h(
+    "div",
+    {
+      key: "ct",
+      class: "vxe-form--item-inner"
+    },
+    contentVNs
+  );
 }
 export {
   getItemClass,

package/es/form/src/util.js

@@ -1,8 +1,9 @@
 import { watch } from "vue";
-import { renderer } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import XEUtils from "xe-utils";
 import { ItemInfo } from "./itemInfo";
 import { isEnableConf } from "../../ui/src/utils";
+const { renderer } = VxeUI;
 function isFormItem(item) {
   return item instanceof ItemInfo;
 }
@@ -41,9 +42,12 @@ function isActiveItem($xeForm, formItem) {
 }
 function watchItem(props, formItem) {
   Object.keys(props).forEach((name) => {
-    watch(() => props[name], (value) => {
-      formItem.update(name, value);
-    });
+    watch(
+      () => props[name],
+      (value) => {
+        formItem.update(name, value);
+      }
+    );
   });
 }
 function assembleItem($xeForm, el, formItem, formGroup) {

package/es/icon/src/icon.js

@@ -1,7 +1,8 @@
 import { h } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
-import { getConfig, createEvent, useSize } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import XEUtils from "xe-utils";
+const { getConfig, createEvent, useFns } = VxeUI;
 var icon_default = defineVxeComponent({
   name: "VxeIcon",
   props: {
@@ -14,13 +15,11 @@ var icon_default = defineVxeComponent({
       default: () => getConfig().icon.size || getConfig().size
     }
   },
-  emits: [
-    "click"
-  ],
+  emits: ["click"],
   setup(props, context) {
     const { emit } = context;
     const xID = XEUtils.uniqueId();
-    const { computeSize } = useSize(props);
+    const { computeSize } = useFns.useSize(props);
     const $xeIcon = {
       xID,
       props,
@@ -41,11 +40,16 @@ var icon_default = defineVxeComponent({
       const { name, roll, status, className } = props;
       const vSize = computeSize.value;
       return h("i", {
-        class: ["vxe-icon", `vxe-icon-${name}`, `${className || ""}`, {
-          [`size--${vSize}`]: vSize,
-          [`theme--${status}`]: status,
-          roll
-        }],
+        class: [
+          "vxe-icon",
+          `vxe-icon-${name}`,
+          `${className || ""}`,
+          {
+            [`size--${vSize}`]: vSize,
+            [`theme--${status}`]: status,
+            roll
+          }
+        ],
         onClick: clickEvent
       });
     };