knt-shared 1.2.2 → 1.2.4

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { getCurrentInstance, inject, defineComponent, computed, createElementBlock, openBlock, normalizeStyle, normalizeClass, createElementVNode, ref, unref, watch, onMounted, nextTick, resolveComponent, createVNode, mergeProps, createSlots, withCtx, renderSlot, createBlock, createCommentVNode, toDisplayString, createTextVNode, reactive, onBeforeUnmount, normalizeProps, guardReactiveProps, Fragment, renderList, resolveDynamicComponent, withDirectives, vShow, withModifiers, h, onUnmounted } from "vue";
+import { getCurrentInstance, inject, defineComponent, computed, createElementBlock, openBlock, normalizeStyle, normalizeClass, createElementVNode, useCssVars, ref, unref, watch, onMounted, nextTick, resolveComponent, createVNode, mergeProps, createSlots, withCtx, renderSlot, createBlock, createCommentVNode, toDisplayString, createTextVNode, reactive, onBeforeUnmount, normalizeProps, guardReactiveProps, Fragment, renderList, resolveDynamicComponent, withDirectives, vShow, withModifiers, h, onUnmounted } from "vue";
 import { Message, Transfer, Mention, Upload, Rate, Slider, Switch, RangePicker, TimePicker, DatePicker, TreeSelect, Cascader, CheckboxGroup, Checkbox, RadioGroup, Radio, Select, AutoComplete, Textarea, InputPassword, InputNumber, Input } from "@arco-design/web-vue";
 const configProviderInjectionKey = Symbol("ArcoConfigProvider");
 const CLASS_PREFIX = "arco";
@@ -708,6 +708,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   },
   emits: ["register", "update:modelValue", "change", "success", "handleSuccess", "error", "handlError", "progress", "remove", "preview", "exceed"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    useCssVars((_ctx) => ({
+      "v439946ba": cardSizeValue.value
+    }));
     const props = __props;
     const emit = __emit;
     const uploadRef = ref();
@@ -727,6 +730,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       }
       return false;
     });
