szld-libs 0.2.56 → 0.2.58

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

@@ -23,7 +23,8 @@ const MyUpload = (props) => {
     uploadText = "上传文件",
     onRemove,
     list = [],
-    uploadType
+    uploadType,
+    relatedidKey
   } = props;
   const { message } = antd.App.useApp();
   const accept = (item == null ? void 0 : item["upload-accept"]) || "*";
@@ -75,7 +76,7 @@ const MyUpload = (props) => {
         accept,
         fileList,
         onPreview: handlePreview,
-        data: { relatedid },
+        data: { [relatedidKey]: relatedid },
         maxCount,
         onChange: handleChange,
         onRemove,

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

@@ -7,8 +7,12 @@ interface IDynamicFormProps {
     uploadAction: (PageName?: string | undefined) => string;
     formConfig?: IformConfigItem[];
     setFormConfig?: (config: IformConfigItem[]) => void;
-    interfaceTypeChildren?: string;
     updateDelFileList: (file: UploadFile) => void;
+    interfaceTypeChildren?: string;
+    interfaceTypeDict: string;
+    relatedidKey: string;
+    actionUrlKey: string;
+    actionUrlExtraParams: object;
 }
 declare function useDynamicForm(props: IDynamicFormProps): {
     handleRenderItem: ({ item, readonly, colNum, instructionShowMode, relatedid, form, defaultWidth, formItemStyle, radioAlign, }: {

package/lib/components/DynamicForm/useDynamicForm.js

@@ -22,8 +22,12 @@ function useDynamicForm(props) {
     commonRequest,
     formConfig,
     setFormConfig,
+    updateDelFileList,
     interfaceTypeChildren,
-    updateDelFileList
+    interfaceTypeDict,
+    relatedidKey,
+    actionUrlKey,
+    actionUrlExtraParams
   } = props;
   const formConfigRef = react.useRef([]);
   const { message } = antd.App.useApp();
@@ -378,6 +382,9 @@ function useDynamicForm(props) {
             commonRequestWidthParams,
             commonRequest,
             value: formatValue,
+            interfaceTypeDict,
+            actionUrlKey,
+            actionUrlExtraParams,
             onChange: (val) => {
               form.setFieldValue(item.attrid, val);
             }
@@ -440,6 +447,9 @@ function useDynamicForm(props) {
             options: params,
             handleUrlOptions,
             value: formatValue,
+            interfaceTypeDict,
+            actionUrlKey,
+            actionUrlExtraParams,
             onChange: (e) => {
               form.setFieldValue(item.attrid, e.target.value);
             }
@@ -457,6 +467,9 @@ function useDynamicForm(props) {
             options: params,
             value: formatValue,
             handleUrlOptions,
+            interfaceTypeDict,
+            actionUrlKey,
+            actionUrlExtraParams,
             onChange: (val) => {
               form.setFieldValue(item.attrid, val.join(","));
             }
@@ -475,6 +488,7 @@ function useDynamicForm(props) {
             list: formatValue,
             readonly,
             relatedid,
+            relatedidKey,
             onRemove: (file) => handleOnRemove(file)
           }
         );
@@ -486,7 +500,10 @@ function useDynamicForm(props) {
             commonRequest,
             item: item.json,
             value: item.attrvalue,
-            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style }
+            style: { width: defaultWidth, ...itemStyle == null ? void 0 : itemStyle.style },
+            interfaceTypeDict,
+            actionUrlKey,
+            actionUrlExtraParams
           }
         );
       case "radio-card":

package/lib/utils/method.d.ts

@@ -1,24 +1,48 @@
 export declare function getJson(jsonStr: string): any;
 export declare function base64ToString(base64Str: string): string;
 export declare function isBase64(str: string): boolean;
+/**
+ * 处理表单提交数据，将表单值合并到原始数据attrvalue中
+ * @param originalData 原始数据
+ * @param allValues 表单提交值
+ * @returns
+ */
 export declare const handleSubmitForm: (originalData: any, allValues: any) => {
     updatedData: any;
     uploadedFiles: any[];
 };
 export declare const handleAttrList: (attrList: any[]) => any[];
-export declare const handleFormConfig: ({ number, key, sourceNumber, guidInterfaceName, SelPCParamInterfaceName, servicerAttrListInterfaceName, accepterAttrListInterfaceName, defaultAttrListInterfaceName, commonRequest, }: {
+export declare const handleFormConfig: ({ number, key, sourceNumber, guidInterfaceName, SelPCParamInterfaceName, servicerAttrListInterfaceName, accepterAttrListInterfaceName, defaultAttrListInterfaceName, commonRequest, guidParams, pcParam, attrReqKey, attrListExtraParams, }: {
     number: string | number;
     key: string;
     guidInterfaceName: string;
     SelPCParamInterfaceName: string;
-    servicerAttrListInterfaceName: string;
-    accepterAttrListInterfaceName: string;
-    defaultAttrListInterfaceName: string;
+    servicerAttrListInterfaceName?: string | undefined;
+    accepterAttrListInterfaceName?: string | undefined;
+    defaultAttrListInterfaceName?: string | undefined;
     sourceNumber?: string | number | undefined;
     commonRequest: any;
+    guidParams?: {
+        [key: string]: any;
+    } | undefined;
+    pcParam?: {
+        [key: string]: any;
+    } | undefined;
+    attrListExtraParams?: {
+        [key: string]: any;
+    } | undefined;
+    attrReqKey?: string | undefined;
 }) => Promise<{
     baseData: any;
     newGUID: string;
     attrListConfigs: any[];
     selPCParam: any;
 }>;
+/**
+ * 保存或者删除文件
+ * @param params 操作文件接口参数
+ * @param data 操作文件接口数据
+ * @param commonRequestWidthParams 操作文件接口请求函数
+ * @returns
+ */
+export declare const handleOperationFile: (params: any, data: any, commonRequestWidthParams: any) => Promise<any>;

package/lib/utils/method.js

@@ -138,33 +138,44 @@ const handleFormConfig = async ({
   servicerAttrListInterfaceName,
   accepterAttrListInterfaceName,
   defaultAttrListInterfaceName,
-  commonRequest
+  commonRequest,
+  guidParams,
+  pcParam,
+  attrReqKey = "asid",
+  attrListExtraParams = {}
 }) => {
   return new Promise(async (resolve, reject) => {
     var _a, _b, _c, _d;
     let newGUID = "", attrListConfigs = [], baseData = {}, selPCParam = {};
-    const guidRes = await commonRequest(guidInterfaceName || "FWDXGLCreateGUID", {
-      "source-number": sourceNumber
-    });
+    const guidRes = await commonRequest(
+      guidInterfaceName || "FWDXGLCreateGUID",
+      guidParams || {
+        "source-number": sourceNumber
+      }
+    );
     if ((guidRes == null ? void 0 : guidRes.ReturnValue) === 1 && ((_a = guidRes == null ? void 0 : guidRes.data) == null ? void 0 : _a.GUID)) {
       newGUID = guidRes.data.GUID;
     } else {
       reject("获取GUID失败");
     }
-    const res = await commonRequest(SelPCParamInterfaceName || "FWDXGLSelPCParam", {
-      "source-number": sourceNumber
-    });
+    const res = await commonRequest(
+      SelPCParamInterfaceName || "FWDXGLSelPCParam",
+      pcParam || {
+        "source-number": sourceNumber
+      }
+    );
     if ((res == null ? void 0 : res.ReturnValue) === 1) {
       const asid = (_b = res.data[number]) == null ? void 0 : _b[key];
       const propertiesType = (_c = res.data[number]) == null ? void 0 : _c["properties-type"];
       const propertiesTypeMap = {
-        server: servicerAttrListInterfaceName,
-        accepter: accepterAttrListInterfaceName
+        server: servicerAttrListInterfaceName || "",
+        accepter: accepterAttrListInterfaceName || ""
       };
       selPCParam = res.data;
       const res2 = await commonRequest(propertiesTypeMap[propertiesType] || defaultAttrListInterfaceName, {
-        asid,
-        "source-number": sourceNumber
+        [attrReqKey]: asid,
+        "source-number": sourceNumber,
+        ...attrListExtraParams
       });
       if ((res2 == null ? void 0 : res2.ReturnValue) === 1 && res2.data) {
         const attrList = ((_d = res2.data) == null ? void 0 : _d["attr_list"]) || [];
@@ -187,9 +198,14 @@ const handleFormConfig = async ({
     }
   });
 };
+const handleOperationFile = async (params, data, commonRequestWidthParams) => {
+  const response = await commonRequestWidthParams(params, data);
+  return response;
+};
 exports.base64ToString = base64ToString;
 exports.getJson = getJson;
 exports.handleAttrList = handleAttrList;
 exports.handleFormConfig = handleFormConfig;
+exports.handleOperationFile = handleOperationFile;
 exports.handleSubmitForm = handleSubmitForm;
 exports.isBase64 = isBase64;

package/package.json

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