szld-libs 0.2.90 → 0.2.92

package/es/utils/method.js

@@ -1,6 +1,7 @@
 import { message } from "antd";
 import dayjs from "dayjs";
 import _ from "lodash";
+import { handleObjDetailToSignleAttrList } from "./szxkFunc";
 function getJson(jsonStr) {
   try {
     return JSON.parse(jsonStr);
@@ -30,42 +31,32 @@ function isBase64(str) {
 const handleSubmitForm = (originalData, allValues) => {
   let updatedData = _.cloneDeep(originalData);
   let uploadedFiles = [];
-  const processAttrList = (attrList, item) => {
-    var _a;
+  const processAttrList = (attrList) => {
     try {
-      if ((_a = item == null ? void 0 : item.json) == null ? void 0 : _a["properties-multiple"]) {
-        const attrValue = allValues[item.attrid];
-        if (Array.isArray(attrValue)) {
-          const childrenObj = {};
-          attrValue.forEach((item2, index) => {
-            var _a2;
-            childrenObj[index] = _.cloneDeep(attrList);
-            for (const [fieldName, formValue] of Object.entries(item2)) {
-              const attrItem = (_a2 = childrenObj[index]) == null ? void 0 : _a2.find((item3) => item3.attrid === fieldName);
-              handleDealValue(attrItem, formValue);
+      const attrMap = new Map(attrList.map((item, index) => [item.attrid, index]));
+      for (const [fieldName, formValue] of Object.entries(allValues)) {
+        const index = attrMap.get(fieldName);
+        if (index === void 0)
+          continue;
+        const attrItem = attrList[index];
+        if (!formValue && formValue !== 0) {
+          attrItem.attrvalue = "";
+          continue;
+        }
+        handleDealValue(attrItem, formValue);
+      }
+      attrList.forEach((item) => {
+        if (item.children && Array.isArray(item.children) && item.children.length > 0 && !Array.isArray(item.children[0])) {
+          processAttrList(item.children);
+        }
+        if (item.children && Array.isArray(item.children) && item.children.length > 0 && Array.isArray(item.children[0])) {
+          item.children.forEach((v) => {
+            if (v.children && Array.isArray(v.children)) {
+              processAttrList(v.children);
             }
           });
-          item.children = childrenObj;
-        }
-      } else {
-        const attrMap = new Map(attrList.map((item2, index) => [item2.attrid, index]));
-        for (const [fieldName, formValue] of Object.entries(allValues)) {
-          const index = attrMap.get(fieldName);
-          if (index === void 0)
-            continue;
-          const attrItem = attrList[index];
-          if (!formValue && formValue !== 0) {
-            attrItem.attrvalue = "";
-            continue;
-          }
-          handleDealValue(attrItem, formValue);
         }
-        attrList.forEach((item2) => {
-          if (item2.children && Array.isArray(item2.children) && item2.children.length > 0) {
-            processAttrList(item2.children, item2);
-          }
-        });
-      }
+      });
     } catch (error) {
     }
   };
@@ -147,15 +138,21 @@ const handleSubmitForm = (originalData, allValues) => {
     processAttrList(updatedData.attr_list);
   }
   return {
-    updatedData,
+    updatedData: handleAttrListToObj(updatedData.attr_list || []),
     uploadedFiles
   };
 };
 const processChildren = (items, extraAttrs) => {
   return items.map((item) => {
+    var _a, _b, _c;
     const processedItem = processItem(item, extraAttrs);
-    if (processedItem.children && Array.isArray(processedItem.children)) {
-      processedItem.children = processChildren(processedItem.children);
+    const { children } = processedItem;
+    if (children && !Array.isArray(children == null ? void 0 : children[0]) && (children == null ? void 0 : children.length)) {
+      processedItem.children = [processChildren(children)];
+    }
+    if ((processedItem == null ? void 0 : processedItem.children) && Array.isArray((_a = processedItem == null ? void 0 : processedItem.children) == null ? void 0 : _a[0]) && ((_b = processedItem == null ? void 0 : processedItem.children) == null ? void 0 : _b.length)) {
+      const list = (_c = processedItem == null ? void 0 : processedItem.children) == null ? void 0 : _c.map((child) => child == null ? void 0 : child.map((v) => processItem(v)));
+      processedItem.children = list;
     }
     return processedItem;
   });
@@ -208,13 +205,15 @@ const handleAttrList = (attrList, extraAttrs) => {
             combinations: combinationGroups[combinationId]
           }
         };
-        if (processedItem.children && Array.isArray(processedItem.children)) {
-          processedItem.children = filterAndCombine(processedItem.children);
+        const { children: children2 } = processedItem;
+        if (children2 && Array.isArray(children2 == null ? void 0 : children2[0]) && (children2 == null ? void 0 : children2.length)) {
+          processedItem.children = children2 == null ? void 0 : children2.map((child) => filterAndCombine(child));
         }
         return processedItem;
       }
-      if (item.children && Array.isArray(item.children)) {
-        item.children = filterAndCombine(item.children);
+      const { children } = item;
+      if (children && Array.isArray(children == null ? void 0 : children[0]) && (children == null ? void 0 : children.length)) {
+        item.children = children == null ? void 0 : children.map((child) => filterAndCombine(child));
       }
       return item;
     });
@@ -304,13 +303,26 @@ const handleAttrListToObj = (attrList) => {
   function processLevel(arr) {
     const result = {};
     arr.forEach((item) => {
-      var _a2, _b;
+      var _a2, _b, _c, _d, _e;
       const key = `${item.attrid}_${item.attrtype}`;
-      if (item.attrtype === 1 && item.children.length > 0) {
+      if (item.attrtype === 1 && item.children.length > 0 && !Array.isArray(item.children)) {
         result[key] = {
           asid: ((_b = (_a2 = item.children) == null ? void 0 : _a2[0]) == null ? void 0 : _b.asid) || "",
           data_list: [processLevel(item.children)]
         };
+      } else if (item.attrtype === 1 && item.children.length > 0 && Array.isArray(item.children)) {
+        const { attrvalue = [], children = [] } = item || {};
+        if (Array.isArray(attrvalue) && (attrvalue == null ? void 0 : attrvalue.length)) {
+          item.children = attrvalue.map((v) => {
+            return handleObjDetailToSignleAttrList((children == null ? void 0 : children[0]) || [], v);
+          });
+          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) => {
+              return processLevel(child);
+            })
+          };
+        }
       } else {
         result[key] = item.attrvalue;
       }
@@ -359,7 +371,7 @@ const handleAttrListToObjDetail = async ({
       return processedAttrList;
     })
   );
-  return processedDetailList.length === 1 ? processedDetailList[0] : processedDetailList;
+  return processedDetailList || [];
 };
 const handleUrlOptions = (val, delimiter, list) => {
   let arr = [];

package/es/utils/szxkFunc.d.ts

@@ -2,6 +2,8 @@ import { AxiosResponse } from 'axios';
 /**
  * 获取属性集列表
  * @param params
+ * @param commonRequest 通用请求函数
+ * @param interfaceType 接口类型，默认值为'SERATTALLList'
  * @returns
  */
 export declare const handleGetAttrList: (params: {
@@ -14,7 +16,11 @@ export declare const handleGetAttrList: (params: {
  * @param interfaceType 接口类型，默认值为'YLFWLRDataDetails'
  * @returns 属性集详情 {attrid_attrtype: attrvalue} 格式的数据
  */
-export declare const handleGetAttrDetail: (params: any, commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>, interfaceType?: string) => Promise<any>;
+export declare const handleGetAttrDetail: (params: {
+    instanceid: string;
+    asid: string;
+    tname?: string;
+}, commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>, interfaceType?: string) => Promise<any>;
 /**
  * 单层详情数据对应到单个属性集
  * @param attrList 属性集列表

package/lib/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/lib/components/DynamicForm/func.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const dayjs = require("dayjs");
+const antd = require("antd");
 const handleGetPlaceholder = (itemWithJson) => {
   const { input = "" } = itemWithJson.json || {};
   let placeholder = "请输入";
@@ -28,25 +29,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;
     }
@@ -54,13 +46,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);
     }
@@ -81,24 +73,130 @@ 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) {
+        antd.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) {
+        antd.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) {
+      antd.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);
+};
 exports.disabledDate = disabledDate;
 exports.handleGetPlaceholder = handleGetPlaceholder;
+exports.handleGetSingleAttrListObj = handleGetSingleAttrListObj;
+exports.handleSelectOptions = handleSelectOptions;
 exports.handleSetFormItemInitialValue = handleSetFormItemInitialValue;
+exports.handleUrlOptions = handleUrlOptions;

package/lib/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/lib/components/DynamicForm/mySelect/index.js

@@ -1,6 +1,6 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
-const method = require("../../../utils/method");
+const func = require("../func");
 const react = require("react");
 const antd = require("antd");
 const MySelect = ({
@@ -23,7 +23,7 @@ const MySelect = ({
   }, [item.inputType, item.classify, item.data, item.options]);
   const handleLoadOptions = async () => {
     setLoading(true);
-    const list = await method.handleSelectOptions({
+    const list = await func.handleSelectOptions({
       commonRequestWidthParams,
       commonRequest,
       interfaceTypeDict,

package/lib/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;