szld-libs 0.3.67 → 0.3.68

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

@@ -18,6 +18,7 @@ export interface IformConfigItem {
 }
 
 export interface Ijson {
+  'instance-source-number'?: string; // 实例来源编号，配合instance-url使用
   'max-tag-count'?: number; // 最大标签数量
   readonly: boolean; // 是否只读属性
   'field-names'?: string; // 级联选择的自定义字段名
@@ -47,7 +48,7 @@ export interface Ijson {
   'modal-height'?: number;
   //代表弹窗列表表头内容
   'modal-field-list'?: { [key: string]: string }; // 键值对，键为属性名，值为属性显示的列表表头内容
-  inputType?: 'local' | 'dictionary' | 'url' | 'system-dictionary';
+  inputType?: 'local' | 'dictionary' | 'url' | 'system-dictionary' | 'instance-url';
   data?: string[];
   //代表调用【字典管理系统】的值
   classify?: number | string | undefined;

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

@@ -13,6 +13,7 @@ interface SelectModelProps {
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
     CustomModalComponent?: React.FC<ICustomModal>;
+    getTitle?: (pageID: string, dataID: string) => string;
     attrid: string;
     form: FormInstance;
     langId?: string;

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

@@ -2,8 +2,20 @@ import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { Form, App, Select, Table, Modal } from "antd";
 import { useState, useEffect } from "react";
 import { handleGetPlaceholder } from "../func";
+import useUniversalTable from "../../../hooks/useUniversalTable";
 function SelectModel(props) {
-  const { item, disabled, style, commonRequestWidthParams, CustomModalComponent, attrid, form, langId } = props;
+  const {
+    item,
+    disabled,
+    style,
+    commonRequestWidthParams,
+    commonRequest,
+    CustomModalComponent,
+    attrid,
+    form,
+    langId,
+    getTitle
+  } = props;
   const attrValue = Form.useWatch(attrid, form);
   const { message } = App.useApp();
   const mode = item.input;
@@ -18,7 +30,8 @@ function SelectModel(props) {
   });
   const [dataSource, setDataSource] = useState([]);
   const [total, setTotal] = useState(0);
-  const columns = buildColumns();
+  const [columns, setColumns] = useState(buildColumns());
+  const { handleUniversalHeaderToColumns } = useUniversalTable();
   useEffect(() => {
     if (!modalVisible) {
       return;
@@ -30,7 +43,7 @@ function SelectModel(props) {
     setSelectedRecords(selectedRows);
   };
   const getData = async () => {
-    var _a;
+    var _a, _b;
     if (item.inputType === "url" && (item == null ? void 0 : item["action-url"])) {
       setLoading(true);
       try {
@@ -69,6 +82,38 @@ function SelectModel(props) {
       }
       return;
     }
+    if (item.inputType === "instance-url" && (item == null ? void 0 : item["instance-source-number"])) {
+      const defaultRequestParams = {
+        PageName: "PCInstanceData",
+        Controlname: "List",
+        InterfaceType: "YLFWLRDataList"
+      };
+      const _params = {
+        "source-number": item == null ? void 0 : item["instance-source-number"],
+        ...params
+      };
+      try {
+        const res = await commonRequestWidthParams(defaultRequestParams, _params);
+        if ((res == null ? void 0 : res.ReturnValue) === 1) {
+          setDataSource(((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list) || []);
+        }
+        const config = await commonRequest("YLKHDSelPCParam", {
+          "source-number": item == null ? void 0 : item["instance-source-number"]
+        });
+        if ((config == null ? void 0 : config.ReturnValue) === 1) {
+          const configData = config == null ? void 0 : config.data;
+          const universalHeader = (configData == null ? void 0 : configData["universal-header"]) || [];
+          const attributeSetId = (configData == null ? void 0 : configData["attribute-set-id"]) || "";
+          const list = handleUniversalHeaderToColumns({
+            universalHeader,
+            attributeSetId,
+            getTitle
+          }) || [];
+          setColumns(list);
+        }
+      } catch (error) {
+      }
+    }
     message.error(langId === "10001" ? "参数配置错误" : "Parameter configuration error");
   };
   const openModal = () => {
@@ -122,6 +167,9 @@ function SelectModel(props) {
   };
   function buildColumns() {
     const modalFieldList = item["modal-field-list"];
+    if (!modalFieldList) {
+      return [];
+    }
     let columns2 = [];
     for (let fieldName in modalFieldList) {
       let title = modalFieldList[fieldName];

package/es/components/DynamicForm/useDynamicForm.d.ts

@@ -18,6 +18,7 @@ interface IDynamicFormProps {
     isEdit?: boolean;
     formShowType?: 'form' | 'table';
     langId?: string;
+    getTitle?: (pageID: string, dataID: string) => string;
 }
 type NestedFormListFieldData = FormListFieldData & {
     parentName?: (string | number)[];

package/es/components/DynamicForm/useDynamicForm.js

@@ -30,7 +30,8 @@ function useDynamicForm(props) {
     CustomModalComponent,
     isEdit,
     formShowType = "form",
-    langId
+    langId,
+    getTitle
   } = props;
   const formConfigRef = useRef([]);
   const { message } = App.useApp();
@@ -556,6 +557,7 @@ function useDynamicForm(props) {
             item: item.json,
             form,
             attrid,
+            getTitle,
             value: item.attrvalue || item.json.default || "",
             commonRequestWidthParams,
             commonRequest,

package/es/hooks/useUniversalTable.d.ts

@@ -6,7 +6,7 @@ declare function useUniversalTable(): {
         extraBtn?: ((record: any, content: string, item: any) => ReactNode) | undefined;
         operationColumnConfig?: any;
         attributeSetId?: string | undefined;
-        getTitle?: ((commonId: string, code: string) => string) | undefined;
+        getTitle?: ((pageID: string, dataID: string) => string) | undefined;
         downloadText?: string | undefined;
         isDefaultWidth?: boolean | undefined;
         otherLangPageId?: string | undefined;

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

@@ -18,6 +18,7 @@ export interface IformConfigItem {
 }
 
 export interface Ijson {
+  'instance-source-number'?: string; // 实例来源编号，配合instance-url使用
   'max-tag-count'?: number; // 最大标签数量
   readonly: boolean; // 是否只读属性
   'field-names'?: string; // 级联选择的自定义字段名
@@ -47,7 +48,7 @@ export interface Ijson {
   'modal-height'?: number;
   //代表弹窗列表表头内容
   'modal-field-list'?: { [key: string]: string }; // 键值对，键为属性名，值为属性显示的列表表头内容
-  inputType?: 'local' | 'dictionary' | 'url' | 'system-dictionary';
+  inputType?: 'local' | 'dictionary' | 'url' | 'system-dictionary' | 'instance-url';
   data?: string[];
   //代表调用【字典管理系统】的值
   classify?: number | string | undefined;

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

@@ -13,6 +13,7 @@ interface SelectModelProps {
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
     CustomModalComponent?: React.FC<ICustomModal>;
+    getTitle?: (pageID: string, dataID: string) => string;
     attrid: string;
     form: FormInstance;
     langId?: string;

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

@@ -4,8 +4,20 @@ const jsxRuntime = require("react/jsx-runtime");
 const antd = require("antd");
 const react = require("react");
 const func = require("../func");
+const useUniversalTable = require("../../../hooks/useUniversalTable");
 function SelectModel(props) {
-  const { item, disabled, style, commonRequestWidthParams, CustomModalComponent, attrid, form, langId } = props;
+  const {
+    item,
+    disabled,
+    style,
+    commonRequestWidthParams,
+    commonRequest,
+    CustomModalComponent,
+    attrid,
+    form,
+    langId,
+    getTitle
+  } = props;
   const attrValue = antd.Form.useWatch(attrid, form);
   const { message } = antd.App.useApp();
   const mode = item.input;
@@ -20,7 +32,8 @@ function SelectModel(props) {
   });
   const [dataSource, setDataSource] = react.useState([]);
   const [total, setTotal] = react.useState(0);
-  const columns = buildColumns();
+  const [columns, setColumns] = react.useState(buildColumns());
+  const { handleUniversalHeaderToColumns } = useUniversalTable();
   react.useEffect(() => {
     if (!modalVisible) {
       return;
@@ -32,7 +45,7 @@ function SelectModel(props) {
     setSelectedRecords(selectedRows);
   };
   const getData = async () => {
-    var _a;
+    var _a, _b;
     if (item.inputType === "url" && (item == null ? void 0 : item["action-url"])) {
       setLoading(true);
       try {
@@ -71,6 +84,38 @@ function SelectModel(props) {
       }
       return;
     }
+    if (item.inputType === "instance-url" && (item == null ? void 0 : item["instance-source-number"])) {
+      const defaultRequestParams = {
+        PageName: "PCInstanceData",
+        Controlname: "List",
+        InterfaceType: "YLFWLRDataList"
+      };
+      const _params = {
+        "source-number": item == null ? void 0 : item["instance-source-number"],
+        ...params
+      };
+      try {
+        const res = await commonRequestWidthParams(defaultRequestParams, _params);
+        if ((res == null ? void 0 : res.ReturnValue) === 1) {
+          setDataSource(((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list) || []);
+        }
+        const config = await commonRequest("YLKHDSelPCParam", {
+          "source-number": item == null ? void 0 : item["instance-source-number"]
+        });
+        if ((config == null ? void 0 : config.ReturnValue) === 1) {
+          const configData = config == null ? void 0 : config.data;
+          const universalHeader = (configData == null ? void 0 : configData["universal-header"]) || [];
+          const attributeSetId = (configData == null ? void 0 : configData["attribute-set-id"]) || "";
+          const list = handleUniversalHeaderToColumns({
+            universalHeader,
+            attributeSetId,
+            getTitle
+          }) || [];
+          setColumns(list);
+        }
+      } catch (error) {
+      }
+    }
     message.error(langId === "10001" ? "参数配置错误" : "Parameter configuration error");
   };
   const openModal = () => {
@@ -124,6 +169,9 @@ function SelectModel(props) {
   };
   function buildColumns() {
     const modalFieldList = item["modal-field-list"];
+    if (!modalFieldList) {
+      return [];
+    }
     let columns2 = [];
     for (let fieldName in modalFieldList) {
       let title = modalFieldList[fieldName];

package/lib/components/DynamicForm/useDynamicForm.d.ts

@@ -18,6 +18,7 @@ interface IDynamicFormProps {
     isEdit?: boolean;
     formShowType?: 'form' | 'table';
     langId?: string;
+    getTitle?: (pageID: string, dataID: string) => string;
 }
 type NestedFormListFieldData = FormListFieldData & {
     parentName?: (string | number)[];

package/lib/components/DynamicForm/useDynamicForm.js

@@ -31,7 +31,8 @@ function useDynamicForm(props) {
     CustomModalComponent,
     isEdit,
     formShowType = "form",
-    langId
+    langId,
+    getTitle
   } = props;
   const formConfigRef = react.useRef([]);
   const { message } = antd.App.useApp();
@@ -557,6 +558,7 @@ function useDynamicForm(props) {
             item: item.json,
             form,
             attrid,
+            getTitle,
             value: item.attrvalue || item.json.default || "",
             commonRequestWidthParams,
             commonRequest,

package/lib/hooks/useUniversalTable.d.ts

@@ -6,7 +6,7 @@ declare function useUniversalTable(): {
         extraBtn?: ((record: any, content: string, item: any) => ReactNode) | undefined;
         operationColumnConfig?: any;
         attributeSetId?: string | undefined;
-        getTitle?: ((commonId: string, code: string) => string) | undefined;
+        getTitle?: ((pageID: string, dataID: string) => string) | undefined;
         downloadText?: string | undefined;
         isDefaultWidth?: boolean | undefined;
         otherLangPageId?: string | undefined;

package/package.json

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