szld-libs 0.3.80 → 0.3.82

package/lib/hooks/useUniversalTable.d.ts

@@ -29,7 +29,7 @@ declare function useUniversalTable(): {
         formItems: import("szld-libs/lib/components/CreateForm").CreateFormItemProps<import("szld-libs/lib/components/CreateForm").ValueType>[];
         selList: any[];
     }>;
-    handleUniversalDelete: ({ commonRequest, refresh, interfaceType, record, configData, title, okText, cancelText, getTitle, pageID, }: {
+    handleUniversalDelete: ({ commonRequest, refresh, interfaceType, record, configData, title, okText, cancelText, getTitle, pageID, deleteItem, }: {
         commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
         refresh: () => void;
         interfaceType?: string | undefined;
@@ -40,7 +40,8 @@ declare function useUniversalTable(): {
         cancelText?: string | undefined;
         getTitle?: ((pageID: string, dataID: string, defaultTitle?: string) => string) | undefined;
         pageID?: string | undefined;
-    }) => void;
+        deleteItem?: Record<string, any> | undefined;
+    }) => Promise<void>;
     handleUniversalSearch: ({ values, currentSelList, currentActive, onSearch, tabItems, }: {
         values: any;
         currentSelList: any[];

package/lib/hooks/useUniversalTable.js

@@ -206,7 +206,6 @@ function useUniversalTable() {
           formItemProps: { style: { marginBottom: 10, minWidth: 127 } }
         });
       }
-      ;
       return { formItems, selList: selListData };
     } catch (error) {
       return { formItems: [], selList: [] };
@@ -308,7 +307,7 @@ function useUniversalTable() {
       return numA - numB;
     });
   };
-  const handleUniversalDelete = ({
+  const handleUniversalDelete = async ({
     commonRequest,
     refresh,
     interfaceType = "YLFWLRInstanceDelete",
@@ -318,41 +317,59 @@ function useUniversalTable() {
     okText,
     cancelText,
     getTitle,
-    pageID
+    pageID,
+    deleteItem
   }) => {
-    const mustAttrid = (configData == null ? void 0 : configData["must-attrid"]) || [];
-    const obj = {};
-    for (const [key, value] of Object.entries(record)) {
-      if (mustAttrid.includes(key)) {
-        obj[key] = value;
-      }
-    }
-    const params = {
-      instanceid: record == null ? void 0 : record.instanceid,
-      asid: record == null ? void 0 : record.asid,
-      ...obj
-    };
-    modal.confirm({
-      title: title || "",
-      icon: null,
-      okType: "danger",
-      okText: okText || "",
-      cancelText: cancelText || "",
-      onOk: () => {
-        return new Promise(async (resolve, reject) => {
-          const res = await commonRequest(interfaceType, params);
-          const msg = getTitle && getTitle(pageID || "", res == null ? void 0 : res["msg-code"], res == null ? void 0 : res.msg) || "删除失败";
-          if ((res == null ? void 0 : res.ReturnValue) === 1) {
-            message.success(msg);
-            refresh();
-            resolve(res);
-          } else {
-            message.error(msg || "删除失败");
-            reject(res);
-          }
+    var _a, _b;
+    try {
+      let mustAttrid = (configData == null ? void 0 : configData["must-attrid"]) || [];
+      const sourceNumber = (deleteItem == null ? void 0 : deleteItem["source-number"]) || "";
+      if (!(mustAttrid == null ? void 0 : mustAttrid.length) && sourceNumber) {
+        const res = await commonRequest("YLKHDSelPCParam", {
+          "source-number": Number(sourceNumber)
         });
+        if (res && res.ReturnValue === 1 && res.data) {
+          mustAttrid = ((_b = (_a = res.data) == null ? void 0 : _a["sourceNumber"]) == null ? void 0 : _b["must-attrid"]) || [];
+        }
       }
-    });
+      if (!(mustAttrid == null ? void 0 : mustAttrid.length)) {
+        message.error("请先配置must-attrid");
+        return;
+      }
+      const obj = {};
+      for (const [key, value] of Object.entries(record)) {
+        if (mustAttrid.includes(key)) {
+          obj[key] = value;
+        }
+      }
+      const params = {
+        instanceid: record == null ? void 0 : record.instanceid,
+        asid: record == null ? void 0 : record.asid,
+        ...obj
+      };
+      modal.confirm({
+        title: title || "",
+        icon: null,
+        okType: "danger",
+        okText: okText || "",
+        cancelText: cancelText || "",
+        onOk: () => {
+          return new Promise(async (resolve, reject) => {
+            const res = await commonRequest(interfaceType, params);
+            const msg = getTitle && getTitle(pageID || "", res == null ? void 0 : res["msg-code"], res == null ? void 0 : res.msg) || "删除失败";
+            if ((res == null ? void 0 : res.ReturnValue) === 1) {
+              message.success(msg);
+              refresh();
+              resolve(res);
+            } else {
+              message.error(msg || "删除失败");
+              reject(res);
+            }
+          });
+        }
+      });
+    } catch (error) {
+    }
   };
   const handleUniversalSearch = ({
     values,

package/package.json

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