szld-libs 0.4.26 → 0.4.28

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

@@ -7,13 +7,15 @@ declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, comm
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
     value: string | number | (string | number)[];
-    onChange: (val: string | number | (string | number)[]) => void;
+    onChange: (val: string | number | (string | number)[] | {
+        [key: string]: any;
+    }) => void;
     interfaceTypeDict: string;
     interfaceTypeSysDict: string;
     actionUrlKey: string;
     actionUrlExtraParams: object;
     langId?: string | undefined;
     getTitle?: ((pageID: string, dataID: string) => string) | undefined;
-    attrid?: string | undefined;
+    attrid: string;
 }) => import("react/jsx-runtime").JSX.Element;
 export default MySelect;

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

@@ -1,8 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { handleSelectOptions, handleGetPlaceholder, findRowByValue } from "../func";
+import { handleGetList, handleGetControlPanelConfig } from "../../../utils/szxkFunc";
 import { useState, useEffect } from "react";
 import { message, Select } from "antd";
-import { handleGetList, handleGetControlPanelConfig } from "../../../utils/szxkFunc";
 const MySelect = ({
   item,
   readonly,
@@ -104,6 +104,7 @@ const MySelect = ({
             return prev;
           }, {});
           onChange(newObj);
+          return;
         }
         onChange(val);
       }

package/es/components/DynamicFormMobile/index.d.ts

@@ -18,6 +18,7 @@ export interface IformConfigItem {
 }
 
 export interface Ijson {
+  readonly: boolean; // 是否只读字段
   'auto-generate'?: boolean; // 是否自动生成
   'auto-generate-type'?: string; // 自动生成类型
   'instance-source-number'?: string; // 实例来源编号，配合instance-url使用

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

@@ -1,6 +1,6 @@
 import { Ijson } from '../index.d';
 import { AxiosResponse } from 'axios';
-declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, langId, }: {
+declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, langId, getTitle, attrid, }: {
     item: Ijson;
     readonly?: boolean | undefined;
     style?: any;
@@ -13,5 +13,7 @@ declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, comm
     actionUrlKey: string;
     actionUrlExtraParams: object;
     langId?: string | undefined;
+    getTitle?: ((pageID: string, dataID: string) => string) | undefined;
+    attrid?: string | undefined;
 }) => import("react/jsx-runtime").JSX.Element;
 export default MySelect;

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

@@ -1,8 +1,9 @@
 import { jsx, Fragment, jsxs } from "react/jsx-runtime";
-import { Field, Popup, Checkbox, Picker } from "react-vant";
-import { handleSelectOptions } from "../func";
+import { handleSelectOptions, findRowByValue } from "../../DynamicForm/func";
+import { Toast, Field, Popup, Checkbox, Picker } from "react-vant";
 import { useState, useEffect } from "react";
 import { Flex } from "antd";
+import { handleGetList, handleGetControlPanelConfig } from "../../../utils/szxkFunc";
 const checkboxGroup = "index-module_checkbox-group_4684b";
 const checkboxGroupHeader = "index-module_checkbox-group-header_192bd";
 const checkboxGroupContent = "index-module_checkbox-group-content_f81a1";
