From cba4b0de6281c837d676a129d53ab9bfd9c806a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E8=AA=89=E7=A8=8B?= <2659568239@qq.com>
Date: Fri, 19 Jan 2024 16:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/InstallExe/exeDialog/CodeDriver.tsx |  2 +-
 src/pages/InstallExe/exeDialog/CodeManage.tsx |  4 +-
 src/pages/InstallExe/exeDialog/CoreArea.tsx   |  4 +-
 .../InstallExe/exeDialog/DeviceDriver.tsx     |  2 +-
 src/pages/InstallExe/exeDialog/DutyArea.tsx   |  4 +-
 .../InstallExe/exeDialog/FlashPlayer.tsx      |  2 +-
 .../InstallExe/exeDialog/HGoogleEarth.tsx     |  2 +-
 src/pages/InstallExe/exeDialog/MSXML.tsx      |  2 +-
 src/pages/InstallExe/exeDialog/Net.tsx        |  2 +-
 src/pages/InstallExe/exeDialog/NetSP1.tsx     |  2 +-
 src/pages/InstallExe/index.tsx                | 55 +++++++++++++++----
 11 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/pages/InstallExe/exeDialog/CodeDriver.tsx b/src/pages/InstallExe/exeDialog/CodeDriver.tsx
index c14bfbe..8dc32bd 100644
--- a/src/pages/InstallExe/exeDialog/CodeDriver.tsx
+++ b/src/pages/InstallExe/exeDialog/CodeDriver.tsx
@@ -4,7 +4,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/CodeManage.tsx b/src/pages/InstallExe/exeDialog/CodeManage.tsx
index 4b58d35..16e1c47 100644
--- a/src/pages/InstallExe/exeDialog/CodeManage.tsx
+++ b/src/pages/InstallExe/exeDialog/CodeManage.tsx
@@ -1,13 +1,13 @@
 import React, { FC, useEffect, useState } from 'react';
 import styles from './index.less';
 import { Input, Progress, message } from 'antd';
-import { countType, setInstallExe } from '@/utils';
+import { countType } from '@/utils';
 import { useParams } from 'umi';
 import DEV from '@/utils/env/dev';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/CoreArea.tsx b/src/pages/InstallExe/exeDialog/CoreArea.tsx
index ffe5f5a..ef82030 100644
--- a/src/pages/InstallExe/exeDialog/CoreArea.tsx
+++ b/src/pages/InstallExe/exeDialog/CoreArea.tsx
@@ -1,13 +1,13 @@
 import React, { FC, useEffect, useState } from 'react';
 import styles from './index.less';
 import { Input, Progress, message } from 'antd';
-import { countType, setInstallExe, sysType } from '@/utils';
+import { countType, sysType } from '@/utils';
 import { useParams } from 'umi';
 import DEV from '@/utils/env/dev';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/DeviceDriver.tsx b/src/pages/InstallExe/exeDialog/DeviceDriver.tsx
index 1dc9705..d7b9ef1 100644
--- a/src/pages/InstallExe/exeDialog/DeviceDriver.tsx
+++ b/src/pages/InstallExe/exeDialog/DeviceDriver.tsx
@@ -5,7 +5,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/DutyArea.tsx b/src/pages/InstallExe/exeDialog/DutyArea.tsx
index 498833b..d50e44b 100644
--- a/src/pages/InstallExe/exeDialog/DutyArea.tsx
+++ b/src/pages/InstallExe/exeDialog/DutyArea.tsx
@@ -1,13 +1,13 @@
 import React, { FC, useEffect, useState } from 'react';
 import styles from './index.less';
 import { Input, Progress, message } from 'antd';
-import { countType, setInstallExe, sysType } from '@/utils';
+import { countType, sysType } from '@/utils';
 import { useParams } from 'umi';
 import DEV from '@/utils/env/dev';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/FlashPlayer.tsx b/src/pages/InstallExe/exeDialog/FlashPlayer.tsx
