@qin-ui/antd-vue-pro 1.1.17 → 1.1.19

package/es/form/{index-7ee4d75c.js → index-e6fc6e90.js}

@@ -15191,7 +15191,7 @@ function getPropByPath(obj, path, strict) {
     isValid: tempObj && keyArr[i2] in tempObj
   };
 }
-function useForm$1(modelRef) {
+function useForm$2(modelRef) {
   let rulesRef = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : ref({});
   let options = arguments.length > 2 ? arguments[2] : void 0;
   const initialModel = cloneDeep(unref(modelRef));
@@ -15463,7 +15463,7 @@ const Form = defineComponent({
     colon: true
   }),
   Item: FormItem,
-  useForm: useForm$1,
+  useForm: useForm$2,
   // emits: ['finishFailed', 'submit', 'finish', 'validate'],
   setup(props, _ref) {
     let {
@@ -15752,8 +15752,6 @@ const FORM_DATA = Symbol("formData");
 const UPDATE_FORM_DATA = Symbol(
   "updateFormData"
 );
-const UPDATE_REFS = Symbol("updateRefs");
-const GET_REF = Symbol("getRef");
 const COMMAND = Symbol("command");
 const UPDATE_ACTIVE_PATH = Symbol(
   "setActivePath"
@@ -15795,16 +15793,26 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     ];
     const props = __props;
     useProviderDisabled(computed(() => props.disabled));
-    const updateRefs = inject(UPDATE_REFS);
     const getPath = (field) => {
       const path = (field == null ? void 0 : field.name) ?? [props.path, field == null ? void 0 : field.key].filter(Boolean);
       return toPath(path).join(".");
     };
+    const formItemRefs = ref();
     const setFormItemRef = (el, field) => {
+      var _a;
       if (!el)
         return;
-      const path = getPath(field);
-      updateRefs == null ? void 0 : updateRefs("formItemRefs", path, el);
+      if (((_a = field.getFormItemRef) == null ? void 0 : _a.call(field)) === el)
+        return;
+      Object.assign(field, { getFormItemRef: () => el });
+    };
+    const setComponentRef = (el, field) => {
+      var _a;
+      if (!el)
+        return;
+      if (((_a = field.getComponentRef) == null ? void 0 : _a.call(field)) === el)
+        return;
+      Object.assign(field, { getComponentRef: () => el });
     };
     const proFormPropKeys = computed(() => {
       return [
@@ -15869,12 +15877,17 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                     default: withCtx(() => [
                       createVNode(unref(FormItem$1), mergeProps({ ref_for: true }, withDefault(field), {
                         ref_for: true,
-                        ref: (el) => setFormItemRef(el, field),
+                        ref_key: "formItemRefs",
+                        ref: formItemRefs,
                         class: field.className,
                         style: field.style,
                         "hide-feedback": field.hideFeedback,
                         name: unref(toPath)(getPath(field)),
-                        path: getPath(field)
+                        path: getPath(field),
+                        onVnodeMounted: () => {
+                          var _a;
+                          return setFormItemRef((_a = formItemRefs.value) == null ? void 0 : _a[index2], field);
+                        }
                       }), createSlots({
                         default: withCtx(() => [
                           field.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
@@ -15890,8 +15903,17 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                             ref_for: true
                           }, unref(omitFormItemProps)(field), {
                             label: field.label,
-                            path: getPath(field)
-                          }), null, 16, ["label", "path"]))
+                            path: getPath(field),
+                            onSetComponentRef: (el) => setComponentRef(el, field),
+                            onFieldChange: () => {
+                              var _a;
+                              return (_a = formItemRefs.value) == null ? void 0 : _a[index2].onFieldChange();
+                            },
+                            onFieldBlur: () => {
+                              var _a;
+                              return (_a = formItemRefs.value) == null ? void 0 : _a[index2].onFieldBlur();
+                            }
+                          }), null, 16, ["label", "path", "onSetComponentRef", "onFieldChange", "onFieldBlur"]))
                         ]),
                         _: 2
                       }, [
@@ -15908,7 +15930,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                             ])
                           };
                         })
-                      ]), 1040, ["class", "style", "hide-feedback", "name", "path"])
+                      ]), 1040, ["class", "style", "hide-feedback", "name", "path", "onVnodeMounted"])
                     ]),
                     _: 2
                   }, 1032, ["component", "path"])
@@ -16047,6 +16069,7 @@ const useFields = (initFields) => {
     getParentFields
   };
 };
+const useFields$1 = useFields;
 const useFormData = (initFormData) => {
   const formData = ref(initFormData);
   const activePath = ref();
@@ -16082,6 +16105,7 @@ const useFormData = (initFormData) => {
   };
   return { formData, getFormData, setFormData, activePath, setActivePath };
 };
