[Fix] fix modal cannot close (#3264)

Co-authored-by: Zzm0809 <[email protected]>
DataLinkDC · Mar 9, 2024 · 53e72f1 · 53e72f1
1 parent 1129b69
commit 53e72f1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/dinky-web/src/pages/RegCenter/GitProject/components/BuildSteps/index.tsx b/dinky-web/src/pages/RegCenter/GitProject/components/BuildSteps/index.tsx
@@ -239,7 +239,17 @@ export const BuildSteps: React.FC<BuildStepsProps> = (props) => {
    * render
    */
   return (
-    <Modal title={title} width={'85%'} open={true} maskClosable={false} footer={footerButtons}>
+    <Modal
+      title={title}
+      width={'85%'}
+      open={true}
+      maskClosable={false}
+      destroyOnClose
+      centered
+      closable={false}
+      onCancel={() => handleCancel()}
+      footer={footerButtons}
+    >
       <AutoSteps
         steps={steps}
         percent={percent}

diff --git a/dinky-web/src/pages/RegCenter/GitProject/components/CodeTree/function.tsx b/dinky-web/src/pages/RegCenter/GitProject/components/CodeTree/function.tsx
@@ -24,8 +24,8 @@ import { folderSeparator, renderIcon } from '@/utils/function';
  * @param data
  * @returns {any}
  */
-export const buildTreeData = (data: any): any =>
-  data?.map((item: any) => {
+export const buildTreeData = (data: any[] = []): any =>
+  data.map((item: any) => {
     // build key
     let buildKey = item.path + folderSeparator() + item.name;
 

diff --git a/dinky-web/src/pages/RegCenter/GitProject/components/CodeTree/index.tsx b/dinky-web/src/pages/RegCenter/GitProject/components/CodeTree/index.tsx
@@ -24,7 +24,7 @@ import { Modal } from 'antd';
 import React from 'react';
 
 type CodeTreeProps = {
-  onCancel: (flag?: boolean) => void;
+  onCancel: () => void;
   modalVisible: boolean;
   values: Partial<GitProject>;
 };
@@ -41,9 +41,12 @@ export const CodeTree: React.FC<CodeTreeProps> = (props) => {
           overflow: 'auto'
         }
       }}
+      centered
+      closable={false}
       open={modalVisible}
-      maskClosable={false}
       onCancel={() => onCancel()}
+      destroyOnClose
+      maskClosable={false}
       cancelText={l('button.close')}
       okButtonProps={{ style: { display: 'none' } }}
     >

diff --git a/dinky-web/src/pages/RegCenter/UDF/components/UDFTemplate/TemplateModal/index.tsx b/dinky-web/src/pages/RegCenter/UDF/components/UDFTemplate/TemplateModal/index.tsx
@@ -103,6 +103,7 @@ const TemplateModal: React.FC<TemplateModalProps> = (props) => {
         title={values.id ? l('rc.template.modify') : l('rc.template.create')}
         open={visible}
         form={form}
+        modalProps={{ onCancel: handleCancel }}
         submitter={{ render: () => [...renderFooter()] }}
         initialValues={values}
       >