index d84460f..2cb70f5 100644
--- a/src/pages/InstallExe/exeDialog/FlashPlayer.tsx
+++ b/src/pages/InstallExe/exeDialog/FlashPlayer.tsx
@@ -4,7 +4,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/HGoogleEarth.tsx b/src/pages/InstallExe/exeDialog/HGoogleEarth.tsx
index e7f2b10..5a96020 100644
--- a/src/pages/InstallExe/exeDialog/HGoogleEarth.tsx
+++ b/src/pages/InstallExe/exeDialog/HGoogleEarth.tsx
@@ -4,7 +4,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/MSXML.tsx b/src/pages/InstallExe/exeDialog/MSXML.tsx
index 8631c0d..fa3a5b7 100644
--- a/src/pages/InstallExe/exeDialog/MSXML.tsx
+++ b/src/pages/InstallExe/exeDialog/MSXML.tsx
@@ -4,7 +4,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/Net.tsx b/src/pages/InstallExe/exeDialog/Net.tsx
index 101ab29..0fe71e9 100644
--- a/src/pages/InstallExe/exeDialog/Net.tsx
+++ b/src/pages/InstallExe/exeDialog/Net.tsx
@@ -4,7 +4,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/exeDialog/NetSP1.tsx b/src/pages/InstallExe/exeDialog/NetSP1.tsx
index b7b7570..b62fe0d 100644
--- a/src/pages/InstallExe/exeDialog/NetSP1.tsx
+++ b/src/pages/InstallExe/exeDialog/NetSP1.tsx
@@ -4,7 +4,7 @@ import { Input, Progress, message } from 'antd';
 
 interface PageProps {
   open: boolean;
-  onCancel: () => void;
+  onCancel: (name?: string) => void;
   setInstallExe: (index: number, text: string) => void;
 }
 
diff --git a/src/pages/InstallExe/index.tsx b/src/pages/InstallExe/index.tsx
index 6fc2769..d231466 100644
--- a/src/pages/InstallExe/index.tsx
+++ b/src/pages/InstallExe/index.tsx
@@ -222,22 +222,55 @@ const InstallExe: FC<PageProps> = ({ }) => {
       <GBase
         open={open1}
         onCancel={(e) => { uncheck(e); setOpen1(false) }}
-        setInstallExe={(i, t) => { setInstallExe(i, t) }} 
+        setInstallExe={(i, t) => { setInstallExe(i, t) }}
       />
-      <HGoogleEarth open={open2} onCancel={() => setOpen2(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <MSXML open={open3} onCancel={() => setOpen3(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <FlashPlayer open={open4} onCancel={() => setOpen4(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <Net open={open5} onCancel={() => setOpen5(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <NetSP1 open={open6} onCancel={() => setOpen6(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <HGoogleEarth
+        open={open2}
+        onCancel={(e) => { uncheck(e); setOpen2(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <MSXML
+        open={open3}
+        onCancel={(e) => { uncheck(e); setOpen3(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <FlashPlayer
+        open={open4}
+        onCancel={(e) => { uncheck(e); setOpen4(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <Net
+        open={open5}
+        onCancel={(e) => { uncheck(e); setOpen5(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <NetSP1
+        open={open6}
+        onCancel={(e) => { uncheck(e); setOpen6(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
 
       {/* 专用核心密码管理分系统--弹窗 */}
-      <CoreArea open={open7} onCancel={() => setOpen7(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <DutyArea open={open8} onCancel={() => setOpen8(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <DeviceDriver open={open9} onCancel={() => setOpen9(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <CoreArea
+        open={open7}
+        onCancel={(e) => { uncheck(e); setOpen7(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+
+      <DutyArea
+        open={open8}
+        onCancel={(e) => { uncheck(e); setOpen8(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+
+      <DeviceDriver
+        open={open9}
+        onCancel={(e) => { uncheck(e); setOpen9(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
 
       {/* 一体化密码机--弹窗 */}
-      <CodeManage open={open11} onCancel={() => setOpen11(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
-      <CodeDriver open={open12} onCancel={() => setOpen12(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+      <CodeManage 
+        open={open11} 
+        onCancel={(e) => { uncheck(e); setOpen11(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
+
+      <CodeDriver
+        open={open12}
+        onCancel={(e) => { uncheck(e); setOpen12(false) }}
+        setInstallExe={(i, t) => { setInstallExe(i, t) }} />
     </div>
   )
 }