+const useFormData$1 = useFormData;
 const useFormRef = () => {
   const formRef = ref();
   const setFormRef = (val) => {
@@ -16089,13 +16113,15 @@ const useFormRef = () => {
   };
   return { formRef, setFormRef };
 };
+const useFormRef$1 = useFormRef;
 const useForm = (initFormData = {}, initFields = []) => {
   return {
-    ...useFormData(initFormData),
-    ...useFields(initFields),
-    ...useFormRef()
+    ...useFormData$1(initFormData),
+    ...useFields$1(initFields),
+    ...useFormRef$1()
   };
 };
+const useForm$1 = useForm;
 const isFunctionString = (param) => {
   FunctionRegexp.lastIndex = 0;
   ArrowFunctionRegexp.lastIndex = 0;
@@ -16212,7 +16238,7 @@ async function validateConditions(conditions, baseParam) {
   return result;
 }
 async function runRules(rules2, baseParam) {
-  const { form, run, refs, message: message2, logQueue } = baseParam;
+  const { form, run, message: message2, logQueue } = baseParam;
   logQueue.push([[`逻辑执行规则： `, ["purple", "indent2"]]]);
   for (let ruleIndex = 0; ruleIndex < rules2.length; ruleIndex += 1) {
     const rule = rules2[ruleIndex];
@@ -16351,7 +16377,7 @@ const runCommands = async ({ path, trigger, ...baseParam }) => {
     ]);
   }
 };
-const useCommand = ({ refs, form }) => {
+const useCommand = (form) => {
   let message$1;
   try {
     message$1 = message;
@@ -16365,7 +16391,6 @@ const useCommand = ({ refs, form }) => {
       path,
       trigger,
       form,
-      refs,
       message: message$1,
       run,
       logQueue
@@ -16384,6 +16409,7 @@ const useCommand = ({ refs, form }) => {
   };
   return { run };
 };
+const useCommand$1 = useCommand;
 const useInitProps = () => {
   const initPropsMap = /* @__PURE__ */ new Map();
   INIT_PROPS_MAP.forEach((val, key) => {
@@ -16400,6 +16426,7 @@ const useInitProps = () => {
   };
   return { getInitProps };
 };
+const useInitProps$1 = useInitProps;
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   ...{
     name: "BaseField"
@@ -16410,20 +16437,23 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     path: { default: "" },
     label: { default: "" }
   },
-  setup(__props) {
+  emits: ["setComponentRef", "fieldChange", "fieldBlur"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const formData = inject(FORM_DATA);
     const updateFormData = inject(UPDATE_FORM_DATA);
-    const updateRefs = inject(UPDATE_REFS);
-    const getRef = inject(GET_REF);
     const command = inject(COMMAND);
     const updateActivePath = inject(UPDATE_ACTIVE_PATH);
-    const { getInitProps } = useInitProps();
-    const triggerRefChange = () => {
+    const { getInitProps } = useInitProps$1();
+    const componentRef = ref();
+    const componentMounted = () => {
+      emit("setComponentRef", componentRef.value);
+    };
+    const triggerFormItemChange = () => {
       if (typeof props.component === "string" && COMPONENT_MAP.has(props.component))
         return;
-      const formItemRef = getRef == null ? void 0 : getRef("formItemRefs", props.path);
-      formItemRef == null ? void 0 : formItemRef.onFieldChange();
+      emit("fieldChange");
     };
     const value = computed({
       get() {
@@ -16436,7 +16466,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           return;
         }
         updateFormData == null ? void 0 : updateFormData(props.path, val);
-        triggerRefChange();
+        triggerFormItemChange();
       }
     });
     const forceUpdateKey = ref(0);
@@ -16497,11 +16527,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     const is = computed(() => {
       return COMPONENT_MAP.get(props.component) ?? props.component;
     });
-    const setComponentRef = (el) => {
-      if (!el)
-        return;
-      updateRefs == null ? void 0 : updateRefs("fieldRefs", props.path, el);
-    };
     function handleFocus(...args) {
       var _a;
       updateActivePath == null ? void 0 : updateActivePath(props.path);
@@ -16514,12 +16539,14 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: forceUpdateKey.value }, unref(omit$1)(mergedAttrs.value, "componentContainer"), {
-            ref: setComponentRef,
+            ref_key: "componentRef",
+            ref: componentRef,
             [modelName.value]: value.value,
             ["onUpdate:" + modelName.value]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
             class: [unref(attrs).componentClassName, "field-component"],
             style: unref(attrs).componentStyle,
             path: _ctx.path,
+            onVnodeMounted: componentMounted,
             onFocus: handleFocus
           }), createSlots({ _: 2 }, [
             renderList(unref(attrs).slots, (slot, name) => {
@@ -16540,7 +16567,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const index_vue_vue_type_style_index_0_scoped_5475a3b8_lang = "";
+const index_vue_vue_type_style_index_0_scoped_aebf904c_lang = "";
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
   for (const [key, val] of props) {
@@ -16548,7 +16575,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-5475a3b8"]]);
+const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-aebf904c"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{
     name: "ContainerFragment",
@@ -16605,19 +16632,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const injectProps = useInjectProps(INJECT_KEYS["pro-form"]);
     const injectAttrs = omit$1(injectProps, Object.keys(props));
     const emit = __emit;
-    const refs = {
-      formItemRefs: {},
-      fieldRefs: {}
-    };
-    const updateRefs = (type4, path, childRef) => {
-      if (!path)
-        return;
-      refs[type4][path] = childRef;
-    };
-    const getRef = (type4, path) => {
-      return refs[type4][path];
-    };
-    const exposed = shallowReactive({ refs, getRef });
     const updateActivePath = (path) => {
       var _a, _b;
       if (props.form) {
@@ -16650,8 +16664,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       updateActivePath(path);
     };
     const command = computed(() => {
-      return props.form && !props.autoCommandDisabled ? useCommand({ refs: exposed.refs, form: props.form }) : null;
+      return props.form && !props.autoCommandDisabled ? useCommand$1(props.form) : null;
     });
+    const exposed = shallowReactive({});
     const formInstanceRef = ref(null);
     onMounted(() => {
       var _a;
@@ -16664,8 +16679,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     provide(FORM_DATA, _formData);
     provide(UPDATE_FORM_DATA, updateFormData);
-    provide(UPDATE_REFS, updateRefs);
-    provide(GET_REF, getRef);
     provide(COMMAND, command);
     provide(UPDATE_ACTIVE_PATH, updateActivePath);
     __expose(exposed);
@@ -16693,7 +16706,6 @@ export {
   BaseField as B,
   COMPONENT_MAP as C,
   FORM_ITEM_SLOT_KEYS as F,
-  GET_REF as G,
   RULE_TYPE_MAP as R,
   UPDATE_FORM_DATA as U,
   _sfc_main as _,
@@ -16704,18 +16716,17 @@ export {
   _sfc_main$1 as e,
   FORM_DATA as f,
   get$1 as g,
-  UPDATE_REFS as h,
-  COMMAND as i,
-  UPDATE_ACTIVE_PATH as j,
-  FunctionRegexp as k,
-  ArrowFunctionRegexp as l,
-  isFunctionString as m,
-  jsonStringifyReplacer as n,
+  COMMAND as h,
+  UPDATE_ACTIVE_PATH as i,
+  FunctionRegexp as j,
+  ArrowFunctionRegexp as k,
+  isFunctionString as l,
+  jsonStringifyReplacer as m,
+  jsonParseReviver as n,
   omit$1 as o,
-  jsonParseReviver as p,
-  useFields as q,
-  useFormData as r,
-  useCommand as s,
-  useInitProps as t,
-  useForm as u
+  useFields$1 as p,
+  useFormData$1 as q,
+  useCommand$1 as r,
+  useInitProps$1 as s,
+  useForm$1 as u
 };

package/es/form/index.js

@@ -1,30 +1,28 @@
-import { l, B, d, i, C, b, f, F, k, G, R, e, j, U, h, _, m, p, n, s, q, u, r, t } from "./index-7ee4d75c.js";
+import { k, B, d, h, C, b, f, F, j, R, e, i, U, _, l, n, m, r, p, u, q, s } from "./index-e6fc6e90.js";
 import "vue";
 import "ant-design-vue";
 import "../component-provider/index.js";
 export {
-  l as ArrowFunctionRegexp,
+  k as ArrowFunctionRegexp,
   B as BaseField,
   d as BaseFormItem,
-  i as COMMAND,
+  h as COMMAND,
   C as COMPONENT_MAP,
   b as ContainerFragment,
   f as FORM_DATA,
   F as FORM_ITEM_SLOT_KEYS,
-  k as FunctionRegexp,
-  G as GET_REF,
+  j as FunctionRegexp,
   R as RULE_TYPE_MAP,
   e as SlotComponent,
-  j as UPDATE_ACTIVE_PATH,
+  i as UPDATE_ACTIVE_PATH,
   U as UPDATE_FORM_DATA,
-  h as UPDATE_REFS,
   _ as default,
-  m as isFunctionString,
-  p as jsonParseReviver,
-  n as jsonStringifyReplacer,
-  s as useCommand,
-  q as useFields,
+  l as isFunctionString,
+  n as jsonParseReviver,
+  m as jsonStringifyReplacer,
+  r as useCommand,
+  p as useFields,
   u as useForm,
-  r as useFormData,
-  t as useInitProps
+  q as useFormData,
+  s as useInitProps
 };