@qin-ui/antd-vue-pro 1.1.11 → 1.1.13

package/README.md

@@ -226,8 +226,8 @@ ant-design-vue ui组件库form组件的二次封装
     appendField: AppendField;
     /** 在指定字段数据路径的字段配置前插入新的字段配置 */
     prependField: PrependField;
-    /** 获取指定字段数据路径的字段所在分组字段的配置 */
-    getParentField: GetParentField;
+    /** 获取指定字段数据路径的字段所在字段分组 */
+    getParentFields: GetParentFields;
   };
   
   /**

package/es/form/{index-2a04ad4a.js → index-c1a5e7f6.js}

@@ -1,4 +1,4 @@
-import { inject, ref, h as h$1, getCurrentInstance, nextTick, reactive, defineComponent, createVNode, shallowRef, watch, unref, provide, watchEffect, onBeforeUnmount, computed, isRef, Fragment, Comment, Text, isVNode, onMounted, cloneVNode, Transition, withDirectives, resolveDirective, onUpdated, onUnmounted, toRef, withModifiers, vShow, onBeforeMount, Teleport, TransitionGroup, toRaw, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, renderList, resolveDynamicComponent, normalizeProps, createSlots, createTextVNode, createCommentVNode, useAttrs, renderSlot, toDisplayString, shallowReactive } from "vue";
+import { inject, ref, h as h$1, getCurrentInstance, nextTick, reactive, defineComponent, createVNode, shallowRef, watch, unref, provide, watchEffect, onBeforeUnmount, computed, isRef, Fragment, Comment, Text, isVNode, onMounted, cloneVNode, Transition, withDirectives, resolveDirective, onUpdated, onUnmounted, toRef, withModifiers, vShow, onBeforeMount, Teleport, TransitionGroup, toRaw, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, renderList, resolveDynamicComponent, createSlots, createTextVNode, createCommentVNode, useAttrs, normalizeProps, renderSlot, toDisplayString, shallowReactive } from "vue";
 import { Input, Textarea, InputSearch, InputPassword, InputNumber, Select, Cascader, DatePicker as DatePicker$1, RangePicker, TimePicker as TimePicker$1, CheckboxGroup, RadioGroup, Switch, Slider, TreeSelect, Transfer, Row as Row$1, Col as Col$1, FormItem as FormItem$1, message, Form as Form$2 } from "ant-design-vue";
 import { INIT_PROPS_MAP, useInjectProps, INJECT_KEYS } from "../component-provider/index.js";
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
@@ -15744,15 +15744,15 @@ const UPDATE_ACTIVE_PATH = Symbol(
   "setActivePath"
 );
 const RULE_TYPE_MAP = /* @__PURE__ */ new Map([
-  ["value", "字段赋值"],
-  ["hidden", "字段隐藏/显示"],
-  ["disabled", "字段禁用/启用"],
-  ["options", "字段选项枚举变更"],
-  ["validateRule", "字段校验规则变更"],
-  ["fieldMergeOverrides", "字段配置变更"],
-  ["validate", "字段触发校验"],
-  ["clearValidate", "字段触发清除校验"],
-  ["message", "字段触发提示"]
+  ["setValue", "字段赋值"],
+  ["setHidden", "字段隐藏/显示"],
+  ["setDisabled", "字段禁用/启用"],
+  ["setOptions", "字段选项枚举变更"],
+  ["setRules", "字段校验规则变更"],
+  ["setField", "字段配置变更"],
+  ["triggerValidate", "字段触发校验"],
+  ["triggerClearValidate", "字段触发清除校验"],
+  ["triggerMessage", "字段触发提示"]
 ]);
 const FunctionRegexp = /^\s*function\s*\w*\s*\([^)]*\)\s*{([\s\S]*)}/g;
 const ArrowFunctionRegexp = /^\s*(?:\([^)]*\)|\w+)\s*=>\s*\(?({[\s\S]*}|[^;]*)\)?/g;
@@ -15779,7 +15779,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       "hideFeedback"
     ];
     const props = __props;
