fix: 替换完成

yaklang · Dec 6, 2023 · bfc6c29 · bfc6c29
1 parent 546a513
commit bfc6c29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/app/main/handlers/payloads.js b/app/main/handlers/payloads.js
@@ -176,6 +176,12 @@ module.exports = (win, getClient) => {
         let stream = getClient().GetAllPayloadFromFile(params)
         handlerHelper.registerHandler(win, stream, streamPayloadFromFileMap, token)
     })
+    const streamAllPayloadMap = new Map()
+    ipcMain.handle("cancel-GetAllPayload", handlerHelper.cancelHandler(streamAllPayloadMap))
+    ipcMain.handle("GetAllPayload", async (e, params, token) => {
+        let stream = getClient().GetAllPayload(params)
+        handlerHelper.registerHandler(win, stream, streamAllPayloadMap, token)
+    })
 
     // 用于去重
     const streamRemoveDuplicateMap = new Map()
@@ -256,20 +262,4 @@ module.exports = (win, getClient) => {
     ipcMain.handle("UpdatePayloadToFile", async (e, params) => {
         return await asyncUpdatePayloadToFile(params)
     })
-
-    const asyncGetAllPayload = (params) => {
-        return new Promise((resolve, reject) => {
-            getClient().GetAllPayload(params, (err, data) => {
-                if (err) {
-                    reject(err)
-                    return
-                }
-                resolve(data)
-            })
-        })
-    }
-    // 用于导出
-    ipcMain.handle("GetAllPayload", async (e, params) => {
-        return await asyncGetAllPayload(params)
-    })
 }
diff --git a/app/renderer/src/main/src/pages/payloadManager/newPayload.tsx b/app/renderer/src/main/src/pages/payloadManager/newPayload.tsx
@@ -2934,14 +2934,15 @@ export const ExportByGrpc: React.FC<ExportByGrpcProps> = (props) => {
             })
             .then((data: any) => {
                 if (data.filePaths.length) {
-                    let absolutePath = data.filePaths[0].replace(/\\/g, "\\")
-                    exportPathRef.current = absolutePath
+                    let absolutePath:string = data.filePaths[0].replace(/\\/g, "\\")
+                    let currentPath:string  = `${absolutePath}\\${group}.${isFile?"txt":'csv'}`
+                    exportPathRef.current = currentPath
                     ipcRenderer.invoke(
                         isFile ? "GetAllPayloadFromFile" : "GetAllPayload",
                         {
                             Group: group,
                             Folder: folder,
-                            savePath: absolutePath
+                            savePath: currentPath
                         },
                         exportToken
                     )
@@ -2953,7 +2954,7 @@ export const ExportByGrpc: React.FC<ExportByGrpcProps> = (props) => {
     })
     // 取消导出任务
     const cancelExportFile = useMemoizedFn(() => {
-        ipcRenderer.invoke("cancel-GetAllPayloadFromFile", exportToken)
+        ipcRenderer.invoke(isFile ? "cancel-GetAllPayloadFromFile":"cancel-GetAllPayload", exportToken)
     })
 
     const onExportStreamData = useThrottleFn(
@@ -2982,12 +2983,12 @@ export const ExportByGrpc: React.FC<ExportByGrpcProps> = (props) => {
             exportPathRef.current && openABSFileLocated(exportPathRef.current)
         })
         return () => {
-            ipcRenderer.invoke("cancel-GetAllPayloadFromFile", exportToken)
+            ipcRenderer.invoke(isFile ? "cancel-GetAllPayloadFromFile":"cancel-GetAllPayload", exportToken)
             ipcRenderer.removeAllListeners(`${exportToken}-data`)
             ipcRenderer.removeAllListeners(`${exportToken}-error`)
             ipcRenderer.removeAllListeners(`${exportToken}-end`)
         }
-    }, [group])
+    }, [])
     return (
         <YakitModal
             centered
@@ -3006,12 +3007,8 @@ export const ExportByGrpc: React.FC<ExportByGrpcProps> = (props) => {
                     cancelExportFile()
                     setExportVisible(false)
                 }}
-                onClose={() => {
-                    setExportVisible(false)
-                }}
                 logInfo={[]}
                 showDownloadDetail={false}
-                autoClose={true}
             />
         </YakitModal>
     )