szld-libs 0.2.90 → 0.2.92

package/es/components/DynamicForm/func.d.ts

@@ -1,5 +1,6 @@
-import { IformConfigItem } from './index.d';
+import { IformConfigItem, Ijson } from './index.d';
 import { RangePickerProps } from 'antd/es/date-picker';
+import { AxiosResponse } from 'axios';
 export declare const handleGetPlaceholder: (itemWithJson: IformConfigItem) => string;
 /**
  * 处理表单项目初始值
@@ -7,3 +8,28 @@ export declare const handleGetPlaceholder: (itemWithJson: IformConfigItem) => st
  */
 export declare const handleSetFormItemInitialValue: (itemWithJson: IformConfigItem) => any;
 export declare const disabledDate: RangePickerProps['disabledDate'];
+/**
+ * 处理URL选项
+ * 将URL中的指定字段拼接为字符串
+ */
+export declare const handleUrlOptions: (val: any, delimiter: string, list: any[]) => string;
+/**
+ * 根据配置处理成下拉数据
+ * @param param0
+ * @returns
+ */
+export declare const handleSelectOptions: ({ commonRequestWidthParams, commonRequest, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, item, }: {
+    commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
+    commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+    interfaceTypeDict?: string | undefined;
+    interfaceTypeSysDict?: string | undefined;
+    actionUrlKey?: string | undefined;
+    actionUrlExtraParams?: object | undefined;
+    item: Ijson;
+}) => Promise<any[]>;
+/**
+ * attrList 格式的单层数组 处理成对象{attrid:attrname}
+ */
+export declare const handleGetSingleAttrListObj: (children: any[]) => {
+    [key: string]: any;
+}[];

package/es/components/DynamicForm/func.js

@@ -1,4 +1,5 @@
 import dayjs from "dayjs";
