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

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

@@ -1,4 +1,4 @@
-import { inject, ref, h as h$1, getCurrentInstance, nextTick, reactive, defineComponent, createVNode, shallowRef, watch, unref, provide, watchEffect, onBeforeUnmount, computed, triggerRef, 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 { inject, ref, h as h$1, getCurrentInstance, nextTick, reactive, defineComponent, createVNode, shallowRef, watch, unref, provide, watchEffect, onBeforeUnmount, computed, triggerRef, 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, createSlots, createTextVNode, createCommentVNode, shallowReadonly, useAttrs, resolveDynamicComponent, 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;
@@ -15796,13 +15796,14 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const props = __props;
     useProviderDisabled(computed(() => props.disabled));
     const updateRefs = inject(UPDATE_REFS);
-    const getPath = (fieldKey) => {
-      return [props.path, fieldKey].filter(Boolean).join(".");
+    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 setFormItemRef = (el, field) => {
       if (!el)
         return;
-      const path = getPath(field.key);
+      const path = getPath(field);
       updateRefs == null ? void 0 : updateRefs("formItemRefs", path, el);
     };
     const proFormPropKeys = computed(() => {
@@ -15853,16 +15854,17 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.fields, (field, index2) => {
             return openBlock(), createElementBlock(Fragment, {
-              key: getPath(field.key) || index2
+              key: getPath(field) || index2
             }, [
-              field && !field.hidden ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.grid ? unref(Col$1) : unref(_sfc_main$2)), mergeProps({
+              field && !field.hidden ? (openBlock(), createBlock(unref(_sfc_main$2), mergeProps({
                 key: 0,
+                component: _ctx.grid ? unref(Col$1) : void 0,
                 ref_for: true
-              }, _ctx.grid ? unref(withDefaultGridItem)(field) : void 0), {
+              }, unref(withDefaultGridItem)(field)), {
                 default: withCtx(() => [
                   createVNode(unref(_sfc_main$2), {
                     component: field.container,
-                    path: getPath(field.key)
+                    path: getPath(field)
                   }, {
                     default: withCtx(() => [
                       createVNode(unref(FormItem$1), mergeProps({ ref_for: true }, withDefault(field), {
@@ -15871,15 +15873,15 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                         class: field.className,
                         style: field.style,
                         "hide-feedback": field.hideFeedback,
-                        name: _ctx.path ? unref(toPath)(getPath(field.key)) : getPath(field.key),
-                        path: getPath(field.key)
+                        name: unref(toPath)(getPath(field)),
+                        path: getPath(field)
                       }), createSlots({
                         default: withCtx(() => [
                           field.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
                             key: 0,
                             grid: field.grid ?? _ctx.grid,
                             fields: field.fields,
-                            path: getPath(field.key),
+                            path: getPath(field),
                             disabled: field.disabled
                           }, null, 8, ["grid", "fields", "path", "disabled"])) : !field.component ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                             createTextVNode(' missing "component" prop ')
@@ -15888,7 +15890,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                             ref_for: true
                           }, unref(omitFormItemProps)(field), {
                             label: field.label,
-                            path: getPath(field.key)
+                            path: getPath(field)
                           }), null, 16, ["label", "path"]))
                         ]),
                         _: 2
@@ -15896,11 +15898,13 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                         renderList(field.slots, (slot, name) => {
                           return {
                             name,
-                            fn: withCtx(() => [
+                            fn: withCtx((scoped) => [
                               unref(FORM_ITEM_SLOT_KEYS).includes(name) ? (openBlock(), createBlock(unref(_sfc_main$1), mergeProps({
                                 key: 0,
+                                path: getPath(field),
+                                component: slot,
                                 ref_for: true
-                              }, { path: getPath(field.key) }, { component: slot }), null, 16, ["component"])) : createCommentVNode("", true)
+                              }, scoped), null, 16, ["path", "component"])) : createCommentVNode("", true)
                             ])
                           };
                         })
@@ -15910,7 +15914,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                   }, 1032, ["component", "path"])
                 ]),
                 _: 2
-              }, 1040)) : createCommentVNode("", true)
+              }, 1040, ["component"])) : createCommentVNode("", true)
             ], 64);
           }), 128))
         ]),
