szld-libs 0.2.80 → 0.2.82

package/es/utils/method.d.ts

@@ -69,25 +69,29 @@ 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对象
  */
-export declare const handleAttrListToObj: (attrList: any[], num?: number) => any;
+export declare const handleAttrListToObj: (attrList: any[]) => {
+    data: {
+        asid: any;
+        data_list: any[];
+    };
+};
 /**
  * 详情属性集列表合并详情数据
  * @param param0
  * @returns
  */
-export declare const handleAttrListToObjDetail: ({ attrList, detail, extra, }: {
+export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, }: {
     attrList: any[];
-    detail: {
-        [key: string]: any;
-    };
+    params: any;
     extra?: {
         [key: string]: any;
     } | undefined;
-}) => any[];
+    commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+}) => Promise<any[]>;
 /**
  * 处理URL选项
  * 将URL中的指定字段拼接为字符串

package/es/utils/method.js

@@ -32,6 +32,9 @@ const handleSubmitForm = (originalData, allValues) => {
   let uploadedFiles = [];
   const processAttrList = (attrList, item) => {
     var _a;
+    if (!(item == null ? void 0 : item.json)) {
+      attrList = handleBaseAttrList(attrList);
+    }
     try {
       if ((_a = item == null ? void 0 : item.json) == null ? void 0 : _a["properties-multiple"]) {
         const attrValue = allValues[item.attrid];
@@ -299,55 +302,56 @@ function handleKebabToCamel(str) {
     return letter.toUpperCase();
   });
 }
-const handleAttrListToObj = (attrList, num) => {
+const handleAttrListToObj = (attrList) => {
   var _a;
-  const result = {
-    data: {
-      asid: ((_a = attrList[0]) == null ? void 0 : _a.asid) || "",
-      data_list: []
-    }
-  };
-  const processItem2 = (item) => {
-    var _a2;
-    const attrItem = {};
-    const key = `${item.attrid}_${item.attrtype}`;
-    if (item.children && item.children.length > 0 && item.attrtype == 1) {
-      attrItem[key] = {
-        asid: ((_a2 = item.children[0]) == null ? void 0 : _a2.asid) || "",
-        data_list: [],
-        data_list_obj: {}
-      };
-      item.children.forEach((child) => {
-        attrItem[key].data_list_obj[child.attrid] = child.attrvalue || "";
-      });
-      if (num && num > 1) {
-        for (let i = 0; i < num; i++) {
-          attrItem[key].data_list.push(attrItem[key].data_list_obj);
-        }
+  function processLevel(arr) {
+    const result = {};
+    arr.forEach((item) => {
+      var _a2, _b;
+      const key = `${item.attrid}_${item.attrtype}`;
+      if (item.attrtype === 1 && item.children.length > 0) {
+        result[key] = {
+          asid: ((_b = (_a2 = item.children) == null ? void 0 : _a2[0]) == null ? void 0 : _b.asid) || "",
+          data_list: [processLevel(item.children)]
+        };
       } else {
-        attrItem[key].data_list.push(attrItem[key].data_list_obj);
+        result[key] = item.attrvalue;
       }
-    } else {
-      attrItem[key] = item.attrvalue || "";
+    });
+    return result;
+  }
+  const asid = ((_a = attrList[0]) == null ? void 0 : _a.asid) || "";
+  const dataList = [processLevel(attrList)];
+  return {
+    data: {
+      asid,
+      data_list: dataList
     }
-    return attrItem;
   };
-  attrList.forEach((item) => {
-    result.data.data_list.push(processItem2(item));
-  });
-  result.data.data_list = [Object.assign({}, ...result.data.data_list)];
-  return result;
 };
-const handleAttrListToObjDetail = ({
+const handleAttrListToObjDetail = async ({
   attrList,
-  detail,
-  extra
+  params,
+  commonRequest
 }) => {
-  return attrList == null ? void 0 : attrList.map((v) => ({
-    ...v,
-    ...extra,
-    attrvalue: (detail == null ? void 0 : detail[v.attrid]) || ""
-  }));
+  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 handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/lib/utils/method.d.ts

@@ -69,25 +69,29 @@ 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对象
  */