+    const cardSizeValue = computed(() => {
+      return `${getProps.value.cardSize || 80}px`;
+    });
     const getBindValue = computed(() => {
       const propsData = unref(getProps);
       return {
@@ -1118,8 +1124,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                   key: 0,
                   class: "upload-card-button",
                   style: normalizeStyle({
-                    width: `${getProps.value.cardSize || 80}px`,
-                    height: `${getProps.value.cardSize || 80}px`
+                    width: cardSizeValue.value,
+                    height: cardSizeValue.value
                   })
                 }, [
                   createVNode(unref(IconPlus), { size: 16 }),
@@ -1175,7 +1181,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BasicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-1a5a7ff7"]]);
+const BasicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-c83c45f0"]]);
 const componentMap = {
   Input,
   InputNumber,
@@ -1236,6 +1242,15 @@ function getPlaceholder(component, label) {
   }
   return "";
 }
+function getRules(component, label) {
+  if (componentsNeedPlaceholder.has(component)) {
+    return [{ required: true, message: `请输入${label}` }];
+  }
+  if (componentsNeedSelectPlaceholder.has(component)) {
+    return [{ required: true, message: `请选择${label}` }];
+  }
+  return [];
+}
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   ...{
     name: "BasicForm",
@@ -1338,12 +1353,17 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       if (schema.disabled !== void 0) {
         disabled = typeof schema.disabled === "boolean" ? schema.disabled : schema.disabled(formModel);
       }
+      let rules = schema.rules;
+      if (schema.required && (!rules || rules.length === 0)) {
+        const componentType = typeof schema.component === "string" ? schema.component : "";
+        rules = getRules(componentType, schema.label);
+      }
       return {
         field: schema.field,
         label: schema.label,
         labelColProps: schema.labelColProps || propsData.labelColProps,
         wrapperColProps: schema.wrapperColProps || propsData.wrapperColProps,
-        rules: schema.rules,
+        rules,
         disabled,
         help: schema.help,
         extra: schema.extra,
@@ -1619,6 +1639,8 @@ function useForm(options = {}) {
   const formModel = reactive({});
   const loadedRef = ref(false);
   const propsRef = ref({});
+  const pendingValues = ref(null);
+  let unwatchFormRef = null;
   const initFormModel = () => {
     var _a, _b;
     const schemas = unref(((_b = (_a = formRef.value) == null ? void 0 : _a.getSchema) == null ? void 0 : _b.call(_a)) || options.schemas || []);
@@ -1630,12 +1652,37 @@ function useForm(options = {}) {
   };
   const register = async (formInstance) => {
     await nextTick();
+    if (unwatchFormRef) {
+      unwatchFormRef();
+      unwatchFormRef = null;
+    }
     formRef.value = formInstance;
     loadedRef.value = true;
     if (options && Object.keys(options).length > 0) {
       await setProps(options);
     }
     initFormModel();
+    if (formInstance.formRef) {
+      unwatchFormRef = watch(
+        () => formInstance.formRef.value,
+        (val) => {
+          if (val === null) {
+            formRef.value = null;
+            loadedRef.value = false;
+            if (unwatchFormRef) {
+              unwatchFormRef();
+              unwatchFormRef = null;
+            }
+          }
+        },
+        { flush: "sync" }
+        // 同步执行，确保及时清理
+      );
+    }
+    if (pendingValues.value) {
+      await setFieldsValue(pendingValues.value);
+      pendingValues.value = null;
+    }
   };
   const getForm = () => {
     const form = unref(formRef);
@@ -1647,7 +1694,15 @@ function useForm(options = {}) {
     return form;
   };
   const getFormSafe = () => {
-    return unref(formRef);
+    var _a;
+    const form = unref(formRef);
+    if (!form) return null;
+    if (((_a = form.formRef) == null ? void 0 : _a.value) === null) {
+      formRef.value = null;
+      loadedRef.value = false;
+      return null;
+    }
+    return form;
   };
   const getFieldsValue = () => {
     const form = getFormSafe();
@@ -1659,7 +1714,10 @@ function useForm(options = {}) {
   };
   const setFieldsValue = async (values) => {
     const form = getFormSafe();
-    if (!form) return;
+    if (!form) {
+      pendingValues.value = { ...pendingValues.value, ...values };
+      return;
+    }
     if (form.setFieldsValue) {
       await form.setFieldsValue(values);
     } else {
@@ -3341,7 +3399,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     footer: { type: Boolean, default: true },
     titleAlign: { default: "center" },
     height: {},
-    minHeight: { default: 60 },
+    minHeight: { default: 46 },
     useWrapper: { type: Boolean, default: true },
     wrapperFooterOffset: { default: 0 },
     canFullscreen: { type: Boolean, default: false },
@@ -3419,10 +3477,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const spinStyle = computed(() => {
       const propsData = unref(getProps);
       const style = {
-        minHeight: propsData.minHeight ? typeof propsData.minHeight === "number" ? `${propsData.minHeight}px` : propsData.minHeight : "200px",
-        pointerEvents: "none"
-        // 禁用所有交互
+        minHeight: propsData.minHeight ? typeof propsData.minHeight === "number" ? `${propsData.minHeight}px` : propsData.minHeight : "46px"
       };
+      if (propsData.loading) {
+        style.pointerEvents = "none";
+      }
       return style;
     });
     const getCancelButtonProps = computed(() => {
@@ -3570,10 +3629,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         onCancel: handleCancel
       }), createSlots({
         default: withCtx(() => [
-          getProps.value.loading ? (openBlock(), createBlock(_component_a_spin, {
-            key: 0,
+          createVNode(_component_a_spin, {
+            loading: getProps.value.loading,
             tip: getProps.value.loadingTip,
-            loading: true,
             style: normalizeStyle(spinStyle.value),
             class: "w-full"
           }, {
@@ -3587,15 +3645,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               ], 4)) : renderSlot(_ctx.$slots, "default", { key: 1 }, void 0, true)
             ]),
             _: 3
-          }, 8, ["tip", "style"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-            getProps.value.useWrapper ? (openBlock(), createElementBlock("div", {
-              key: 0,
-              style: normalizeStyle(wrapperStyle.value),
-              class: "modal-wrapper"
-            }, [
-              renderSlot(_ctx.$slots, "default", {}, void 0, true)
-            ], 4)) : renderSlot(_ctx.$slots, "default", { key: 1 }, void 0, true)
-          ], 64))
+          }, 8, ["loading", "tip", "style"])
         ]),
         _: 2
       }, [
@@ -3709,7 +3759,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicModal = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4117f967"]]);
+const BasicModal = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-860bd3ac"]]);
 function useModal(props) {
   const modalRef = ref(null);
   const loadedRef = ref(false);
@@ -3731,9 +3781,7 @@ function useModal(props) {
   const openModal = (visible = true, data) => {
     const modal = getModal();
     if (!modal) return;
-    if (data !== void 0) {
-      modal.setModalProps({ _data: data });
-    }
+    modal.setModalProps({ _data: data });
     if (visible) {
       modal.openModal();
     } else {
@@ -3744,6 +3792,9 @@ function useModal(props) {
     const modal = getModal();
     if (!modal) return;
     modal.closeModal();
+    setTimeout(() => {
+      modal.setModalProps({ _data: void 0 });
+    });
   };
   const setModalProps = (modalProps) => {
     const modal = getModal();