szld-libs 0.3.2 → 0.3.4

package/es/components/DynamicForm/index.js

@@ -30,7 +30,8 @@ const DynamicForm = forwardRef((props, ref) => {
     formShowType = "form",
     headerWidth,
     formListItemWidth,
-    formListItemName
+    formListItemName,
+    isEdit = false
   } = props;
   const delFileListRef = useRef([]);
   const updateDelFileList = (file) => {
@@ -41,7 +42,6 @@ const DynamicForm = forwardRef((props, ref) => {
     uploadAction,
     commonRequest,
     setFormConfig,
-    setAttrList,
     updateDelFileList,
     formConfig,
     interfaceTypeChildren,
@@ -51,7 +51,7 @@ const DynamicForm = forwardRef((props, ref) => {
     actionUrlKey,
     actionUrlExtraParams,
     CustomModalComponent,
-    hideAttrList
+    isEdit
   });
   useImperativeHandle(ref, () => ({
     getDelFileList: () => {

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

@@ -16,8 +16,7 @@ interface IDynamicFormProps {
     actionUrlKey: string;
     actionUrlExtraParams: object;
     CustomModalComponent?: React.FC<ICustomModal>;
-    setAttrList?: (config: IformConfigItem[]) => void;
-    hideAttrList?: string[];
+    isEdit?: boolean;
 }
 type NestedFormListFieldData = FormListFieldData & {
     parentName?: (string | number)[];

package/es/components/DynamicForm/useDynamicForm.js

@@ -21,17 +21,14 @@ function useDynamicForm(props) {
     uploadAction,
     commonRequest,
     formConfig,
-    setFormConfig,
     updateDelFileList,
-    interfaceTypeChildren,
     interfaceTypeDict,
     interfaceTypeSysDict,
     relatedidKey,
     actionUrlKey,
     actionUrlExtraParams,
     CustomModalComponent,
-    setAttrList,
-    hideAttrList = []
+    isEdit
   } = props;
   const formConfigRef = useRef([]);
   const { message } = App.useApp();
@@ -181,7 +178,6 @@ function useDynamicForm(props) {
         Collapse,
         {
           bordered: false,
-          defaultActiveKey: [itemWithJson.attrid],
           style: { backgroundColor: "transparent" },
           expandIcon: ({ isActive }) => handleCollapseIcon({ isActive }),
           items: [
@@ -210,7 +206,7 @@ function useDynamicForm(props) {
                           style: { width: defaultWidth + 100 },
                           size: "small",
                           title: `${itemWithJson.attrname} ${field.name + 1}`,
-                          extra: /* @__PURE__ */ jsx(
+                          extra: !isEdit && /* @__PURE__ */ jsx(
                             CloseOutlined,
                             {
                               onClick: () => {
@@ -242,7 +238,7 @@ function useDynamicForm(props) {
                         field.key
                       );
                     }),
-                    /* @__PURE__ */ jsx(Flex, { style: { width: 200 }, children: /* @__PURE__ */ jsx(Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
+                    !isEdit && /* @__PURE__ */ jsx(Flex, { style: { width: 200 }, children: /* @__PURE__ */ jsx(Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
                   ] })
                 }
               )
@@ -270,7 +266,7 @@ function useDynamicForm(props) {
       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))) {
+      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true) {
         return /* @__PURE__ */ jsx(Fragment$1, {});
       }
       if (itemWithJson.attrtype === 1) {
@@ -395,7 +391,7 @@ function useDynamicForm(props) {
       }
       return null;
     },
-    [handleDealInstruction, handleSetFormItemInitialValue, handleSetFormItemProps, hideAttrList, renderNestedFormList]
+    [handleDealInstruction, handleSetFormItemInitialValue, handleSetFormItemProps, renderNestedFormList]
   );
   const handleOnRemove = async (file) => {
     var _a;

package/es/components/DynamicFormMobile/index.js

@@ -82,8 +82,8 @@ const DynamicForm = forwardRef((props, ref) => {
               justify: "space-between",
               style: {
                 height: 44,
-                width: "calc(100vw - 32px)",
                 marginLeft: 16,
+                marginRight: 16,
                 borderBottom: "1px solid #E3E3E3"
               },
               align: "center",
@@ -108,8 +108,7 @@ const DynamicForm = forwardRef((props, ref) => {
               defaultWidth: (formListItemWidth == null ? void 0 : formListItemWidth[index]) || defaultWidth,
               formItemStyle,
               isFormListItem: true,
-              formListField: field,
-              isShowLabel: false
+              formListField: field
             }) }, index);
           }) })
         ]

package/es/index.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { commonRequestWidthParams, uploadFormAction, commonRequest } from "./services";
-import { handleAttrList } from "./utils/method";
+import { handleAttrListToObj, handleAttrList } from "./utils/method";
 import { BackHeader, DynamicFormMobile } from "./main";
 import { BrowserRouter } from "react-router-dom";
 import { ConfigProvider, App } from "antd";
@@ -14,6 +14,7 @@ const index = "";
 dayjs.locale("zh-cn");
 const Demo = () => {
   useEffect(() => {
+    handleAttrListToObj(attrList);
   }, []);
   const formRef = useRef(null);
   Form.useForm();

package/es/mock/index.js

@@ -3,38 +3,47 @@ const attrList = [
   {
     xh: 1,
     asid: "904A28FACAF346DFA63CBEEB3437BDA8",
+    astype: 0,
+    tname: "tsyy_table",
     attrid: "6970C54A08E54463888CD8F9E7FD851B",
     attrname: "喂药日期",
     attrtype: 0,
     info: '{"input":"multiple-date-picker","range-picker-save":"single","dataType":"string","length":1000}',
     info_base64: 0,
     createtime: "2026-01-05 15:33:36",
+    attrvalue: "",
     serialnum: 1,
-    label_list: []
+    children: []
   },
   {
     xh: 2,
     asid: "904A28FACAF346DFA63CBEEB3437BDA8",
+    astype: 0,
+    tname: "tsyy_table",
     attrid: "98FD46568CAC4F248B5FD66D52DF5086",
     attrname: "当日次数",
     attrtype: 0,
     info: '{"input":"text","dataType":"string","length":1}',
     info_base64: 0,
     createtime: "2026-01-05 15:33:45",
+    attrvalue: "",
     serialnum: 2,
-    label_list: []
+    children: []
   },
   {
     xh: 3,
     asid: "904A28FACAF346DFA63CBEEB3437BDA8",
+    astype: 0,
+    tname: "tsyy_table",
     attrid: "E7C4B706E65E4F81B51AAA9D313B5482",
     attrname: "当日时间",
     attrtype: 0,
     info: '{"input":"mult-select","inputType":"local","data":["09:00","10:00","11:00","12:00","13:00","14:00"],"dataType":"string","length":100}',
     info_base64: 0,
     createtime: "2026-01-05 15:34:22",
+    attrvalue: "",
     serialnum: 3,
-    label_list: []
+    children: []
   }
 ];
 export {

package/es/utils/method.d.ts

@@ -15,6 +15,7 @@ export declare const handleSubmitForm: (originalData: {
     isMobile?: boolean;
     guid?: string;
     isListToObj?: boolean;
+    isAutoFill?: boolean;
 }, allValues: any) => {
     updatedData: any;
     uploadedFiles: any[];
@@ -120,3 +121,10 @@ export declare const handleSelectOptions: ({ commonRequestWidthParams, commonReq
     actionUrlExtraParams?: object | undefined;
     item: Ijson;
 }) => Promise<any[]>;
+/**
+ * 单层详情数据对应到单个属性集
+ * @param attrList 属性集列表
+ * @param detail 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
+ * @returns 处理后的属性集列表，每个属性项包含attrvalue
+ */
+export declare const handleObjDetailToSignleAttrList: (attrList: any[], detail: any) => any[];

package/es/utils/method.js

@@ -31,7 +31,7 @@ const handleSubmitForm = (originalData, allValues) => {
   var _a;
   let updatedData = _.cloneDeep(originalData);
   const { attr_list = [] } = updatedData;
-  const { isMobile = false, guid, isListToObj = false } = originalData;
+  const { isMobile = false, guid, isListToObj = false, isAutoFill = true } = originalData;
   let uploadedFiles = [];
   const processAttrList = (attrList, values) => {
     try {
@@ -49,14 +49,14 @@ const handleSubmitForm = (originalData, allValues) => {
         attrItem = handleDealValue(attrItem, formValue, isMobile);
       }
       attrList.forEach((item) => {
-        if (item.children && Array.isArray(item.children) && item.children.length > 0 && !Array.isArray(item.children[0])) {
+        if (item.children && Array.isArray(item.children) && item.children.length > 0 && !Array.isArray(item.children[0]) && values[item.attrid]) {
           processAttrList(item.children, values[item.attrid]);
         }
         if (item.children && Array.isArray(item.children) && item.children.length > 0 && Array.isArray(item.children[0])) {
           item.children.forEach((v, i) => {
-            var _a2;
-            if (v && Array.isArray(v)) {
-              processAttrList(v, (_a2 = values == null ? void 0 : values[item.attrid]) == null ? void 0 : _a2[i]);
+            var _a2, _b;
+            if (v && Array.isArray(v) && ((_a2 = values == null ? void 0 : values[item.attrid]) == null ? void 0 : _a2[i])) {
+              processAttrList(v, (_b = values == null ? void 0 : values[item.attrid]) == null ? void 0 : _b[i]);
             }
           });
         }
@@ -158,20 +158,22 @@ const handleSubmitForm = (originalData, allValues) => {
   if (updatedData.attr_list && Array.isArray(updatedData.attr_list)) {
     processAttrList(attr_list, allValues);
   }
-  (_a = updatedData == null ? void 0 : updatedData.attr_list) == null ? void 0 : _a.forEach((v) => {
-    var _a2, _b, _c, _d, _e, _f;
-    if (((_a2 = v == null ? void 0 : v.json) == null ? void 0 : _a2["auto-generate"]) && ((_b = v == null ? void 0 : v.json) == null ? void 0 : _b["auto-generate-type"])) {
-      if (((_c = v == null ? void 0 : v.json) == null ? void 0 : _c["auto-generate-type"]) === "currenttime") {
-        v.attrvalue = dayjs().format("YYYY-MM-DD HH:mm:ss");
+  if (isAutoFill) {
+    (_a = updatedData == null ? void 0 : updatedData.attr_list) == null ? void 0 : _a.forEach((v) => {
+      var _a2, _b, _c, _d, _e, _f;
+      if (((_a2 = v == null ? void 0 : v.json) == null ? void 0 : _a2["auto-generate"]) && ((_b = v == null ? void 0 : v.json) == null ? void 0 : _b["auto-generate-type"])) {
+        if (((_c = v == null ? void 0 : v.json) == null ? void 0 : _c["auto-generate-type"]) === "currenttime") {
+          v.attrvalue = dayjs().format("YYYY-MM-DD HH:mm:ss");
+        }
+        if (((_d = v == null ? void 0 : v.json) == null ? void 0 : _d["auto-generate-type"]) === "guid") {
+          v.attrvalue = guid || "";
+        }
       }
-      if (((_d = v == null ? void 0 : v.json) == null ? void 0 : _d["auto-generate-type"]) === "guid") {
-        v.attrvalue = guid || "";
+      if ((_e = v == null ? void 0 : v.json) == null ? void 0 : _e["default"]) {
+        v.attrvalue = (_f = v == null ? void 0 : v.json) == null ? void 0 : _f["default"];
       }
-    }
-    if ((_e = v == null ? void 0 : v.json) == null ? void 0 : _e["default"]) {
-      v.attrvalue = (_f = v == null ? void 0 : v.json) == null ? void 0 : _f["default"];
-    }
-  });
+    });
+  }
   return {
     updatedData: isListToObj ? handleAttrListToObj(updatedData.attr_list || []) : updatedData,
     uploadedFiles
@@ -341,7 +343,7 @@ const handleAttrListToObj = (attrList) => {
   function processLevel(arr) {
     const result = {};
     arr.forEach((item) => {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b, _c, _d;
       const key = `${item.attrid}_${item.attrtype}`;
       if (item.attrtype === 1 && item.children.length > 0 && !Array.isArray(item.children)) {
         result[key] = {
@@ -349,11 +351,35 @@ const handleAttrListToObj = (attrList) => {
           data_list: [processLevel(item.children)]
         };
       } else if (item.attrtype === 1 && item.children.length > 0 && Array.isArray(item.children)) {
-        const { children = [] } = item || {};
+        let { children = [], attrvalue } = item || {};
+        if (attrvalue && (attrvalue == null ? void 0 : attrvalue.length) && Array.isArray(attrvalue)) {
+          children = attrvalue.map((v) => {
+            var _a3, _b2, _c2, _d2;
+            const index = (_a3 = Object.values(v)) == null ? void 0 : _a3.findIndex((y) => Array.isArray(y));
+            const uploadAttrId = ((_b2 = Object.keys(v)) == null ? void 0 : _b2[index]) || "";
+            if (uploadAttrId) {
+              const uploadAttrItem = ((_c2 = children == null ? void 0 : children[0]) == null ? void 0 : _c2.find((z) => z.attrid === uploadAttrId)) || {};
+              const { input } = (uploadAttrItem == null ? void 0 : uploadAttrItem.json) || {};
+              if (["file", "image", "video", "audio"].includes(input)) {
+                const parsedValue = ((_d2 = Object.values(v)) == null ? void 0 : _d2[index]) || [];
+                const existingFiles = parsedValue.filter((file) => file.FileId);
+                const uploadedFileList = parsedValue.filter((file) => {
+                  var _a4;
+                  return file.status === "done" && ((_a4 = file.response) == null ? void 0 : _a4.data);
+                }).map((file) => file.response.data);
+                const allFiles = [...existingFiles, ...uploadedFileList];
+                v[uploadAttrId] = allFiles;
+              }
+            }
+            return handleObjDetailToSignleAttrList((children == null ? void 0 : children[0]) || [], v);
+          });
+        } else {
+          children = [];
+        }
         if ((children == null ? void 0 : children.length) && Array.isArray(children == null ? void 0 : children[0])) {
           result[key] = {
-            asid: ((_e = (_d = (_c = item.children) == null ? void 0 : _c[0]) == null ? void 0 : _d[0]) == null ? void 0 : _e.asid) || "",
-            data_list: item.children.map((child) => {
+            asid: ((_d = (_c = children == null ? void 0 : children[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.asid) || "",
+            data_list: children.map((child) => {
               return processLevel(child);
             })
           };
@@ -503,6 +529,12 @@ const handleSelectOptions = async ({
   }
   return options;
 };
+const handleObjDetailToSignleAttrList = (attrList, detail) => {
+  return attrList.map((item) => ({
+    ...item,
+    attrvalue: detail[item.attrid] || ""
+  }));
+};
 export {
   base64ToString,
   getJson,
@@ -512,6 +544,7 @@ export {
   handleBaseAttrList,
   handleFormConfig,
   handleKebabToCamel,
+  handleObjDetailToSignleAttrList,
   handleOperationFile,
   handleSelectOptions,
   handleSubmitForm,

package/lib/components/DynamicForm/index.js

@@ -31,7 +31,8 @@ const DynamicForm = react.forwardRef((props, ref) => {
     formShowType = "form",
     headerWidth,
     formListItemWidth,
-    formListItemName
+    formListItemName,
+    isEdit = false
   } = props;
   const delFileListRef = react.useRef([]);
   const updateDelFileList = (file) => {
@@ -42,7 +43,6 @@ const DynamicForm = react.forwardRef((props, ref) => {
     uploadAction,
     commonRequest,
     setFormConfig,
-    setAttrList,
     updateDelFileList,
     formConfig,
     interfaceTypeChildren,
@@ -52,7 +52,7 @@ const DynamicForm = react.forwardRef((props, ref) => {
     actionUrlKey,
     actionUrlExtraParams,
     CustomModalComponent,
-    hideAttrList
+    isEdit
   });
   react.useImperativeHandle(ref, () => ({
     getDelFileList: () => {

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

@@ -16,8 +16,7 @@ interface IDynamicFormProps {
     actionUrlKey: string;
     actionUrlExtraParams: object;
     CustomModalComponent?: React.FC<ICustomModal>;
-    setAttrList?: (config: IformConfigItem[]) => void;
-    hideAttrList?: string[];
+    isEdit?: boolean;
 }
 type NestedFormListFieldData = FormListFieldData & {
     parentName?: (string | number)[];

package/lib/components/DynamicForm/useDynamicForm.js

@@ -22,17 +22,14 @@ function useDynamicForm(props) {
     uploadAction,
     commonRequest,
     formConfig,
-    setFormConfig,
     updateDelFileList,
-    interfaceTypeChildren,
     interfaceTypeDict,
     interfaceTypeSysDict,
     relatedidKey,
     actionUrlKey,
     actionUrlExtraParams,
     CustomModalComponent,
-    setAttrList,
-    hideAttrList = []
+    isEdit
   } = props;
   const formConfigRef = react.useRef([]);
   const { message } = antd.App.useApp();
@@ -182,7 +179,6 @@ function useDynamicForm(props) {
         antd.Collapse,
         {
           bordered: false,
-          defaultActiveKey: [itemWithJson.attrid],
           style: { backgroundColor: "transparent" },
           expandIcon: ({ isActive }) => handleCollapseIcon({ isActive }),
           items: [
@@ -211,7 +207,7 @@ function useDynamicForm(props) {
                           style: { width: defaultWidth + 100 },
                           size: "small",
                           title: `${itemWithJson.attrname} ${field.name + 1}`,
-                          extra: /* @__PURE__ */ jsxRuntime.jsx(
+                          extra: !isEdit && /* @__PURE__ */ jsxRuntime.jsx(
                             icons.CloseOutlined,
                             {
                               onClick: () => {
@@ -243,7 +239,7 @@ function useDynamicForm(props) {
                         field.key
                       );
                     }),
-                    /* @__PURE__ */ jsxRuntime.jsx(antd.Flex, { style: { width: 200 }, children: /* @__PURE__ */ jsxRuntime.jsx(antd.Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
+                    !isEdit && /* @__PURE__ */ jsxRuntime.jsx(antd.Flex, { style: { width: 200 }, children: /* @__PURE__ */ jsxRuntime.jsx(antd.Button, { type: "dashed", onClick: () => add(), block: true, children: "+ 新增" }) })
                   ] })
                 }
               )
@@ -271,7 +267,7 @@ function useDynamicForm(props) {
       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))) {
+      if (((_a = itemWithJson.json) == null ? void 0 : _a.hide) === true) {
         return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {});
       }
       if (itemWithJson.attrtype === 1) {
@@ -396,7 +392,7 @@ function useDynamicForm(props) {
       }
       return null;
     },
-    [handleDealInstruction, func.handleSetFormItemInitialValue, handleSetFormItemProps, hideAttrList, renderNestedFormList]
+    [handleDealInstruction, func.handleSetFormItemInitialValue, handleSetFormItemProps, renderNestedFormList]
   );
   const handleOnRemove = async (file) => {
     var _a;

package/lib/components/DynamicFormMobile/index.js

@@ -83,8 +83,8 @@ const DynamicForm = react.forwardRef((props, ref) => {
               justify: "space-between",
               style: {
                 height: 44,
-                width: "calc(100vw - 32px)",
                 marginLeft: 16,
+                marginRight: 16,
                 borderBottom: "1px solid #E3E3E3"
               },
               align: "center",
@@ -109,8 +109,7 @@ const DynamicForm = react.forwardRef((props, ref) => {
               defaultWidth: (formListItemWidth == null ? void 0 : formListItemWidth[index]) || defaultWidth,
               formItemStyle,
               isFormListItem: true,
-              formListField: field,
-              isShowLabel: false
+              formListField: field
             }) }, index);
           }) })
         ]

package/lib/index.js

@@ -15,6 +15,7 @@ const index = "";
 dayjs.locale("zh-cn");
 const Demo = () => {
   react.useEffect(() => {
+    method.handleAttrListToObj(mock.attrList);
   }, []);
   const formRef = react.useRef(null);
   reactVant.Form.useForm();

package/lib/mock/index.js

@@ -5,38 +5,47 @@ const attrList = [
   {
     xh: 1,
     asid: "904A28FACAF346DFA63CBEEB3437BDA8",
+    astype: 0,
+    tname: "tsyy_table",
     attrid: "6970C54A08E54463888CD8F9E7FD851B",
     attrname: "喂药日期",
     attrtype: 0,
     info: '{"input":"multiple-date-picker","range-picker-save":"single","dataType":"string","length":1000}',
     info_base64: 0,
     createtime: "2026-01-05 15:33:36",
+    attrvalue: "",
     serialnum: 1,
-    label_list: []
+    children: []
   },
   {
     xh: 2,
     asid: "904A28FACAF346DFA63CBEEB3437BDA8",
+    astype: 0,
+    tname: "tsyy_table",
     attrid: "98FD46568CAC4F248B5FD66D52DF5086",
     attrname: "当日次数",
     attrtype: 0,
     info: '{"input":"text","dataType":"string","length":1}',
     info_base64: 0,
     createtime: "2026-01-05 15:33:45",
+    attrvalue: "",
     serialnum: 2,
-    label_list: []
+    children: []
   },
   {
     xh: 3,
     asid: "904A28FACAF346DFA63CBEEB3437BDA8",
+    astype: 0,
+    tname: "tsyy_table",
     attrid: "E7C4B706E65E4F81B51AAA9D313B5482",
     attrname: "当日时间",
     attrtype: 0,
     info: '{"input":"mult-select","inputType":"local","data":["09:00","10:00","11:00","12:00","13:00","14:00"],"dataType":"string","length":100}',
     info_base64: 0,
     createtime: "2026-01-05 15:34:22",
+    attrvalue: "",
     serialnum: 3,
-    label_list: []
+    children: []
   }
 ];
 exports.attrList = attrList;

package/lib/utils/method.d.ts

@@ -15,6 +15,7 @@ export declare const handleSubmitForm: (originalData: {
     isMobile?: boolean;
     guid?: string;
     isListToObj?: boolean;
+    isAutoFill?: boolean;
 }, allValues: any) => {
     updatedData: any;
     uploadedFiles: any[];
@@ -120,3 +121,10 @@ export declare const handleSelectOptions: ({ commonRequestWidthParams, commonReq
     actionUrlExtraParams?: object | undefined;
     item: Ijson;
 }) => Promise<any[]>;
+/**
+ * 单层详情数据对应到单个属性集
+ * @param attrList 属性集列表
+ * @param detail 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
+ * @returns 处理后的属性集列表，每个属性项包含attrvalue
+ */
+export declare const handleObjDetailToSignleAttrList: (attrList: any[], detail: any) => any[];