szld-libs 0.2.84 → 0.2.86

package/es/utils/method.d.ts

@@ -69,7 +69,7 @@ export declare const handleOperationFile: (params: any, data: any, commonRequest
  */
 export declare function handleKebabToCamel(str: string): string;
 /**
- * 处理属性列表为目标格式
+ * 提交实例化时处理属性列表为提交嵌套格式
  * @param {Array} attrList 原始属性列表
  * @returns {Object} 目标格式的data对象
  */
@@ -81,24 +81,27 @@ export declare const handleAttrListToObj: (attrList: any[]) => {
 };
 /**
  * 详情属性集列表合并详情数据
+ * commonRequest,
+ * commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+ *
  * @param param0
  * @returns
  */
-export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, extra, }: {
+export declare const handleAttrListToObjDetail: ({ attrList, params, extra, commonRequest, }: {
     attrList: any[];
     params: any;
     extra?: {
         [key: string]: any;
     } | undefined;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
-}) => Promise<any[]>;
+}) => Promise<any>;
 /**
- * 处理URL选项
+ * 处理URL选项  根据远程接口获取下拉、单选、多选数据
  * 将URL中的指定字段拼接为字符串
  */
 export declare const handleUrlOptions: (val: any, delimiter: string, list: any[]) => string;
 /**
- * 根据配置处理成下拉数据
+ * 根据属性项配置处理成下拉数据
  * @param param0
  * @returns
  */

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,29 +329,37 @@ const handleAttrListToObj = (attrList) => {
 const handleAttrListToObjDetail = async ({
   attrList,
   params,
-  commonRequest,
-  extra = {}
+  extra = {},
+  commonRequest
 }) => {
-  var _a, _b;
+  var _a;
   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 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;
-    })) || []
+  const detailList = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [];
+  if (!detailList.length) {
+    return attrList.map((v) => ({ ...v, ...extra, attrvalue: "", children: [] }));
+  }
+  const processedDetailList = await Promise.all(
+    detailList.map(async (detail) => {
+      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;
+    })
   );
-  return processedAttrList;
+  return processedDetailList.length === 1 ? processedDetailList[0] : processedDetailList;
 };
 const handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/es/utils/szxkFunc.d.ts

@@ -0,0 +1,16 @@
+import { AxiosResponse } from 'axios';
+/**
+ *
+ * @param params 请求参数
+ * @param commonRequest 通用请求函数
+ * @param interfaceType 接口类型，默认值为'YLFWLRDataDetails'
+ * @returns 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
+ */
+export declare const handleGetArrtDetail: (params: any, commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>, interfaceType?: string) => Promise<any>;
+/**
+ * 单层详情数据对应到单个属性集
+ * @param attrList 属性集列表
+ * @param detail 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
+ * @returns 处理后的属性集列表，每个属性项包含attrvalue
+ */
+export declare const handleObjDetailToSignleAttrList: (attrList: any[], detail: any) => any[];

package/es/utils/szxkFunc.js

@@ -0,0 +1,21 @@
+const handleGetArrtDetail = async (params, commonRequest, interfaceType) => {
+  var _a;
+  try {
+    const res = await commonRequest(interfaceType || "YLFWLRDataDetails", params);
+    if ((res == null ? void 0 : res.ReturnValue) === 1) {
+      return ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [];
+    }
+    return [];
+  } catch (error) {
+  }
+};
+const handleObjDetailToSignleAttrList = (attrList, detail) => {
+  return attrList.map((item) => ({
+    ...item,
+    attrvalue: detail[item.attrid] || ""
+  }));
+};
+export {
+  handleGetArrtDetail,
+  handleObjDetailToSignleAttrList
+};

package/lib/utils/method.d.ts

@@ -69,7 +69,7 @@ export declare const handleOperationFile: (params: any, data: any, commonRequest
  */
 export declare function handleKebabToCamel(str: string): string;
 /**
- * 处理属性列表为目标格式
+ * 提交实例化时处理属性列表为提交嵌套格式
  * @param {Array} attrList 原始属性列表
  * @returns {Object} 目标格式的data对象
  */
@@ -81,24 +81,27 @@ export declare const handleAttrListToObj: (attrList: any[]) => {
 };
 /**
  * 详情属性集列表合并详情数据
+ * commonRequest,
+ * commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+ *
  * @param param0
  * @returns
  */
-export declare const handleAttrListToObjDetail: ({ attrList, params, commonRequest, extra, }: {
+export declare const handleAttrListToObjDetail: ({ attrList, params, extra, commonRequest, }: {
     attrList: any[];
     params: any;
     extra?: {
         [key: string]: any;
     } | undefined;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
-}) => Promise<any[]>;
+}) => Promise<any>;
 /**
- * 处理URL选项
+ * 处理URL选项  根据远程接口获取下拉、单选、多选数据
  * 将URL中的指定字段拼接为字符串
  */
 export declare const handleUrlOptions: (val: any, delimiter: string, list: any[]) => string;
 /**
- * 根据配置处理成下拉数据
+ * 根据属性项配置处理成下拉数据
  * @param param0
  * @returns
  */

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,29 +331,37 @@ const handleAttrListToObj = (attrList) => {
 const handleAttrListToObjDetail = async ({
   attrList,
   params,
-  commonRequest,
-  extra = {}
+  extra = {},
+  commonRequest
 }) => {
-  var _a, _b;
+  var _a;
   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 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;
-    })) || []
+  const detailList = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [];
+  if (!detailList.length) {
+    return attrList.map((v) => ({ ...v, ...extra, attrvalue: "", children: [] }));
+  }
+  const processedDetailList = await Promise.all(
+    detailList.map(async (detail) => {
+      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;
+    })
   );
-  return processedAttrList;
+  return processedDetailList.length === 1 ? processedDetailList[0] : processedDetailList;
 };
 const handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/lib/utils/szxkFunc.d.ts

@@ -0,0 +1,16 @@
+import { AxiosResponse } from 'axios';
+/**
+ *
+ * @param params 请求参数
+ * @param commonRequest 通用请求函数
+ * @param interfaceType 接口类型，默认值为'YLFWLRDataDetails'
+ * @returns 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
+ */
+export declare const handleGetArrtDetail: (params: any, commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>, interfaceType?: string) => Promise<any>;
+/**
+ * 单层详情数据对应到单个属性集
+ * @param attrList 属性集列表
+ * @param detail 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
+ * @returns 处理后的属性集列表，每个属性项包含attrvalue
+ */
+export declare const handleObjDetailToSignleAttrList: (attrList: any[], detail: any) => any[];

package/lib/utils/szxkFunc.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const handleGetArrtDetail = async (params, commonRequest, interfaceType) => {
+  var _a;
+  try {
+    const res = await commonRequest(interfaceType || "YLFWLRDataDetails", params);
+    if ((res == null ? void 0 : res.ReturnValue) === 1) {
+      return ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [];
+    }
+    return [];
+  } catch (error) {
+  }
+};
+const handleObjDetailToSignleAttrList = (attrList, detail) => {
+  return attrList.map((item) => ({
+    ...item,
+    attrvalue: detail[item.attrid] || ""
+  }));
+};
+exports.handleGetArrtDetail = handleGetArrtDetail;
+exports.handleObjDetailToSignleAttrList = handleObjDetailToSignleAttrList;

package/package.json

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