-    useProviderDisabled(ref(props.disabled));
+    useProviderDisabled(computed(() => props.disabled));
     const updateRefs = inject(UPDATE_REFS);
     const getPath = (fieldKey) => {
       return [props.path, fieldKey].filter(Boolean).join(".");
@@ -15840,14 +15840,17 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
             return openBlock(), createElementBlock(Fragment, {
               key: getPath(field.key) || index2
             }, [
-              field && !field.hidden ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.grid ? unref(Col$1) : unref(_sfc_main$2)), normalizeProps(mergeProps({ key: 0 }, _ctx.grid ? unref(withDefaultGridItem)(field) : void 0)), {
+              field && !field.hidden ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.grid ? unref(Col$1) : unref(_sfc_main$2)), mergeProps({
+                key: 0,
+                ref_for: true
+              }, _ctx.grid ? unref(withDefaultGridItem)(field) : void 0), {
                 default: withCtx(() => [
                   createVNode(unref(_sfc_main$2), {
                     component: field.container,
                     path: getPath(field.key)
                   }, {
                     default: withCtx(() => [
-                      createVNode(unref(FormItem$1), mergeProps(withDefault(field), {
+                      createVNode(unref(FormItem$1), mergeProps({ ref_for: true }, withDefault(field), {
                         ref_for: true,
                         ref: (el) => setFormItemRef(el, field),
                         class: field.className,
@@ -15865,7 +15868,10 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                             disabled: field.disabled
                           }, null, 8, ["grid", "fields", "path", "disabled"])) : !field.component ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                             createTextVNode(' missing "component" prop ')
-                          ], 64)) : (openBlock(), createBlock(unref(BaseField), mergeProps({ key: 2 }, unref(omitFormItemProps)(field), {
+                          ], 64)) : (openBlock(), createBlock(unref(BaseField), mergeProps({
+                            key: 2,
+                            ref_for: true
+                          }, unref(omitFormItemProps)(field), {
                             label: field.label,
                             path: getPath(field.key)
                           }), null, 16, ["label", "path"]))
@@ -15876,7 +15882,10 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                           return {
                             name,
                             fn: withCtx(() => [
-                              unref(FORM_ITEM_SLOT_KEYS).includes(name) ? (openBlock(), createBlock(unref(_sfc_main$1), mergeProps({ key: 0 }, { path: getPath(field.key) }, { component: slot }), null, 16, ["component"])) : createCommentVNode("", true)
+                              unref(FORM_ITEM_SLOT_KEYS).includes(name) ? (openBlock(), createBlock(unref(_sfc_main$1), mergeProps({
+                                key: 0,
+                                ref_for: true
+                              }, { path: getPath(field.key) }, { component: slot }), null, 16, ["component"])) : createCommentVNode("", true)
                             ])
                           };
                         })
@@ -15896,86 +15905,70 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_lang = "";
-const generateFieldMap = (fields, prePath = "", preFieldPath = "", fieldMap = {}) => {
-  fields.forEach((field, index2) => {
-    let path;
-    if (prePath) {
-      path = field.key ? `${prePath}.${field.key}` : prePath;
-    } else {
-      path = field.key || "";
-    }
-    const fieldPath = `${preFieldPath || ""}[${index2}]`;
-    if (path && !fieldMap[path]) {
-      fieldMap[path] = { field, fieldPath };
-    }
-    if (field.fields) {
-      generateFieldMap(
-        field.fields,
-        path,
-        `${fieldPath}.fields`,
-        fieldMap
-      );
-    }
-  });
-  return fieldMap;
-};
 const useFields = (initFields) => {
   const fields = ref(initFields);
-  const fieldMap = computed(() => {
-    return generateFieldMap(fields.value);
-  });
-  const getField = (path) => {
-    var _a;
+  const updateField = (path, updater, fieldList = fields.value, parentPath = "", parentFieldPath = "", parsedPath = toPath(path).join(".")) => {
     if (!path)
-      return void 0;
-    return (_a = fieldMap.value[path]) == null ? void 0 : _a.field;
+      return false;
+    for (let i2 = 0; i2 < fieldList.length; i2 += 1) {
+      const field = fieldList[i2];
+      const { key = "" } = field;
+      const concatPath = `${parentPath}${parentPath && key ? "." : ""}${key}`;
+      const selfPath = toPath(concatPath).join(".");
+      if (!parsedPath.startsWith(selfPath))
+        continue;
+      const fieldPath = `${parentFieldPath}[${i2}]`;
+      if (selfPath && selfPath === parsedPath) {
+        updater({ field, fieldIndex: i2, parentFields: fieldList, fieldPath });
+        return true;
+      }
+      if (field.fields && updateField(
+        path,
+        updater,
+        field.fields,
+        selfPath,
+        `${fieldPath}.fields`,
+        parsedPath
+      )) {
+        return true;
+      }
+    }
+    return false;
   };
-  const getFieldPath = (path) => {
-    var _a;
+  const getField = (path) => {
     if (!path)
       return void 0;
-    return (_a = fieldMap.value[path]) == null ? void 0 : _a.fieldPath;
+    let res;
+    updateField(path, ({ field }) => {
+      res = field;
+    });
+    return res;
   };
   const setField = (path, field, updateType = "merge") => {
-    const fieldPath = getFieldPath(path);
-    if (!fieldPath)
-      return;
-    let value = field;
-    const preField = getField(path);
-    if (typeof field === "function") {
-      value = field(preField);
-    }
-    const newField = updateType === "rewrite" ? value : { ...preField, ...value };
-    set$1(fields.value, fieldPath, newField);
-  };
-  function findFieldIndex(path) {
-    var _a;
-    const fieldPath = getFieldPath(path);
-    if (!fieldPath)
-      return -1;
-    return +(((_a = fieldPath.split(".").at(-1)) == null ? void 0 : _a.replaceAll(/.*\[(\d+)\]/g, "$1")) || -1);
-  }
-  const getParentField = (path) => {
     if (!path)
-      return void 0;
-    const groupFieldPath = path.split(".").slice(0, -1).join(".");
-    return getField(groupFieldPath);
+      return;
+    updateField(path, ({ field: preField, fieldIndex, parentFields }) => {
+      let value = field;
+      if (typeof field === "function") {
+        value = field(preField);
+      }
+      const newField = updateType === "rewrite" ? value : { ...preField, ...value };
+      parentFields[fieldIndex] = newField;
+    });
   };
   const deleteField = (path) => {
     if (!path)
       return;
-    const fieldIndex = findFieldIndex(path);
-    const group = getParentField(path);
-    const groupFields = group ? group.fields : fields.value;
-    groupFields == null ? void 0 : groupFields.splice(fieldIndex, 1);
+    updateField(path, ({ fieldIndex, parentFields }) => {
+      parentFields.splice(fieldIndex, 1);
+    });
   };
   const addField = (path, field, placement) => {
     if (path) {
-      const fieldIndex = findFieldIndex(path);
-      const group = getParentField(path);
-      const groupFields = group ? group.fields : fields.value;
-      const index2 = placement === "after" ? fieldIndex + 1 : fieldIndex;
-      groupFields.splice(index2, 0, field);
+      updateField(path, ({ fieldIndex, parentFields }) => {
+        const index2 = placement === "after" ? fieldIndex + 1 : fieldIndex;
+        parentFields.splice(index2, 0, field);
+      });
     } else if (placement === "after") {
       fields.value.push(field);
     } else {
@@ -15988,15 +15981,33 @@ const useFields = (initFields) => {
   const prependField = (path, field) => {
     addField(path, field, "before");
   };
+  const getFieldPath = (path) => {
+    if (!path)
+      return void 0;
+    let res;
+    updateField(path, ({ fieldPath }) => {
+      res = fieldPath;
+    });
+    return res;
+  };
+  const getParentFields = (path) => {
+    if (!path)
+      return void 0;
+    let res;
+    updateField(path, ({ parentFields }) => {
+      res = parentFields;
+    });
+    return res;
+  };
   return {
     fields,
     getField,
-    getParentField,
     setField,
     deleteField,
-    getFieldPath,
     appendField,
-    prependField
+    prependField,
+    getFieldPath,
+    getParentFields
   };
 };
 const useFormData = (initFormData) => {
@@ -16191,21 +16202,21 @@ async function runRules(rules2, baseParam) {
       [`${path}`, ["gray"]]
     ]);
     switch (type4) {
-      case "value": {
+      case "setValue": {
         form.setFormData(path, value);
         nextTick(() => run(path, "onUpdateValue"));
         break;
       }
-      case "hidden":
-        form.setField(path, (preField) => ({ ...preField, hidden: value }));
+      case "setHidden":
+        form.setField(path, { hidden: value });
         break;
-      case "disabled":
-        form.setField(path, (preField) => ({ ...preField, disabled: value }));
+      case "setDisabled":
+        form.setField(path, { disabled: value });
         break;
-      case "options":
-        form.setField(path, (preField) => ({ ...preField, options: value }));
+      case "setOptions":
+        form.setField(path, { options: value });
         break;
-      case "validateRule": {
+      case "setRules": {
         const validateRule2 = [];
         for (let validateRuleIndex = 0; validateRuleIndex < value.length; validateRuleIndex += 1) {
           const validateRuleItem = value[validateRuleIndex];
@@ -16231,14 +16242,14 @@ async function runRules(rules2, baseParam) {
         form.setField(path, (preField) => ({ ...preField, rule: validateRule2 }));
         break;
       }
-      case "fieldMergeOverrides":
+      case "setField":
         form.setField(path, (preField) => ({ ...preField, ...value }));
         break;
-      case "validate":
+      case "triggerValidate":
         break;
-      case "clearValidate":
+      case "triggerClearValidate":
         break;
-      case "message":
+      case "triggerMessage":
         message2.info(value);
         break;
       default: {
@@ -16277,8 +16288,8 @@ const runCommands = async ({ path, trigger, ...baseParam }) => {
     ]);
     for (let logicIndex = 0; logicIndex < logics.length; logicIndex += 1) {
       const logic = logics[logicIndex];
-      const { conditions, rules: rules2 } = logic;
-      if (conditions.length === 0 || rules2.length === 0)
+      const { conditions, actions } = logic;
+      if (conditions.length === 0 || actions.length === 0)
         return;
       logQueue.push([
         [`逻辑${logicIndex + 1}：`, ["large", "purple"]],
@@ -16292,7 +16303,7 @@ const runCommands = async ({ path, trigger, ...baseParam }) => {
         return;
       const conditionsValid = await validateConditions(conditions, baseParam);
       if (conditionsValid) {
-        await runRules(rules2, baseParam);
+        await runRules(actions, baseParam);
       }
     }
     logQueue.push([
@@ -16430,8 +16441,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       const methods = { ...rewriteMethod("onUpdateValue") };
       switch (compType) {
         case "input":
-          Object.assign(methods, rewriteMethod("onBlur"), rewriteMethod("onFocus"));
-          break;
         case "input-number":
           Object.assign(methods, rewriteMethod("onBlur"), rewriteMethod("onFocus"));
           break;
@@ -16453,12 +16462,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         return;
       updateRefs == null ? void 0 : updateRefs("fieldRefs", props.path, el);
     };
-    onMounted(() => {
-      var _a, _b, _c;
-      if (attrs.autoCommand && ((_b = (_a = attrs.autoCommand) == null ? void 0 : _a.onInit) == null ? void 0 : _b.length) > 0) {
-        (_c = command == null ? void 0 : command.value) == null ? void 0 : _c.run(props.path, "onInit");
-      }
-    });
     function handleFocus(...args) {
       var _a;
       updateActivePath == null ? void 0 : updateActivePath(props.path);
@@ -16497,7 +16500,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const index_vue_vue_type_style_index_0_scoped_9a3bf1a0_lang = "";
+const index_vue_vue_type_style_index_0_scoped_f87938bb_lang = "";
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
   for (const [key, val] of props) {
@@ -16505,7 +16508,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-9a3bf1a0"]]);
+const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-f87938bb"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{
     name: "ContainerFragment",
@@ -16607,10 +16610,7 @@ 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({ refs: exposed.refs, form: props.form }) : null;
     });
     const formInstanceRef = ref(null);
     onMounted(() => {

package/es/form/index.js

@@ -1,4 +1,4 @@
-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-2a04ad4a.js";
+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-c1a5e7f6.js";
 import "vue";
 import "ant-design-vue";
 import "../component-provider/index.js";