+import { message } from "antd";
 const handleGetPlaceholder = (itemWithJson) => {
   const { input = "" } = itemWithJson.json || {};
   let placeholder = "请输入";
@@ -26,25 +27,16 @@ const handleGetPlaceholder = (itemWithJson) => {
   return placeholder;
 };
 const handleSetFormItemInitialValue = (itemWithJson) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const inputType = (_a = itemWithJson.json) == null ? void 0 : _a.input;
-  const isFormList = (_b = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _b["properties-multiple"];
-  let initialValue = itemWithJson.attrvalue || ((_c = itemWithJson.json) == null ? void 0 : _c.default);
+  let initialValue = itemWithJson.attrvalue || ((_b = itemWithJson.json) == null ? void 0 : _b.default);
   if (inputType === "label" && initialValue) {
-    initialValue = ((_d = itemWithJson.json) == null ? void 0 : _d["label-value"]) ?? initialValue ?? "-";
-  }
-  if ((inputType === "date-picker" || inputType === "time-picker") && initialValue) {
-    try {
-      const date = dayjs(initialValue);
-      initialValue = date.isValid() ? date : void 0;
-    } catch (error) {
-      initialValue = void 0;
-    }
+    initialValue = ((_c = itemWithJson.json) == null ? void 0 : _c["label-value"]) ?? initialValue ?? "-";
   }
   if (inputType === "range-picker" && initialValue) {
     try {
       initialValue = initialValue == null ? void 0 : initialValue.split("~");
-      initialValue = initialValue.map((v) => dayjs(v));
+      initialValue = initialValue.map((v) => v);
     } catch (error) {
       initialValue = void 0;
     }
@@ -52,13 +44,13 @@ const handleSetFormItemInitialValue = (itemWithJson) => {
   if (inputType === "multiple-date-picker" && initialValue) {
     try {
       initialValue = initialValue == null ? void 0 : initialValue.split(",");
-      initialValue = initialValue.map((v) => dayjs(v));
+      initialValue = initialValue.map((v) => dayjs());
     } catch (error) {
       initialValue = void 0;
     }
   }
   if (inputType === "cascader" && initialValue && typeof initialValue === "string") {
-    const delimiter = (_e = itemWithJson.json) == null ? void 0 : _e["cascader-delimiter"];
+    const delimiter = (_d = itemWithJson.json) == null ? void 0 : _d["cascader-delimiter"];
     if (delimiter) {
       initialValue = initialValue.split(delimiter).filter(Boolean);
     }
@@ -79,26 +71,132 @@ const handleSetFormItemInitialValue = (itemWithJson) => {
       initialValue = [];
     }
   }
-  if (isFormList && itemWithJson.attrtype === 1) {
-    const children = itemWithJson.children || [];
-    if (Array.isArray(children)) {
-      initialValue = [
-        Object.assign(
-          {},
-          ...children == null ? void 0 : children.map((child) => ({
-            [child.attrid]: handleSetFormItemInitialValue(child)
-          }))
-        )
-      ];
-    }
+  if (itemWithJson.attrtype === 1) {
+    initialValue = handleGetSingleAttrListObj(itemWithJson.children || []);
   }
   return initialValue || null;
 };
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
 };
+const handleUrlOptions = (val, delimiter, list) => {
+  let arr = [];
+  list.forEach((item) => {
+    arr.push(val == null ? void 0 : val[item]);
+  });
+  return arr.join(delimiter || "-");
+};
+const handleSelectOptions = async ({
+  commonRequestWidthParams,
+  commonRequest,
+  interfaceTypeDict = "YLZDDictList",
+  interfaceTypeSysDict = "YLZDSysConfigList",
+  actionUrlKey = "action-url",
+  actionUrlExtraParams = {},
+  item
+}) => {
+  var _a;
+  let options = [];
+  const getDict = async (interfaceType) => {
+    var _a2;
+    let list = [];
+    if (item.classify) {
+      try {
+        const response = await commonRequest(interfaceType, {
+          asctypeid: item.classify
+        });
+        if (((_a2 = response == null ? void 0 : response.data) == null ? void 0 : _a2.list) && Array.isArray(response.data.list)) {
+          list = response.data.list.map((dictItem) => ({
+            label: `${dictItem.dicid || ""}-${dictItem.info || ""}`,
+            value: `${dictItem.dicid || ""}-${dictItem.info || ""}`
+          }));
+        }
+      } catch (error) {
+        message.error("加载选项失败");
+      }
+    }
+    return list;
+  };
+  const getUrlOptions = async () => {
+    var _a2, _b;
+    try {
+      const keyFieldList = ((_a2 = item == null ? void 0 : item["key-field"]) == null ? void 0 : _a2.list) || [];
+      const delimiter = ((_b = item == null ? void 0 : item["key-field"]) == null ? void 0 : _b.delimiter) || "";
+      if (!keyFieldList.length) {
+        message.error("请配置key-field");
+        return;
+      }
+      const response = await commonRequestWidthParams(
+        {
+          PageName: "dns_relay",
+          Controlname: "CallActionUrl",
+          InterfaceType: ""
+        },
+        {
+          [actionUrlKey]: item == null ? void 0 : item["action-url"],
+          ...actionUrlExtraParams
+        }
+      );
+      if (response == null ? void 0 : response.data) {
+        const data = response == null ? void 0 : response.data;
+        const list = (data == null ? void 0 : data.list) || [];
+        let urlData = [];
+        if (Array.isArray(data)) {
+          urlData = data;
+        }
+        if (Array.isArray(list)) {
+          urlData = list;
+        }
+        options = urlData.map((val) => ({
+          label: handleUrlOptions(val, delimiter, keyFieldList),
+          value: handleUrlOptions(val, delimiter, keyFieldList)
+        }));
+      }
+    } catch (error) {
+      message.error("加载选项失败");
+    }
+  };
+  if (item.inputType === "local") {
+    options = ((_a = item.data) == null ? void 0 : _a.map((val) => ({
+      label: val,
+      value: val
+    }))) || [];
+    if (item.options && Array.isArray(item.options)) {
+      options = item.options;
+    }
+  } else if (item.inputType === "dictionary") {
+    options = await getDict(interfaceTypeDict);
+  } else if (item.inputType === "system-dictionary") {
+    options = await getDict(interfaceTypeSysDict);
+  }
+  if (item.inputType === "url" && (item == null ? void 0 : item["action-url"])) {
+    await getUrlOptions();
+  }
+  return options;
+};
+const handleGetSingleAttrListObj = (children) => {
+  if (!(children == null ? void 0 : children.length)) {
+    return [];
+  }
+  const dealList = (children2) => children2 == null ? void 0 : children2.map((v) => {
+    const obj = {};
+    v.forEach((x) => {
+      var _a;
+      if ((_a = x == null ? void 0 : x.children) == null ? void 0 : _a.length) {
+        obj[x.attrid] = dealList(x.children);
+      } else {
+        obj[x.attrid] = x.attrvalue;
+      }
+    });
+    return obj;
+  });
+  return dealList(children);
+};
 export {
   disabledDate,
   handleGetPlaceholder,
-  handleSetFormItemInitialValue
+  handleGetSingleAttrListObj,
+  handleSelectOptions,
+  handleSetFormItemInitialValue,
+  handleUrlOptions
 };

package/es/components/DynamicForm/index.d.ts

@@ -13,7 +13,7 @@ export interface IformConfigItem {
   createtime: string;
   attrvalue: any;
   serialnum: number;
-  children: IformConfigItem[];
+  children: any[];
   json: Ijson;
 }
 

package/es/components/DynamicForm/mySelect/index.js

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { handleSelectOptions } from "../../../utils/method";
+import { handleSelectOptions } from "../func";
 import { useState, useEffect } from "react";
 import { Select } from "antd";
 const MySelect = ({

package/es/components/DynamicForm/useDynamicForm.d.ts

@@ -19,6 +19,9 @@ interface IDynamicFormProps {
     setAttrList?: (config: IformConfigItem[]) => void;
     hideAttrList?: string[];
 }
+type NestedFormListFieldData = FormListFieldData & {
+    parentName?: (string | number)[];
+};
 declare function useDynamicForm(props: IDynamicFormProps): {
     handleRenderItem: ({ item, readonly, colNum, instructionShowMode, relatedid, form, defaultWidth, formItemStyle, radioAlign, isFormListItem, formListField, isShowLabel, }: {
         item: IformConfigItem;
@@ -31,7 +34,7 @@ declare function useDynamicForm(props: IDynamicFormProps): {
         formItemStyle: IformItemStyle[] | undefined;
         radioAlign?: "horizontal" | "vertical" | undefined;
         isFormListItem?: boolean | undefined;
-        formListField?: FormListFieldData | undefined;
+        formListField?: NestedFormListFieldData | undefined;
         isShowLabel?: boolean | undefined;
     }) => import("react/jsx-runtime").JSX.Element | null;
     handleSetFormItemInitialValue: (itemWithJson: IformConfigItem) => any;

package/es/components/DynamicForm/useDynamicForm.js

@@ -1,7 +1,7 @@
-import { jsx, Fragment, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs, Fragment as Fragment$1 } from "react/jsx-runtime";
 import { handleSetFormItemInitialValue, handleGetPlaceholder, disabledDate } from "./func";
-import { handleAttrList, handleUrlOptions, getJson, base64ToString } from "../../utils/method";
-import { useRef, useEffect, useCallback, Fragment as Fragment$1 } from "react";
+import { handleUrlOptions, getJson, base64ToString } from "../../utils/method";
+import { useRef, useEffect, useCallback, Fragment } from "react";
 import isoWeek from "dayjs/plugin/isoWeek";
 import SelectModel from "./selectModel";
 import MyCheckbox from "./myCheckbox";
@@ -11,7 +11,6 @@ import RadioCard from "./radioCard";
 import MySelect from "./mySelect";
 import MyUpload from "./myUpload";
 import MyRadio from "./myRadio";
-import _ from "lodash";
 import { MinusSquareOutlined, PlusSquareOutlined, CloseOutlined, InfoCircleOutlined } from "@ant-design/icons";
 import { App, Col, Collapse, Form, Card, Flex, Button, Space, Input, DatePicker, InputNumber, Tooltip } from "antd";
 dayjs.extend(isoWeek);
@@ -151,7 +150,7 @@ function useDynamicForm(props) {
       ) }) || /* @__PURE__ */ jsx("span", { style: { color: ((_d = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _d["instruction-color"]) ?? "red" }, children: (_e = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _e.instruction })
     ] });
   };
-  const handleRenderFunc = useCallback(
+  const renderNestedFormList = useCallback(
     ({
       itemWithJson,
       colNum = 1,
@@ -162,81 +161,68 @@ function useDynamicForm(props) {
       relatedid,
       form,
       defaultWidth = 358,
-      isFormListItem = false,
-      formListField,
+      parentFormListField,
       isShowLabel = true
     }) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-      const isFormList = (_a = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a["properties-multiple"];
-      let formListInitValue = [];
-      if (isFormList) {
-        formListInitValue = handleSetFormItemInitialValue(itemWithJson);
+      const formListInitValue = handleSetFormItemInitialValue(itemWithJson);
+      let children = itemWithJson.children || [];
+      if (Array.isArray(children == null ? void 0 : children[0]) && children.length) {
+        children = children[0];
       }
-      if (((_b = itemWithJson.json) == null ? void 0 : _b.hide) === true || (hideAttrList == null ? void 0 : hideAttrList.includes(itemWithJson.attrid))) {
-        return /* @__PURE__ */ jsx(Fragment, {});
-      }
-      if (itemWithJson.attrtype === 1) {
-        return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
-          Collapse,
-          {
-            bordered: false,
-            style: { backgroundColor: "transparent" },
-            expandIcon: ({ isActive }) => handleCollapseIcon({ isActive }),
-            onChange: async (key) => {
-              var _a2, _b2;
-              try {
-                const { children = [] } = itemWithJson;
-                if (key && (key == null ? void 0 : key.length) && formConfigRef.current && interfaceTypeChildren && !(children == null ? void 0 : children.length)) {
-                  const res = await commonRequest(interfaceTypeChildren, {
-                    instanceid: relatedid,
-                    asid: (_a2 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a2.propertiesID,
-                    tname: itemWithJson.attrvalue
-                  });
-                  if ((res == null ? void 0 : res.ReturnValue) === 1) {
-                    const list = ((_b2 = res == null ? void 0 : res.data) == null ? void 0 : _b2.list) || [];
-                    const arr = handleAttrList(list, { instanceid: relatedid, tname: itemWithJson.tname });
-                    const _formConfig = _.cloneDeep(formConfigRef.current);
-                    const _item = _formConfig.find((item) => item.attrid === itemWithJson.attrid);
-                    if (_item) {
-                      _item.children = [...arr];
-                    }
-                    setFormConfig == null ? void 0 : setFormConfig(_formConfig);
-                    setAttrList == null ? void 0 : setAttrList(_formConfig);
-                  }
+      const getFormListName = (field) => {
+        const parentPath = (parentFormListField == null ? void 0 : parentFormListField.parentName) || (parentFormListField == null ? void 0 : parentFormListField.name);
+        if (parentPath) {
+          return Array.isArray(parentPath) ? [...parentPath, itemWithJson.attrid, field.name] : [parentPath, itemWithJson.attrid, field.name];
+        }
+        return [itemWithJson.attrid, field.name];
+      };
+      return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
+        Collapse,
+        {
+          bordered: false,
+          defaultActiveKey: [itemWithJson.attrid],
+          style: { backgroundColor: "transparent" },
+          expandIcon: ({ isActive }) => handleCollapseIcon({ isActive }),
+          items: [
+            {
+              key: itemWithJson.attrid,
+              label: itemWithJson.attrname,
+              styles: {
+                header: {
+                  paddingLeft: 0
                 }
-              } catch (error) {
-              }
-            },
-            items: [
-              {
-                key: itemWithJson.attrid,
-                label: itemWithJson.attrname,
-                styles: {
-                  header: {
-                    paddingLeft: 0
-                  }
-                },
-                children: isFormList ? /* @__PURE__ */ jsx(Form.List, { name: itemWithJson.attrid, initialValue: formListInitValue, children: (fields, { add, remove }) => {
-                  var _a2;
-                  return /* @__PURE__ */ jsxs("div", { style: { display: "flex", rowGap: 16, flexDirection: "column" }, children: [
+              },
+              children: /* @__PURE__ */ jsx(
+                Form.List,
+                {
+                  name: parentFormListField ? Array.isArray(parentFormListField.name) ? [...parentFormListField.name, itemWithJson.attrid] : [parentFormListField.name, itemWithJson.attrid] : itemWithJson.attrid,
+                  initialValue: formListInitValue,
+                  children: (fields, { add, remove }) => /* @__PURE__ */ jsxs("div", { style: { display: "flex", rowGap: 16, flexDirection: "column" }, children: [
                     fields.map((field) => {
-                      var _a3;
+                      const nestedField = {
+                        ...field,
+                        parentName: getFormListName(field)
+                      };
                       return /* @__PURE__ */ jsx(
                         Card,
                         {
-                          style: { width: ((_a3 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a3["properties-width"]) || defaultWidth + 100 },
+                          style: { width: defaultWidth + 100 },
                           size: "small",
                           title: `${itemWithJson.attrname} ${field.name + 1}`,
                           extra: /* @__PURE__ */ jsx(
                             CloseOutlined,
                             {
                               onClick: () => {
-                                remove(field.name);
+                                if (fields.length > 1) {
+                                  remove(field.name);
+                                } else {
+                                  message.warning("至少需要保留一个!");
+                                }
                               }
                             }
                           ),
-                          children: (itemWithJson.children || []).map((child, index) => {
-                            return /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderItem({
+                          children: (children || []).map((child, index) => {
+                            return /* @__PURE__ */ jsx(Fragment, { children: handleRenderItem({
                               item: child,
                               readonly,
                               colNum,
@@ -245,8 +231,9 @@ function useDynamicForm(props) {
                               form,
                               defaultWidth,
                               formItemStyle,
+                              radioAlign,
                               isFormListItem: true,
-                              formListField: field,
+                              formListField: nestedField,
                               isShowLabel: true
                             }) }, child.attrid || `child-${index}`);
                           })
@@ -254,40 +241,66 @@ function useDynamicForm(props) {
                         field.key
                       );
                     }),
-                    /* @__PURE__ */ jsx(Flex, { style: { width: ((_a2 = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _a2["properties-width"]) || defaultWidth + 100 }, children: /* @__PURE__ */ jsx(Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
-                  ] });
-                } }) : /* @__PURE__ */ jsx("div", { children: (itemWithJson.children || []).map((child, index) => {
-                  return /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderItem({
-                    item: child,
-                    readonly,
-                    colNum,
-                    instructionShowMode,
-                    relatedid,
-                    form,
-                    defaultWidth,
-                    formItemStyle
-                  }) }, child.attrid || `child-${index}`);
-                }) })
-              }
-            ]
-          },
-          itemWithJson.attrid
-        ) });
+                    /* @__PURE__ */ jsx(Flex, { style: { width: 200 }, children: /* @__PURE__ */ jsx(Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
+                  ] })
+                }
+              )
+            }
+          ]
+        },
+        itemWithJson.attrid
+      ) });
+    },
+    [handleCollapseIcon, handleSetFormItemInitialValue]
+  );
+  const handleRenderFunc = useCallback(
+    ({
+      itemWithJson,
+      colNum = 1,
+      readonly = false,
+      instructionShowMode = "icon",
+      radioAlign = "horizontal",
+      formItemStyle,
+      relatedid,
+      form,
+      defaultWidth = 358,
+      isFormListItem = false,
+      formListField,
+      isShowLabel = true
+    }) => {
+      var _a, _b, _c, _d, _e, _f, _g;
+      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true || (hideAttrList == null ? void 0 : hideAttrList.includes(itemWithJson.attrid))) {
+        return /* @__PURE__ */ jsx(Fragment$1, {});
+      }
+      if (itemWithJson.attrtype === 1) {
+        return renderNestedFormList({
+          itemWithJson,
+          colNum,
+          readonly,
+          instructionShowMode,
+          radioAlign,
+          formItemStyle,
+          relatedid,
+          form,
+          defaultWidth,
+          parentFormListField: formListField,
+          isShowLabel
+        });
       }
       if (itemWithJson.attrtype === 2) {
-        return /* @__PURE__ */ jsx(Fragment, { children: "实例信息" });
+        return /* @__PURE__ */ jsx(Fragment$1, { children: "实例信息" });
       }
       if (itemWithJson.attrtype === 0) {
-        let initialValue = handleSetFormItemInitialValue(itemWithJson);
-        const message2 = (_c = itemWithJson.json) == null ? void 0 : _c["default-prompt"];
+        const initialValue = handleSetFormItemInitialValue(itemWithJson);
+        const message2 = (_b = itemWithJson.json) == null ? void 0 : _b["default-prompt"];
         const placeholder = handleGetPlaceholder(itemWithJson);
         const { combinations = [] } = itemWithJson.json || {};
         if (combinations == null ? void 0 : combinations.length) {
           return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
             Form.Item,
             {
-              label: (_d = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _d["combination-name"],
-              required: (_e = itemWithJson.json) == null ? void 0 : _e.must,
+              label: (_c = itemWithJson == null ? void 0 : itemWithJson.json) == null ? void 0 : _c["combination-name"],
+              required: (_d = itemWithJson.json) == null ? void 0 : _d.must,
               children: /* @__PURE__ */ jsx(Space.Compact, { children: combinations.map((item, index) => {
                 var _a2, _b2, _c2, _d2;
                 let initValue = handleSetFormItemInitialValue(item);
@@ -302,21 +315,20 @@ function useDynamicForm(props) {
                   }
                 }
                 const widthRatio = (_a2 = item == null ? void 0 : item.json) == null ? void 0 : _a2["combination-width-ratio"];
-                const placeholder2 = handleGetPlaceholder(item);
                 if (widthRatio) {
                   width = defaultWidth * widthRatio;
                 }
                 return /* @__PURE__ */ jsx(
                   Form.Item,
                   {
-                    name: item.attrid,
+                    name: formListField ? Array.isArray(formListField.name) ? [...formListField.name, item.attrid] : [formListField.name, item.attrid] : item.attrid,
                     noStyle: true,
                     initialValue: initValue,
                     rules: [
                       ...((_b2 = item.json) == null ? void 0 : _b2.must) ? [
                         {
                           required: true,
-                          message: message2 || `${placeholder2}${item.attrname}`
+                          message: message2 || `${placeholder}${item.attrname}`
                         }
                       ] : [],
                       ...((_c2 = itemWithJson.json) == null ? void 0 : _c2.regexp) ? [
@@ -345,58 +357,24 @@ function useDynamicForm(props) {
             `${itemWithJson.attrid}+1`
           ) });
         }
-        if (isFormListItem && formListField) {
-          return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
-            Form.Item,
-            {
-              name: [formListField == null ? void 0 : formListField.name, itemWithJson.attrid],
-              label: isShowLabel && handleDealInstruction(itemWithJson, instructionShowMode) || null,
-              initialValue,
-              rules: [
-                ...((_f = itemWithJson.json) == null ? void 0 : _f.must) ? [
-                  {
-                    required: true,
-                    message: `${placeholder}${itemWithJson.attrname}`
-                  }
-                ] : [],
-                ...((_g = itemWithJson.json) == null ? void 0 : _g.regexp) ? [
-                  {
-                    pattern: new RegExp(itemWithJson.json.regexp.replace(/^\/|\/$/g, "")),
-                    message: ((_h = itemWithJson.json) == null ? void 0 : _h["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
-                  }
-                ] : []
-              ],
-              ...handleSetFormItemProps(itemWithJson),
-              children: handleRenderItemInputMode({
-                item: itemWithJson,
-                readonly,
-                formItemStyle,
-                radioAlign,
-                relatedid,
-                form,
-                defaultWidth
-              })
-            },
-            itemWithJson.attrid
-          ) });
-        }
+        const formItemName = isFormListItem && formListField ? Array.isArray(formListField.name) ? [...formListField.name, itemWithJson.attrid] : [formListField.name, itemWithJson.attrid] : itemWithJson.attrid;
         return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
           Form.Item,
           {
-            name: itemWithJson.attrid,
+            name: formItemName,
             label: isShowLabel && handleDealInstruction(itemWithJson, instructionShowMode) || null,
             initialValue,
             rules: [
-              ...((_i = itemWithJson.json) == null ? void 0 : _i.must) ? [
+              ...((_e = itemWithJson.json) == null ? void 0 : _e.must) ? [
                 {
                   required: true,
                   message: `${placeholder}${itemWithJson.attrname}`
                 }
               ] : [],
-              ...((_j = itemWithJson.json) == null ? void 0 : _j.regexp) ? [
+              ...((_f = itemWithJson.json) == null ? void 0 : _f.regexp) ? [
                 {
                   pattern: new RegExp(itemWithJson.json.regexp.replace(/^\/|\/$/g, "")),
-                  message: ((_k = itemWithJson.json) == null ? void 0 : _k["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
+                  message: ((_g = itemWithJson.json) == null ? void 0 : _g["regexp-message"]) || `${itemWithJson.attrname}格式不正确`
                 }
               ] : []
             ],
@@ -416,7 +394,7 @@ function useDynamicForm(props) {
       }
       return null;
     },
-    [handleCollapseIcon]
+    [handleDealInstruction, handleSetFormItemInitialValue, handleSetFormItemProps, hideAttrList, renderNestedFormList]
   );
   const handleOnRemove = async (file) => {
     var _a;
@@ -730,7 +708,7 @@ function useDynamicForm(props) {
     if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true) {
       return null;
     }
-    return /* @__PURE__ */ jsx(Fragment$1, { children: handleRenderFunc({
+    return /* @__PURE__ */ jsx(Fragment, { children: handleRenderFunc({
       itemWithJson,
       readonly,
       colNum,

package/es/utils/method.d.ts

@@ -10,7 +10,12 @@ export declare function isBase64(str: string): boolean;
  * @returns
  */
 export declare const handleSubmitForm: (originalData: any, allValues: any) => {
-    updatedData: any;
+    updatedData: {
+        data: {
+            asid: any;
+            data_list: any[];
+        };
+    };
     uploadedFiles: any[];
 };
 /**
@@ -69,7 +74,7 @@ export declare const handleOperationFile: (params: any, data: any, commonRequest
  */
 export declare function handleKebabToCamel(str: string): string;
 /**
- * 提交实例化时处理属性列表为提交嵌套格式
+ * 处理属性列表为接口提交格式（修复children的data_list为空问题）
  * @param {Array} attrList 原始属性列表
  * @returns {Object} 目标格式的data对象
  */
@@ -94,7 +99,7 @@ export declare const handleAttrListToObjDetail: ({ attrList, params, extra, comm
         [key: string]: any;
     } | undefined;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
-}) => Promise<any>;
+}) => Promise<any[]>;
 /**
  * 处理URL选项  根据远程接口获取下拉、单选、多选数据
  * 将URL中的指定字段拼接为字符串