vxe-pc-ui 4.20.25 → 4.20.26

package/es/form/src/form.js

@@ -1,7 +1,7 @@
 import { h, ref, provide, computed, inject, reactive, watch, nextTick, onMounted, onUnmounted } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { eqEmptyValue, getFuncText, isEnableConf } from "../../ui/src/utils";
 import { scrollToView } from "../../ui/src/dom";
 import { createItem, handleFieldOrItem, isHiddenItem, isActiveItem } from "./util";
@@ -232,14 +232,7 @@ var form_default = defineVxeComponent({
     },
     params: Object
   },
-  emits: [
-    "update:collapseStatus",
-    "collapse",
-    "toggle-collapse",
-    "submit",
-    "submit-invalid",
-    "reset"
-  ],
+  emits: ["update:collapseStatus", "collapse", "toggle-collapse", "submit", "submit-invalid", "reset"],
   setup(props, context) {
     const { slots, emit } = context;
     const $xeGrid = inject("$xeGrid", null);
@@ -262,18 +255,22 @@ var form_default = defineVxeComponent({
       const { titleWidth: allTitleWidth, vertical: allVertical } = props;
       const { formItems } = reactData;
       const itemList = [];
-      XEUtils.eachTree(formItems, (item) => {
-        const { titleWidth, vertical } = item;
-        if (titleWidth === "auto") {
-          itemList.push(item);
-        } else {
-          const itemVertical = XEUtils.eqNull(vertical) ? allVertical : vertical;
-          const itemTitleWidth = itemVertical ? null : XEUtils.eqNull(titleWidth) ? allTitleWidth : titleWidth;
-          if (itemTitleWidth === "auto" && (!item.children || !item.children.length)) {
+      XEUtils.eachTree(
+        formItems,
+        (item) => {
+          const { titleWidth, vertical } = item;
+          if (titleWidth === "auto") {
             itemList.push(item);
+          } else {
+            const itemVertical = XEUtils.eqNull(vertical) ? allVertical : vertical;
+            const itemTitleWidth = itemVertical ? null : XEUtils.eqNull(titleWidth) ? allTitleWidth : titleWidth;
+            if (itemTitleWidth === "auto" && (!item.children || !item.children.length)) {
+              itemList.push(item);
+            }
           }
-        }
-      }, { children: "children" });
+        },
+        { children: "children" }
+      );
       return itemList;
     });
     const refMaps = {
@@ -417,17 +414,21 @@ var form_default = defineVxeComponent({
       const itemIdData = {};
       const itemFieldData = {};
       const itemList = [];
-      XEUtils.eachTree(formItems, (item, index, items) => {
-        const { id, field } = item;
-        const itemRest = { item, items, index };
-        if (id) {
-          itemIdData[id] = itemRest;
-        }
-        if (field) {
-          itemFieldData[field] = itemRest;
-        }
-        itemList.push(item);
-      }, { children: "children" });
+      XEUtils.eachTree(
+        formItems,
+        (item, index, items) => {
+          const { id, field } = item;
+          const itemRest = { item, items, index };
+          if (id) {
+            itemIdData[id] = itemRest;
+          }
+          if (field) {
+            itemFieldData[field] = itemRest;
+          }
+          itemList.push(item);
+        },
+        { children: "children" }
+      );
       internalData.fullItemList = itemList;
       internalData.fullItemFieldData = itemFieldData;
       internalData.fullItemIdData = itemIdData;
@@ -838,88 +839,131 @@ var form_default = defineVxeComponent({
       const vSize = computeSize.value;
       const tooltipOpts = computeTooltipOpts.value;
       const defaultSlot = slots.default;
-      return h("form", {
-        ref: refElem,
-        class: ["vxe-form", className ? XEUtils.isFunction(className) ? className({ items: formItems, data, $form: $xeForm }) : className : "", {
-          [`size--${vSize}`]: vSize,
-          "is--border": border,
-          "custom--layout": customLayout,
-          "is--loading": loading
-        }],
-        onSubmit: submitEvent,
-        onReset: resetEvent
-      }, [
-        h("div", {
-          class: "vxe-form--wrapper vxe-form--item-row"
-        }, customLayout ? defaultSlot ? defaultSlot({}) : [] : formItems.map((item, index) => {
-          return h(VxeFormConfigItem, {
-            key: index,
-            itemConfig: item,
-            visible: item.visible
-          });
-        })),
-        h("div", {
-          class: "vxe-form-slots"
-        }, customLayout ? [] : defaultSlot ? defaultSlot({}) : []),
-        /**
-         * 加载中
-         */
-        h(VxeLoadingComponent, {
-          class: "vxe-form--loading",
-          modelValue: loading
-        }),
-        /**
-         * 工具提示
-         */
-        h(VxeTooltipComponent, {
-          ref: refTooltip,
-          ...tooltipOpts
-        })
-      ]);
+      return h(
+        "form",
+        {
+          ref: refElem,
+          class: [
+            "vxe-form",
+            className ? XEUtils.isFunction(className) ? className({ items: formItems, data, $form: $xeForm }) : className : "",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--border": border,
+              "custom--layout": customLayout,
+              "is--loading": loading
+            }
+          ],
+          onSubmit: submitEvent,
+          onReset: resetEvent
+        },
+        [
+          h(
+            "div",
+            {
+              class: "vxe-form--wrapper vxe-form--item-row"
+            },
+            customLayout ? defaultSlot ? defaultSlot({}) : [] : formItems.map((item, index) => {
+              return h(VxeFormConfigItem, {
+                key: index,
+                itemConfig: item,
+                visible: item.visible
+              });
+            })
+          ),
+          h(
+            "div",
+            {
+              class: "vxe-form-slots"
+            },
+            customLayout ? [] : defaultSlot ? defaultSlot({}) : []
+          ),
+          /**
+           * 加载中
+           */
+          h(VxeLoadingComponent, {
+            class: "vxe-form--loading",
+            modelValue: loading
+          }),
+          /**
+           * 工具提示
+           */
+          h(VxeTooltipComponent, {
+            ref: refTooltip,
+            ...tooltipOpts
+          })
+        ]
+      );
     };
     const recalcFlag = ref(0);
-    watch(() => props.vertical, () => {
-      recalcFlag.value++;
-    });
-    watch(() => props.titleWidth, () => {
-      recalcFlag.value++;
-    });
+    watch(
+      () => props.vertical,
+      () => {
+        recalcFlag.value++;
+      }
+    );
+    watch(
+      () => props.titleWidth,
+      () => {
+        recalcFlag.value++;
+      }
+    );
     watch(recalcFlag, () => {
       nextTick().then(() => {
         recalculate();
       });
     });
     const staticItemFlag = ref(0);
-    watch(() => reactData.staticItems.length, () => {
-      staticItemFlag.value++;
-    });
-    watch(() => reactData.staticItems, () => {
-      staticItemFlag.value++;
-    });
+    watch(
+      () => reactData.staticItems.length,
+      () => {
+        staticItemFlag.value++;
+      }
+    );
+    watch(
+      () => reactData.staticItems,
+      () => {
+        staticItemFlag.value++;
+      }
+    );
     watch(staticItemFlag, () => {
       reactData.formItems = reactData.staticItems;
       recalcFlag.value++;
       cacheItem();
     });
     const itemFlag = ref(0);
-    watch(() => props.items ? props.items.length : -1, () => {
-      itemFlag.value++;
-    });
-    watch(() => props.items, () => {
-      itemFlag.value++;
-    });
+    watch(
+      () => props.items ? props.items.length : -1,
+      () => {
+        itemFlag.value++;
+      }
+    );
+    watch(
+      () => props.items,
+      () => {
+        itemFlag.value++;
+      }
+    );
     watch(itemFlag, () => {
       loadItems(props.items || []);
     });
-    watch(() => props.collapseStatus, (value) => {
-      reactData.collapseAll = !!value;
-    });
-    watch(() => props.readonly, () => {
-      clearValidate();
-    });
-    watch(() => props.disabled, () => {
-      clearValidate();
-    });
+    watch(
+      () => props.collapseStatus,
+      (value) => {
+        reactData.collapseAll = !!value;
+      }
+    );
+    watch(
+      () => props.readonly,
+      () => {
+        clearValidate();
+      }
+    );
+    watch(
+      () => props.disabled,
+      () => {
+        clearValidate();
+      }
+    );
     onMounted(() => {
       nextTick(() => {
         if (props.customLayout && props.items) {

package/es/form/src/itemInfo.js

@@ -1,6 +1,7 @@
-import { formats } from "../../ui";
 import XEUtils from "xe-utils";
+import { VxeUI } from "@vxe-ui/core";
 import { createComponentLog } from "../../ui/src/log";
+const { formats } = VxeUI;
 const { errLog } = createComponentLog("form");
 class ItemInfo {
   constructor($xeForm, item) {