szld-libs 0.2.77 → 0.2.80

package/es/components/DynamicForm/mySelect/index.d.ts

@@ -1,10 +1,9 @@
 import { Ijson } from '../index.d';
 import { AxiosResponse } from 'axios';
-declare const MySelect: ({ item, readonly, style, handleUrlOptions, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, }: {
+declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, }: {
     item: Ijson;
     readonly?: boolean | undefined;
     style?: any;
-    handleUrlOptions: (val: any, delimiter: string, list: any[]) => string;
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
     value: string | number | (string | number)[];

package/es/components/DynamicForm/mySelect/index.js

@@ -1,11 +1,11 @@
 import { jsx } from "react/jsx-runtime";
+import { handleSelectOptions } from "../../../utils/method";
 import { useState, useEffect } from "react";
-import { App, Select } from "antd";
+import { Select } from "antd";
 const MySelect = ({
   item,
   readonly,
   style,
-  handleUrlOptions,
   commonRequestWidthParams,
   commonRequest,
   value,
@@ -15,100 +15,24 @@ const MySelect = ({
   actionUrlKey,
   actionUrlExtraParams
 }) => {
-  const { message } = App.useApp();
   const [options, setOptions] = useState([]);
   const [loading, setLoading] = useState(false);
   useEffect(() => {
     handleLoadOptions();
   }, [item.inputType, item.classify, item.data, item.options]);
   const handleLoadOptions = async () => {
-    var _a, _b;
-    if (item.inputType === "local") {
-      let localOptions = [];
-      if (item.data && Array.isArray(item.data)) {
-        localOptions = item.data.map((val) => ({
-          label: val,
-          value: val
-        }));
-      } else if (item.options && Array.isArray(item.options)) {
-        localOptions = item.options;
-      }
-      setOptions(localOptions);
-    } else if (item.inputType === "dictionary") {
-      getDict(interfaceTypeDict);
-    } else if (item.inputType === "system-dictionary") {
-      getDict(interfaceTypeSysDict);
-    } else if (item.inputType === "url" && (item == null ? void 0 : item["action-url"])) {
-      try {
-        const keyFieldList = ((_a = item == null ? void 0 : item["key-field"]) == null ? void 0 : _a.list) || [];
-        const delimiter = ((_b = item == null ? void 0 : item["key-field"]) == null ? void 0 : _b.delimiter) || "";
-        if (!keyFieldList.length) {
-          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;
-          }
-          const urlOptions = urlData.map((val) => ({
-            label: handleUrlOptions(val, delimiter, keyFieldList),
-            value: handleUrlOptions(val, delimiter, keyFieldList)
-          }));
-          setOptions([...urlOptions]);
-        }
-      } catch (error) {
-      }
-    } else {
-      let defaultOptions = [];
-      if (item.data && Array.isArray(item.data)) {
-        defaultOptions = item.data.map((val) => ({
-          label: val,
-          value: val
-        }));
-      } else if (item.options && Array.isArray(item.options)) {
-        defaultOptions = item.options;
-      }
-      setOptions(defaultOptions);
-    }
-  };
-  const getDict = async (interfaceType) => {
-    var _a;
-    if (item.classify) {
-      setLoading(true);
-      try {
-        const response = await commonRequest(interfaceType, {
-          asctypeid: item.classify
-        });
-        if (((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.list) && Array.isArray(response.data.list)) {
-          const dictionaryOptions = response.data.list.map((dictItem) => ({
-            label: `${dictItem.dicid || ""}-${dictItem.info || ""}`,
-            value: `${dictItem.dicid || ""}-${dictItem.info || ""}`
-          }));
-          setOptions(dictionaryOptions);
-        }
-      } catch (error) {
-        message.error("加载选项失败");
-      } finally {
-        setLoading(false);
-      }
-    }
+    setLoading(true);
+    const list = await handleSelectOptions({
+      commonRequestWidthParams,
+      commonRequest,
+      interfaceTypeDict,
+      interfaceTypeSysDict,
+      actionUrlKey,
+      actionUrlExtraParams,
+      item
+    });
+    setOptions(list);
+    setLoading(false);
   };
   return /* @__PURE__ */ jsx(
     Select,

package/es/components/DynamicForm/useDynamicForm.js

@@ -1,6 +1,6 @@
 import { jsx, Fragment, jsxs } from "react/jsx-runtime";
 import { handleSetFormItemInitialValue, handleGetPlaceholder, disabledDate } from "./func";
-import { handleAttrList, getJson, base64ToString } from "../../utils/method";
+import { handleAttrList, handleUrlOptions, getJson, base64ToString } from "../../utils/method";
 import { useRef, useEffect, useCallback, Fragment as Fragment$1 } from "react";
 import isoWeek from "dayjs/plugin/isoWeek";
 import SelectModel from "./selectModel";
@@ -41,13 +41,6 @@ function useDynamicForm(props) {
     }
     formConfigRef.current = formConfig;
   }, [formConfig]);
-  const handleUrlOptions = (val, delimiter, list) => {
-    let arr = [];
-    list.forEach((item) => {
-      arr.push(val == null ? void 0 : val[item]);
-    });
-    return arr.join(delimiter || "-");
-  };
   const handleNormFile = useCallback((e) => {
     if (Array.isArray(e)) {
       return e;
@@ -528,7 +521,6 @@ function useDynamicForm(props) {
         return /* @__PURE__ */ jsx(
           MySelect,
           {
-            handleUrlOptions,
             item: item.json,
             readonly,
             style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth },

package/es/utils/method.d.ts

@@ -1,3 +1,5 @@
+import { Ijson } from '../components/DynamicForm/index.d';
+import { AxiosResponse } from 'axios';
 export declare function getJson(jsonStr: string): any;
 export declare function base64ToString(base64Str: string): string;
 export declare function isBase64(str: string): boolean;
@@ -67,8 +69,41 @@ 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[]) => any;
+export declare const handleAttrListToObj: (attrList: any[], num?: number) => any;
+/**
+ * 详情属性集列表合并详情数据
+ * @param param0
+ * @returns
+ */
+export declare const handleAttrListToObjDetail: ({ attrList, detail, extra, }: {
+    attrList: any[];
+    detail: {
+        [key: string]: any;
+    };
+    extra?: {
+        [key: string]: any;
+    } | undefined;
+}) => any[];
+/**
+ * 处理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[]>;

package/es/utils/method.js

@@ -1,3 +1,4 @@
+import { message } from "antd";
 import dayjs from "dayjs";
 import _ from "lodash";
 function getJson(jsonStr) {
@@ -298,7 +299,7 @@ function handleKebabToCamel(str) {
     return letter.toUpperCase();
   });
 }
-const handleAttrListToObj = (attrList) => {
+const handleAttrListToObj = (attrList, num) => {
   var _a;
   const result = {
     data: {
@@ -313,12 +314,19 @@ const handleAttrListToObj = (attrList) => {
     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: [],
+        data_list_obj: {}
       };
       item.children.forEach((child) => {
-        attrItem[key].data_list[child.attrid] = child.attrvalue || "";
+        attrItem[key].data_list_obj[child.attrid] = child.attrvalue || "";
       });
-      attrItem[key].data_list = [attrItem[key].data_list];
+      if (num && num > 1) {
+        for (let i = 0; i < num; i++) {
+          attrItem[key].data_list.push(attrItem[key].data_list_obj);
+        }
+      } else {
+        attrItem[key].data_list.push(attrItem[key].data_list_obj);
+      }
     } else {
       attrItem[key] = item.attrvalue || "";
     }
@@ -330,15 +338,124 @@ const handleAttrListToObj = (attrList) => {
   result.data.data_list = [Object.assign({}, ...result.data.data_list)];
   return result;
 };
+const handleAttrListToObjDetail = ({
+  attrList,
+  detail,
+  extra
+}) => {
+  return attrList == null ? void 0 : attrList.map((v) => ({
+    ...v,
+    ...extra,
+    attrvalue: (detail == null ? void 0 : detail[v.attrid]) || ""
+  }));
+};
+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) {
+        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) {
+        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) {
+      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;
+};
 export {
   base64ToString,
   getJson,
   handleAttrList,
   handleAttrListToObj,
+  handleAttrListToObjDetail,
   handleBaseAttrList,
   handleFormConfig,
   handleKebabToCamel,
   handleOperationFile,
+  handleSelectOptions,
   handleSubmitForm,
+  handleUrlOptions,
   isBase64
 };

package/lib/components/DynamicForm/mySelect/index.d.ts

@@ -1,10 +1,9 @@
 import { Ijson } from '../index.d';
 import { AxiosResponse } from 'axios';
-declare const MySelect: ({ item, readonly, style, handleUrlOptions, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, }: {
+declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, }: {
     item: Ijson;
     readonly?: boolean | undefined;
     style?: any;
-    handleUrlOptions: (val: any, delimiter: string, list: any[]) => string;
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
     value: string | number | (string | number)[];

package/lib/components/DynamicForm/mySelect/index.js

@@ -1,12 +1,12 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
+const method = require("../../../utils/method");
 const react = require("react");
 const antd = require("antd");
 const MySelect = ({
   item,
   readonly,
   style,
-  handleUrlOptions,
   commonRequestWidthParams,
   commonRequest,
   value,
@@ -16,100 +16,24 @@ const MySelect = ({
   actionUrlKey,
   actionUrlExtraParams
 }) => {
-  const { message } = antd.App.useApp();
   const [options, setOptions] = react.useState([]);
   const [loading, setLoading] = react.useState(false);
   react.useEffect(() => {
     handleLoadOptions();
   }, [item.inputType, item.classify, item.data, item.options]);
   const handleLoadOptions = async () => {
-    var _a, _b;
-    if (item.inputType === "local") {
-      let localOptions = [];
-      if (item.data && Array.isArray(item.data)) {
-        localOptions = item.data.map((val) => ({
-          label: val,
-          value: val
-        }));
-      } else if (item.options && Array.isArray(item.options)) {
-        localOptions = item.options;
-      }
-      setOptions(localOptions);
-    } else if (item.inputType === "dictionary") {
-      getDict(interfaceTypeDict);
-    } else if (item.inputType === "system-dictionary") {
-      getDict(interfaceTypeSysDict);
-    } else if (item.inputType === "url" && (item == null ? void 0 : item["action-url"])) {
-      try {
-        const keyFieldList = ((_a = item == null ? void 0 : item["key-field"]) == null ? void 0 : _a.list) || [];
-        const delimiter = ((_b = item == null ? void 0 : item["key-field"]) == null ? void 0 : _b.delimiter) || "";
-        if (!keyFieldList.length) {
-          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;
-          }
-          const urlOptions = urlData.map((val) => ({
-            label: handleUrlOptions(val, delimiter, keyFieldList),
-            value: handleUrlOptions(val, delimiter, keyFieldList)
-          }));
-          setOptions([...urlOptions]);
-        }
-      } catch (error) {
-      }
-    } else {
-      let defaultOptions = [];
-      if (item.data && Array.isArray(item.data)) {
-        defaultOptions = item.data.map((val) => ({
-          label: val,
-          value: val
-        }));
-      } else if (item.options && Array.isArray(item.options)) {
-        defaultOptions = item.options;
-      }
-      setOptions(defaultOptions);
-    }
-  };
-  const getDict = async (interfaceType) => {
-    var _a;
-    if (item.classify) {
-      setLoading(true);
-      try {
-        const response = await commonRequest(interfaceType, {
-          asctypeid: item.classify
-        });
-        if (((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.list) && Array.isArray(response.data.list)) {
-          const dictionaryOptions = response.data.list.map((dictItem) => ({
-            label: `${dictItem.dicid || ""}-${dictItem.info || ""}`,
-            value: `${dictItem.dicid || ""}-${dictItem.info || ""}`
-          }));
-          setOptions(dictionaryOptions);
-        }
-      } catch (error) {
-        message.error("加载选项失败");
-      } finally {
-        setLoading(false);
-      }
-    }
+    setLoading(true);
+    const list = await method.handleSelectOptions({
+      commonRequestWidthParams,
+      commonRequest,
+      interfaceTypeDict,
+      interfaceTypeSysDict,
+      actionUrlKey,
+      actionUrlExtraParams,
+      item
+    });
+    setOptions(list);
+    setLoading(false);
   };
   return /* @__PURE__ */ jsxRuntime.jsx(
     antd.Select,

package/lib/components/DynamicForm/useDynamicForm.js

@@ -42,13 +42,6 @@ function useDynamicForm(props) {
     }
     formConfigRef.current = formConfig;
   }, [formConfig]);
-  const handleUrlOptions = (val, delimiter, list) => {
-    let arr = [];
-    list.forEach((item) => {
-      arr.push(val == null ? void 0 : val[item]);
-    });
-    return arr.join(delimiter || "-");
-  };
   const handleNormFile = react.useCallback((e) => {
     if (Array.isArray(e)) {
       return e;
@@ -529,7 +522,6 @@ function useDynamicForm(props) {
         return /* @__PURE__ */ jsxRuntime.jsx(
           MySelect,
           {
-            handleUrlOptions,
             item: item.json,
             readonly,
             style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style, ...customWidth },
@@ -624,7 +616,7 @@ function useDynamicForm(props) {
             item: item.json,
             readonly,
             options: params,
-            handleUrlOptions,
+            handleUrlOptions: method.handleUrlOptions,
             value: formatValue,
             interfaceTypeDict,
             interfaceTypeSysDict,
@@ -646,7 +638,7 @@ function useDynamicForm(props) {
             readonly,
             options: params,
             value: formatValue,
-            handleUrlOptions,
+            handleUrlOptions: method.handleUrlOptions,
             interfaceTypeDict,
             interfaceTypeSysDict,
             actionUrlKey,

package/lib/utils/method.d.ts

@@ -1,3 +1,5 @@
+import { Ijson } from '../components/DynamicForm/index.d';
+import { AxiosResponse } from 'axios';
 export declare function getJson(jsonStr: string): any;
 export declare function base64ToString(base64Str: string): string;
 export declare function isBase64(str: string): boolean;
@@ -67,8 +69,41 @@ 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[]) => any;
+export declare const handleAttrListToObj: (attrList: any[], num?: number) => any;
+/**
+ * 详情属性集列表合并详情数据
+ * @param param0
+ * @returns
+ */
+export declare const handleAttrListToObjDetail: ({ attrList, detail, extra, }: {
+    attrList: any[];
+    detail: {
+        [key: string]: any;
+    };
+    extra?: {
+        [key: string]: any;
+    } | undefined;
+}) => any[];
+/**
+ * 处理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[]>;