-export declare const handleAttrListToObj: (attrList: any[], num?: number) => any;
+export declare const handleAttrListToObj: (attrList: any[]) => {
+    data: {
+        asid: any;
+        data_list: any[];
+    };
+};
 /**
  * 详情属性集列表合并详情数据
  * @param param0
  * @returns
  */
-export declare const handleAttrListToObjDetail: ({ attrList, detail, extra, }: {
+export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, }: {
     attrList: any[];
-    detail: {
-        [key: string]: any;
-    };
+    params: any;
     extra?: {
         [key: string]: any;
     } | undefined;
-}) => any[];
+    commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+}) => Promise<any[]>;
 /**
  * 处理URL选项
  * 将URL中的指定字段拼接为字符串

package/lib/utils/method.js

@@ -34,6 +34,9 @@ const handleSubmitForm = (originalData, allValues) => {
   let uploadedFiles = [];
   const processAttrList = (attrList, item) => {
     var _a;
+    if (!(item == null ? void 0 : item.json)) {
+      attrList = handleBaseAttrList(attrList);
+    }
     try {
       if ((_a = item == null ? void 0 : item.json) == null ? void 0 : _a["properties-multiple"]) {
         const attrValue = allValues[item.attrid];
@@ -301,55 +304,56 @@ function handleKebabToCamel(str) {
     return letter.toUpperCase();
   });
 }
-const handleAttrListToObj = (attrList, num) => {
+const handleAttrListToObj = (attrList) => {
   var _a;
-  const result = {
-    data: {
-      asid: ((_a = attrList[0]) == null ? void 0 : _a.asid) || "",
-      data_list: []
-    }
-  };
-  const processItem2 = (item) => {
-    var _a2;
-    const attrItem = {};
-    const key = `${item.attrid}_${item.attrtype}`;
-    if (item.children && item.children.length > 0 && item.attrtype == 1) {
-      attrItem[key] = {
-        asid: ((_a2 = item.children[0]) == null ? void 0 : _a2.asid) || "",
-        data_list: [],
-        data_list_obj: {}
-      };
-      item.children.forEach((child) => {
-        attrItem[key].data_list_obj[child.attrid] = child.attrvalue || "";
-      });
-      if (num && num > 1) {
-        for (let i = 0; i < num; i++) {
-          attrItem[key].data_list.push(attrItem[key].data_list_obj);
-        }
+  function processLevel(arr) {
+    const result = {};
+    arr.forEach((item) => {
+      var _a2, _b;
+      const key = `${item.attrid}_${item.attrtype}`;
+      if (item.attrtype === 1 && item.children.length > 0) {
+        result[key] = {
+          asid: ((_b = (_a2 = item.children) == null ? void 0 : _a2[0]) == null ? void 0 : _b.asid) || "",
+          data_list: [processLevel(item.children)]
+        };
       } else {
-        attrItem[key].data_list.push(attrItem[key].data_list_obj);
+        result[key] = item.attrvalue;
       }
-    } else {
-      attrItem[key] = item.attrvalue || "";
+    });
+    return result;
+  }
+  const asid = ((_a = attrList[0]) == null ? void 0 : _a.asid) || "";
+  const dataList = [processLevel(attrList)];
+  return {
+    data: {
+      asid,
+      data_list: dataList
     }
-    return attrItem;
   };
-  attrList.forEach((item) => {
-    result.data.data_list.push(processItem2(item));
-  });
-  result.data.data_list = [Object.assign({}, ...result.data.data_list)];
-  return result;
 };
-const handleAttrListToObjDetail = ({
+const handleAttrListToObjDetail = async ({
   attrList,
-  detail,
-  extra
+  params,
+  commonRequest
 }) => {
-  return attrList == null ? void 0 : attrList.map((v) => ({
-    ...v,
-    ...extra,
-    attrvalue: (detail == null ? void 0 : detail[v.attrid]) || ""
-  }));
+  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 handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/package.json

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