@@ -32,9 +33,12 @@ const MySelect = ({
   interfaceTypeSysDict,
   actionUrlKey,
   actionUrlExtraParams,
-  langId
+  langId,
+  getTitle,
+  attrid
 }) => {
   const [options, setOptions] = useState([]);
+  const [instanceList, setInstanceList] = useState([]);
   useEffect(() => {
     if (item.input === "mult-select" && value && Array.isArray(value)) {
       setSelectedValues(value || []);
@@ -45,6 +49,38 @@ const MySelect = ({
     handleLoadOptions();
   }, [item.inputType, item.classify, item.data, item.options]);
   const handleLoadOptions = async () => {
+    if (item.inputType === "instance-url" && (item == null ? void 0 : item["instance-source-number"]) && attrid) {
+      const keyField = item == null ? void 0 : item["key-field"];
+      if (!keyField) {
+        Toast("请配置key-field");
+        return;
+      }
+      const params = {
+        "source-number": item == null ? void 0 : item["instance-source-number"]
+      };
+      let list2 = await handleGetList(params, commonRequestWidthParams);
+      const controlPanelConfig = await handleGetControlPanelConfig(item == null ? void 0 : item["instance-source-number"], commonRequest);
+      if (controlPanelConfig) {
+        const nonUniversalHeader = (controlPanelConfig == null ? void 0 : controlPanelConfig["non-universal-header"]) || [];
+        const labelConfig = (nonUniversalHeader == null ? void 0 : nonUniversalHeader["label"]) || [];
+        const valueConfig = (keyField == null ? void 0 : keyField[attrid]) || {};
+        const options2 = list2 == null ? void 0 : list2.map((v) => {
+          const label = labelConfig == null ? void 0 : labelConfig.map((x) => v == null ? void 0 : v[x]).join("-");
+          const { list: list3, delimiter } = valueConfig;
+          const value2 = list3 == null ? void 0 : list3.map((x) => v == null ? void 0 : v[x]).join(delimiter || "-");
+          if (!label) {
+            return null;
+          }
+          return {
+            label: getTitle == null ? void 0 : getTitle("5000000", label),
+            value: value2
+          };
+        });
+        setOptions(options2);
+        setInstanceList(list2);
+      }
+      return;
+    }
     const list = await handleSelectOptions({
       commonRequestWidthParams,
       commonRequest,
@@ -121,7 +157,22 @@ const MySelect = ({
       columnsFieldNames: {
         text: "label"
       },
-      onConfirm: onChange,
+      onConfirm: (val) => {
+        if (attrid && (instanceList == null ? void 0 : instanceList.length) > 0 && (item == null ? void 0 : item.inputType) === "instance-url") {
+          const keyField = item == null ? void 0 : item["key-field"];
+          const row = findRowByValue(instanceList, String(val));
+          const keys = Object.keys(keyField || {});
+          const newObj = keys == null ? void 0 : keys.reduce((prev, cur) => {
+            const { list, delimiter } = (keyField == null ? void 0 : keyField[cur]) || {};
+            const value2 = list == null ? void 0 : list.map((x) => row == null ? void 0 : row[x]).join(delimiter || "-");
+            prev[cur] = value2;
+            return prev;
+          }, {});
+          onChange(newObj);
+          return;
+        }
+        onChange(val);
+      },
       children: (val, _, actions) => {
         var _a;
         val = val || value;

package/es/components/DynamicFormMobile/useDynamicForm.js

@@ -499,8 +499,17 @@ function useDynamicForm(props) {
             actionUrlKey,
             actionUrlExtraParams,
             langId,
+            getTitle,
+            attrid,
             onChange: (val) => {
-              form.setFieldValue(item.attrid, val);
+              if (typeof val === "object" && !Array.isArray(val)) {
+                form.setFieldsValue({
+                  ...form.getFieldsValue(),
+                  ...val
+                });
+              } else {
+                form.setFieldValue(item.attrid, val);
+              }
             }
           }
         );
@@ -626,7 +635,7 @@ function useDynamicForm(props) {
             value: formatValue,
             type: "multiple",
             onChange: (date) => {
-              form.setFieldValue(item.attrid, date);
+              form.setFieldValue(formItemName, date);
             }
           }
         );

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

@@ -7,13 +7,15 @@ declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, comm
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
     value: string | number | (string | number)[];
-    onChange: (val: string | number | (string | number)[]) => void;
+    onChange: (val: string | number | (string | number)[] | {
+        [key: string]: any;
+    }) => void;
     interfaceTypeDict: string;
     interfaceTypeSysDict: string;
     actionUrlKey: string;
     actionUrlExtraParams: object;
     langId?: string | undefined;
     getTitle?: ((pageID: string, dataID: string) => string) | undefined;
-    attrid?: string | undefined;
+    attrid: string;
 }) => import("react/jsx-runtime").JSX.Element;
 export default MySelect;

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

@@ -1,9 +1,9 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
 const func = require("../func");
+const szxkFunc = require("../../../utils/szxkFunc");
 const react = require("react");
 const antd = require("antd");
-const szxkFunc = require("../../../utils/szxkFunc");
 const MySelect = ({
   item,
   readonly,
@@ -105,6 +105,7 @@ const MySelect = ({
             return prev;
           }, {});
           onChange(newObj);
+          return;
         }
         onChange(val);
       }

package/lib/components/DynamicFormMobile/index.d.ts

@@ -18,6 +18,7 @@ export interface IformConfigItem {
 }
 
 export interface Ijson {
+  readonly: boolean; // 是否只读字段
   'auto-generate'?: boolean; // 是否自动生成
   'auto-generate-type'?: string; // 自动生成类型
   'instance-source-number'?: string; // 实例来源编号，配合instance-url使用

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

@@ -1,6 +1,6 @@
 import { Ijson } from '../index.d';
 import { AxiosResponse } from 'axios';
-declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, langId, }: {
+declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, commonRequest, value, onChange, interfaceTypeDict, interfaceTypeSysDict, actionUrlKey, actionUrlExtraParams, langId, getTitle, attrid, }: {
     item: Ijson;
     readonly?: boolean | undefined;
     style?: any;
@@ -13,5 +13,7 @@ declare const MySelect: ({ item, readonly, style, commonRequestWidthParams, comm
     actionUrlKey: string;
     actionUrlExtraParams: object;
     langId?: string | undefined;
+    getTitle?: ((pageID: string, dataID: string) => string) | undefined;
+    attrid?: string | undefined;
 }) => import("react/jsx-runtime").JSX.Element;
 export default MySelect;

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

@@ -1,9 +1,10 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
+const func = require("../../DynamicForm/func");
 const reactVant = require("react-vant");
-const func = require("../func");
 const react = require("react");
 const antd = require("antd");
+const szxkFunc = require("../../../utils/szxkFunc");
 const checkboxGroup = "index-module_checkbox-group_4684b";
 const checkboxGroupHeader = "index-module_checkbox-group-header_192bd";
 const checkboxGroupContent = "index-module_checkbox-group-content_f81a1";
@@ -33,9 +34,12 @@ const MySelect = ({
   interfaceTypeSysDict,
   actionUrlKey,
   actionUrlExtraParams,
-  langId
+  langId,
+  getTitle,
+  attrid
 }) => {
   const [options, setOptions] = react.useState([]);
+  const [instanceList, setInstanceList] = react.useState([]);
   react.useEffect(() => {
     if (item.input === "mult-select" && value && Array.isArray(value)) {
       setSelectedValues(value || []);
@@ -46,6 +50,38 @@ const MySelect = ({
     handleLoadOptions();
   }, [item.inputType, item.classify, item.data, item.options]);
   const handleLoadOptions = async () => {
+    if (item.inputType === "instance-url" && (item == null ? void 0 : item["instance-source-number"]) && attrid) {
+      const keyField = item == null ? void 0 : item["key-field"];
+      if (!keyField) {
+        reactVant.Toast("请配置key-field");
+        return;
+      }
+      const params = {
+        "source-number": item == null ? void 0 : item["instance-source-number"]
+      };
+      let list2 = await szxkFunc.handleGetList(params, commonRequestWidthParams);
+      const controlPanelConfig = await szxkFunc.handleGetControlPanelConfig(item == null ? void 0 : item["instance-source-number"], commonRequest);
+      if (controlPanelConfig) {
+        const nonUniversalHeader = (controlPanelConfig == null ? void 0 : controlPanelConfig["non-universal-header"]) || [];
+        const labelConfig = (nonUniversalHeader == null ? void 0 : nonUniversalHeader["label"]) || [];
+        const valueConfig = (keyField == null ? void 0 : keyField[attrid]) || {};
+        const options2 = list2 == null ? void 0 : list2.map((v) => {
+          const label = labelConfig == null ? void 0 : labelConfig.map((x) => v == null ? void 0 : v[x]).join("-");
+          const { list: list3, delimiter } = valueConfig;
+          const value2 = list3 == null ? void 0 : list3.map((x) => v == null ? void 0 : v[x]).join(delimiter || "-");
+          if (!label) {
+            return null;
+          }
+          return {
+            label: getTitle == null ? void 0 : getTitle("5000000", label),
+            value: value2
+          };
+        });
+        setOptions(options2);
+        setInstanceList(list2);
+      }
+      return;
+    }
     const list = await func.handleSelectOptions({
       commonRequestWidthParams,
       commonRequest,
@@ -122,7 +158,22 @@ const MySelect = ({
       columnsFieldNames: {
         text: "label"
       },
-      onConfirm: onChange,
+      onConfirm: (val) => {
+        if (attrid && (instanceList == null ? void 0 : instanceList.length) > 0 && (item == null ? void 0 : item.inputType) === "instance-url") {
+          const keyField = item == null ? void 0 : item["key-field"];
+          const row = func.findRowByValue(instanceList, String(val));
+          const keys = Object.keys(keyField || {});
+          const newObj = keys == null ? void 0 : keys.reduce((prev, cur) => {
+            const { list, delimiter } = (keyField == null ? void 0 : keyField[cur]) || {};
+            const value2 = list == null ? void 0 : list.map((x) => row == null ? void 0 : row[x]).join(delimiter || "-");
+            prev[cur] = value2;
+            return prev;
+          }, {});
+          onChange(newObj);
+          return;
+        }
+        onChange(val);
+      },
       children: (val, _, actions) => {
         var _a;
         val = val || value;

package/lib/components/DynamicFormMobile/useDynamicForm.js

@@ -500,8 +500,17 @@ function useDynamicForm(props) {
             actionUrlKey,
             actionUrlExtraParams,
             langId,
+            getTitle,
+            attrid,
             onChange: (val) => {
-              form.setFieldValue(item.attrid, val);
+              if (typeof val === "object" && !Array.isArray(val)) {
+                form.setFieldsValue({
+                  ...form.getFieldsValue(),
+                  ...val
+                });
+              } else {
+                form.setFieldValue(item.attrid, val);
+              }
             }
           }
         );
@@ -627,7 +636,7 @@ function useDynamicForm(props) {
             value: formatValue,
             type: "multiple",
             onChange: (date) => {
-              form.setFieldValue(item.attrid, date);
+              form.setFieldValue(formItemName, date);
             }
           }
         );

package/package.json

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