@@ -15922,30 +15926,35 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
 const index_vue_vue_type_style_index_0_lang = "";
 const useFields = (initFields) => {
   const fields = ref(initFields);
-  const updateField = (path, updater, fieldList = fields.value, parentPath = "", parentFieldPath = "", parsedPath = toPath(path).join(".")) => {
+  const updateField = (path, updater, options, fieldList = fields.value, parentPath = "", parentFieldPath = "", parsedPath = typeof path === "function" ? "" : toPath(path).join(".")) => {
     if (!path)
       return false;
+    const { all = false } = options || {};
     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) {
+      let found = false;
+      let selfPath = "";
+      if (typeof path === "function") {
+        found = path(shallowReadonly(field));
+      } else {
+        const { name, key = "" } = field;
+        const concatPath = name ?? `${parentPath}${parentPath && key ? "." : ""}${key}`;
+        selfPath = toPath(concatPath).join(".");
+        found = !!selfPath && selfPath === parsedPath;
+      }
+      if (found) {
         updater({ field, fieldIndex: i2, parentFields: fieldList, fieldPath });
-        return true;
+        if (!all)
+          return true;
       }
-      if (field.fields && updateField(
-        path,
-        updater,
-        field.fields,
-        selfPath,
-        `${fieldPath}.fields`,
-        parsedPath
-      )) {
-        return true;
+      if (parsedPath.includes(".") && !parsedPath.startsWith(selfPath)) {
+        if (!all)
+          continue;
+      }
+      if (field.fields && updateField(path, updater, options, field.fields, selfPath, `${fieldPath}.fields`, parsedPath)) {
+        if (!all)
+          return true;
       }
     }
     return false;
@@ -15959,26 +15968,39 @@ const useFields = (initFields) => {
     });
     return res;
   };
-  const setField = (path, field, updateType = "merge") => {
-    if (!path)
+  const setField = (path, field, options) => {
+    if (!path || !field)
       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 { updateType = "merge", ...rest } = options || {};
+    updateField(
+      path,
+      ({ field: preField, fieldIndex, parentFields }) => {
+        let value = field;
+        if (typeof field === "function") {
+          value = field(preField);
+        }
+        if (!value)
+          return;
+        const newField = updateType === "rewrite" ? value : { ...preField, ...value };
+        parentFields[fieldIndex] = newField;
+      },
+      rest
+    );
   };
-  const deleteField = (path) => {
+  const deleteField = (path, options) => {
     if (!path)
       return;
-    updateField(path, ({ fieldIndex, parentFields }) => {
-      parentFields.splice(fieldIndex, 1);
-    });
+    updateField(
+      path,
+      ({ fieldIndex, parentFields }) => {
+        parentFields.splice(fieldIndex, 1);
+      },
+      options
+    );
   };
   const addField = (path, field, placement) => {
+    if (!field)
+      return;
     if (path) {
       updateField(path, ({ fieldIndex, parentFields }) => {
         const index2 = placement === "after" ? fieldIndex + 1 : fieldIndex;

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-46e84b2b.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-7ee4d75c.js";
 import "vue";
 import "ant-design-vue";
 import "../component-provider/index.js";

package/es/index.d.ts

@@ -408,7 +408,7 @@ export declare type Condition = {
     disabled?: boolean;
 };
 
-export declare type ContainerComponent = Component<DefaultProps>;
+export declare type ContainerComponent = Component<DefaultProps> | null;
 
 export declare const ContainerFragment: __VLS_WithTemplateSlots_2<DefineComponent<ExtractPropTypes<__VLS_TypePropsToRuntimeProps_4<Props_4>>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<__VLS_TypePropsToRuntimeProps_4<Props_4>>> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>, {
     default?(_: {}): any;
@@ -1136,7 +1136,7 @@ declare type DefaultProps = {
     [key: string]: any;
 };
 
-export declare type DeleteField<D extends FormData_2 = FormData_2> = (path?: Path<D>) => void;
+export declare type DeleteField<D extends FormData_2 = FormData_2> = (path: Path<D>, options?: UpdateFieldOptions) => void;
 
 /**
  * @type {string} Expression - 表达式字符串 需要是一个js表达式字符串或者一个函数字符串，表达式的执行结果或者函数的返回值将作为结果返回
@@ -1248,6 +1248,8 @@ export declare type FieldType = {
     } & Record<string, any>;
 };
 
+export declare type FindBy<D extends FormData_2 = FormData_2> = (field: Readonly<Field<D>>) => boolean;
+
 declare type FlattenKeys<T, P extends string = ''> = T extends FormData_2 ? {
     [K in keyof KnownKeys<T>]: K extends string ? KnownKeys<T>[K] extends any[] ? `${P}${K}` | K : `${P}${K}` | K | FlattenKeys<T[K], `${P}${K}.`> extends infer U ? U extends `${infer V}.` ? V : U : never : never;
 }[keyof KnownKeys<T>] : P;
@@ -1274,13 +1276,13 @@ export declare const FunctionRegexp: RegExp;
 
 export declare const GET_REF: InjectionKey<GetRef>;
 
-export declare type GetField<D extends FormData_2 = FormData_2> = (path?: Path<D>) => Field<D> | undefined;
+export declare type GetField<D extends FormData_2 = FormData_2> = (path?: Path<D>) => Readonly<Field<D>> | undefined;
 
-export declare type GetFieldPath<D extends FormData_2 = FormData_2> = (path?: Path<D>) => string | undefined;
+export declare type GetFieldPath<D extends FormData_2 = FormData_2> = (path: Path<D>) => string | undefined;
 
 export declare type GetFormData<D extends FormData_2 = FormData_2> = (path?: Path<D>) => DeepReadonly<any>;
 
-export declare type GetParentFields<D extends FormData_2 = FormData_2> = (path?: Path<D>) => Field<D> | undefined;
+export declare type GetParentFields<D extends FormData_2 = FormData_2> = (path: Path<D>) => Fields<D> | undefined;
 
 export declare type GetRef = {
     (type: 'formItemRefs', path: string): FormItemInstance;
@@ -5544,7 +5546,12 @@ declare type SelectSlots = FieldSlot<keyof InstanceType<typeof Select>['$slots']
 
 export declare type SetActivePath<D extends FormData_2 = FormData_2> = (path: Path<D> | undefined) => void;
 
-export declare type SetField<D extends FormData_2 = FormData_2> = (path: Path<D> | undefined, field: Field<D> | ((preField: ReturnType<GetField<D>>) => Field<D>), updateType?: 'rewrite' | 'merge') => void;
+export declare type SetField<D extends FormData_2 = FormData_2> = (path: Path<D> | FindBy<D> | undefined, field: Field<D> | ((preField: Readonly<Field<D>>) => Field<D>), options?: {
+    /**
+     * 更新方式 rewrite替换重写，merge合并(默认)
+     */
+    updateType?: 'rewrite' | 'merge';
+} & UpdateFieldOptions) => void;
 
 export declare type SetFormData<D extends FormData_2 = FormData_2> = {
     (path: Path<D>, value: any | ((preValue: DeepReadonly<any>) => any)): void;
@@ -5591,6 +5598,13 @@ export declare const UPDATE_FORM_DATA: InjectionKey<UpdateFormData>;
 
 export declare const UPDATE_REFS: InjectionKey<UpdateRefs>;
 
+export declare type UpdateFieldOptions = {
+    /**
+     * 更新所有符合条件的字段，默认false（仅更新第一个）
+     */
+    all?: boolean;
+};
+
 export declare type UpdateFormData = (path: string, value: any) => void;
 
 export declare type UpdateRefs = (type: keyof Refs, path: string, childRef: Record<string, any>) => void;
@@ -5616,7 +5630,7 @@ export declare type UseFields<D extends FormData_2 = FormData_2> = (initFields:
     getField: GetField<D>;
     /** 设置指定字段数据路径的字段配置 */
     setField: SetField<D>;
-    /** 删除指定字段数据路径的字段配置 */
+    /** 删除指定字段数据路径的字段配置, 或许你更应该使用setField(path, { hidden: true })来隐藏字段 */
     deleteField: DeleteField<D>;
     /** 根据字段数据路径获取字段配置路径 */
     getFieldPath: GetFieldPath<D>;

package/es/index.js

@@ -1,6 +1,6 @@
 import "./style.css";
-import { _ as _sfc_main } from "./form/index-46e84b2b.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 "./form/index-46e84b2b.js";
+import { _ as _sfc_main } from "./form/index-7ee4d75c.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 "./form/index-7ee4d75c.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";

package/es/table/index.js

@@ -1,7 +1,7 @@
 import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, mergeModels, useModel, computed, watch, Fragment, renderList, withModifiers, renderSlot, useAttrs, useSlots, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Button, Space, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { useInjectProps, INJECT_KEYS } from "../component-provider/index.js";
-import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-46e84b2b.js";
+import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-7ee4d75c.js";
 var ColumnHeightOutlined$2 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M840 836H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zm0-724H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zM610.8 378c6 0 9.4-7 5.7-11.7L515.7 238.7a7.14 7.14 0 00-11.3 0L403.6 366.3a7.23 7.23 0 005.7 11.7H476v268h-62.8c-6 0-9.4 7-5.7 11.7l100.8 127.5c2.9 3.7 8.5 3.7 11.3 0l100.8-127.5c3.7-4.7.4-11.7-5.7-11.7H548V378h62.8z" } }] }, "name": "column-height", "theme": "outlined" };
 const ColumnHeightOutlinedSvg = ColumnHeightOutlined$2;
 function _objectSpread$2(target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",