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 = ({ }) => { { uncheck(e); setOpen1(false) }} - setInstallExe={(i, t) => { setInstallExe(i, t) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen2(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen3(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen4(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen5(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen6(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen2(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen3(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen4(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen5(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen6(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> {/* 专用核心密码管理分系统--弹窗 */} - setOpen7(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen8(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen9(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen7(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + + { uncheck(e); setOpen8(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + + { uncheck(e); setOpen9(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> {/* 一体化密码机--弹窗 */} - setOpen11(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> - setOpen12(false)} setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + { uncheck(e); setOpen11(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> + + { uncheck(e); setOpen12(false) }} + setInstallExe={(i, t) => { setInstallExe(i, t) }} /> ) }