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

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-b2d126ee.js}

@@ -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(".");
@@ -15896,86 +15896,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 +15972,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) => {

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

package/es/index.d.ts

@@ -718,14 +718,14 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         }>>) => void;
         resetQueryParams: () => void;
     }) | undefined;
-    tableLayout?: TableLayout | undefined;
-    columns?: ColumnsType<any> | undefined;
     scroll?: ({
         x?: string | number | true | undefined;
         y?: string | number | undefined;
     } & {
         scrollToFirstRowOnChange?: boolean | undefined;
     }) | undefined;
+    columns?: ColumnsType<any> | undefined;
+    tableLayout?: TableLayout | undefined;
     rowClassName?: string | RowClassName<any> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<any> | undefined;
@@ -1161,14 +1161,14 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             }>>) => void;
             resetQueryParams: () => void;
         }) | undefined;
-        tableLayout?: TableLayout | undefined;
-        columns?: ColumnsType<any> | undefined;
         scroll?: ({
             x?: string | number | true | undefined;
             y?: string | number | undefined;
         } & {
             scrollToFirstRowOnChange?: boolean | undefined;
         }) | undefined;
+        columns?: ColumnsType<any> | undefined;
+        tableLayout?: TableLayout | undefined;
         rowClassName?: string | RowClassName<any> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<any> | undefined;
@@ -1608,14 +1608,14 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
                 }>>) => void;
                 resetQueryParams: () => void;
             }) | undefined;
-            tableLayout?: TableLayout | undefined;
-            columns?: ColumnsType<any> | undefined;
             scroll?: ({
                 x?: string | number | true | undefined;
                 y?: string | number | undefined;
             } & {
                 scrollToFirstRowOnChange?: boolean | undefined;
             }) | undefined;
+            columns?: ColumnsType<any> | undefined;
+            tableLayout?: TableLayout | undefined;
             rowClassName?: string | RowClassName<any> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<any> | undefined;
@@ -1890,7 +1890,7 @@ export declare type GetFieldPath = (path?: string) => string | undefined;
 
 export declare type GetFormData = (path?: string) => DeepReadonly<any>;
 
-export declare type GetParentField = (path?: string) => Field | undefined;
+export declare type GetParentFields = (path?: string) => Field | undefined;
 
 export declare type GetRef = {
     (type: 'formItemRefs', path: string): FormItemInstance;
@@ -4947,14 +4947,14 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         }>>) => void;
         resetQueryParams: () => void;
     }) | undefined;
-    tableLayout?: TableLayout | undefined;
-    columns?: TableColumnsType<any> | undefined;
     scroll?: ({
         x?: string | number | true | undefined;
         y?: string | number | undefined;
     } & {
         scrollToFirstRowOnChange?: boolean | undefined;
     }) | undefined;
+    columns?: TableColumnsType<any> | undefined;
+    tableLayout?: TableLayout | undefined;
     rowClassName?: string | RowClassName<any> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<any> | undefined;
@@ -5390,14 +5390,14 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             }>>) => void;
             resetQueryParams: () => void;
         }) | undefined;
-        tableLayout?: TableLayout | undefined;
-        columns?: TableColumnsType<any> | undefined;
         scroll?: ({
             x?: string | number | true | undefined;
             y?: string | number | undefined;
         } & {
             scrollToFirstRowOnChange?: boolean | undefined;
         }) | undefined;
+        columns?: TableColumnsType<any> | undefined;
+        tableLayout?: TableLayout | undefined;
         rowClassName?: string | RowClassName<any> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<any> | undefined;
@@ -5837,14 +5837,14 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
                 }>>) => void;
                 resetQueryParams: () => void;
             }) | undefined;
-            tableLayout?: TableLayout | undefined;
-            columns?: TableColumnsType<any> | undefined;
             scroll?: ({
                 x?: string | number | true | undefined;
                 y?: string | number | undefined;
             } & {
                 scrollToFirstRowOnChange?: boolean | undefined;
             }) | undefined;
+            columns?: TableColumnsType<any> | undefined;
+            tableLayout?: TableLayout | undefined;
             rowClassName?: string | RowClassName<any> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<any> | undefined;
@@ -6104,8 +6104,8 @@ export declare type UseFields = (initFields: Fields) => {
     appendField: AppendField;
     /** 在指定字段数据路径的字段配置前插入新的字段配置 */
     prependField: PrependField;
-    /** 获取指定字段数据路径的字段所在分组字段的配置 */
-    getParentField: GetParentField;
+    /** 获取指定字段数据路径的字段所在字段分组 */
+    getParentFields: GetParentFields;
 };
 
 export declare const useFields: UseFields;

package/es/index.js

@@ -1,6 +1,6 @@
 import "./style.css";
-import { _ as _sfc_main } from "./form/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 "./form/index-2a04ad4a.js";
+import { _ as _sfc_main } from "./form/index-b2d126ee.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-b2d126ee.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-2a04ad4a.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-b2d126ee.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.11",
+  "version": "1.1.12",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",
@@ -14,6 +14,9 @@
     "type": "git",
     "url": "git+https://github.com/dufan3715/pro-components.git"
   },
+  "scripts": {
+    "build": "vue-tsc && vite build"
+  },
   "keywords": [
     "vue",
     "ant-design-vue",
@@ -35,8 +38,5 @@
   },
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1"
-  },
-  "scripts": {
-    "build": "vue-tsc && vite build"
   }
-}
+}

package/LICENSE

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2023-present pro-components
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.