szld-libs 0.2.83 → 0.2.85

package/es/utils/method.d.ts

@@ -84,7 +84,7 @@ export declare const handleAttrListToObj: (attrList: any[]) => {
  * @param param0
  * @returns
  */
-export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, }: {
+export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, extra, }: {
     attrList: any[];
     params: any;
     extra?: {

package/es/utils/method.js

@@ -32,10 +32,6 @@ const handleSubmitForm = (originalData, allValues) => {
   let uploadedFiles = [];
   const processAttrList = (attrList, item) => {
     var _a;
-    if (!(item == null ? void 0 : item.json)) {
-      message.error("item?.json不能为空,请使用handleAttrList方法处理初始化渲染表单数据");
-      return;
-    }
     try {
       if ((_a = item == null ? void 0 : item.json) == null ? void 0 : _a["properties-multiple"]) {
         const attrValue = allValues[item.attrid];
@@ -333,26 +329,29 @@ const handleAttrListToObj = (attrList) => {
 const handleAttrListToObjDetail = async ({
   attrList,
   params,
-  commonRequest
+  commonRequest,
+  extra = {}
 }) => {
   var _a, _b;
   const res = await commonRequest("YLFWLRDataDetails", params);
-  const detail = (_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b[0];
-  const attr_list = attrList == null ? void 0 : attrList.map((v) => {
-    var _a2;
-    if (v.attrtype === 1 && ((_a2 = v == null ? void 0 : v.children) == null ? void 0 : _a2.length) && detail) {
-      handleAttrListToObjDetail({
-        attrList: (v == null ? void 0 : v.children) || [],
-        params: (detail == null ? void 0 : detail[v.attrid]) || {},
-        commonRequest
-      });
-    }
-    return {
-      ...v,
-      attrvalue: (detail == null ? void 0 : detail[v.attrid]) || ""
-    };
-  });
-  return attr_list;
+  const detail = ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b[0]) || {};
+  const processedAttrList = await Promise.all(
+    (attrList == null ? void 0 : attrList.map(async (v) => {
+      const currentItem = { ...v, ...extra };
+      currentItem.attrvalue = (detail == null ? void 0 : detail[v.attrid]) || "";
+      if (v.attrtype === 1 && Array.isArray(v.children) && v.children.length > 0) {
+        const childParams = (detail == null ? void 0 : detail[v.attrid]) || {};
+        currentItem.children = await handleAttrListToObjDetail({
+          attrList: v.children,
+          params: childParams,
+          extra,
+          commonRequest
+        });
+      }
+      return currentItem;
+    })) || []
+  );
+  return processedAttrList;
 };
 const handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/lib/utils/method.d.ts

@@ -84,7 +84,7 @@ export declare const handleAttrListToObj: (attrList: any[]) => {
  * @param param0
  * @returns
  */
-export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, }: {
+export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, extra, }: {
     attrList: any[];
     params: any;
     extra?: {

package/lib/utils/method.js

@@ -34,10 +34,6 @@ const handleSubmitForm = (originalData, allValues) => {
   let uploadedFiles = [];
   const processAttrList = (attrList, item) => {
     var _a;
-    if (!(item == null ? void 0 : item.json)) {
-      antd.message.error("item?.json不能为空,请使用handleAttrList方法处理初始化渲染表单数据");
-      return;
-    }
     try {
       if ((_a = item == null ? void 0 : item.json) == null ? void 0 : _a["properties-multiple"]) {
         const attrValue = allValues[item.attrid];
@@ -335,26 +331,29 @@ const handleAttrListToObj = (attrList) => {
 const handleAttrListToObjDetail = async ({
   attrList,
   params,
-  commonRequest
+  commonRequest,
+  extra = {}
 }) => {
   var _a, _b;
   const res = await commonRequest("YLFWLRDataDetails", params);
-  const detail = (_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b[0];
-  const attr_list = attrList == null ? void 0 : attrList.map((v) => {
-    var _a2;
-    if (v.attrtype === 1 && ((_a2 = v == null ? void 0 : v.children) == null ? void 0 : _a2.length) && detail) {
-      handleAttrListToObjDetail({
-        attrList: (v == null ? void 0 : v.children) || [],
-        params: (detail == null ? void 0 : detail[v.attrid]) || {},
-        commonRequest
-      });
-    }
-    return {
-      ...v,
-      attrvalue: (detail == null ? void 0 : detail[v.attrid]) || ""
-    };
-  });
-  return attr_list;
+  const detail = ((_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) == null ? void 0 : _b[0]) || {};
+  const processedAttrList = await Promise.all(
+    (attrList == null ? void 0 : attrList.map(async (v) => {
+      const currentItem = { ...v, ...extra };
+      currentItem.attrvalue = (detail == null ? void 0 : detail[v.attrid]) || "";
+      if (v.attrtype === 1 && Array.isArray(v.children) && v.children.length > 0) {
+        const childParams = (detail == null ? void 0 : detail[v.attrid]) || {};
+        currentItem.children = await handleAttrListToObjDetail({
+          attrList: v.children,
+          params: childParams,
+          extra,
+          commonRequest
+        });
+      }
+      return currentItem;
+    })) || []
+  );
+  return processedAttrList;
 };
 const handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "szld-libs",
   "private": false,
-  "version": "0.2.83",
+  "version": "0.2.85",
   "type": "module",
   "scripts": {
     "dev": "vite",