From f37db4691a8725b88407a85e3edcd4d57ade1bd3 Mon Sep 17 00:00:00 2001
From: yehuozhili <yehuozhili@outlook.com>
Date: Sat, 17 Oct 2020 10:55:07 +0800
Subject: [PATCH] fix: form delay bug

---
 .../PanelComponents/FormItems/EditorModal.tsx   | 17 +++++++++++------
 .../PanelComponents/FormItems/FormItems.tsx     | 11 +----------
 src/pages/editor/components/Header/index.tsx    |  1 +
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/components/PanelComponents/FormItems/EditorModal.tsx b/src/components/PanelComponents/FormItems/EditorModal.tsx
index 89b4871..b5352db 100644
--- a/src/components/PanelComponents/FormItems/EditorModal.tsx
+++ b/src/components/PanelComponents/FormItems/EditorModal.tsx
@@ -1,5 +1,5 @@
 import React, { FC, memo, useEffect } from 'react';
-import { Form, Select, Input, Modal } from 'antd';
+import { Form, Select, Input, Modal, Button } from 'antd';
 import { baseFormOptionsType } from '../FormEditor/types';
 
 const { Option } = Select;
@@ -13,11 +13,10 @@ interface EditorModalProps {
   item: any;
   onSave: (data: any) => void;
   visible: boolean;
-  onCancel: () => void;
 }
 
 const EditorModal: FC<EditorModalProps> = props => {
-  const { item, onSave, visible, onCancel } = props;
+  const { item, onSave, visible } = props;
 
   const onFinish = (values: any) => {
     onSave && onSave(values);
@@ -48,11 +47,17 @@ const EditorModal: FC<EditorModalProps> = props => {
       {!!item && (
         <Modal
           title="编辑表单组件"
+          footer={
+            <div>
+              <Button type="primary" onClick={() => handleOk()}>
+                确定
+              </Button>
+            </div>
+          }
+          forceRender
           visible={visible}
           onOk={handleOk}
-          onCancel={onCancel}
-          okText="确定"
-          cancelText="取消"
+          closable={false}
         >
           <Form
             form={form}
diff --git a/src/components/PanelComponents/FormItems/FormItems.tsx b/src/components/PanelComponents/FormItems/FormItems.tsx
index 82f3acf..52afbc0 100644
--- a/src/components/PanelComponents/FormItems/FormItems.tsx
+++ b/src/components/PanelComponents/FormItems/FormItems.tsx
@@ -88,10 +88,6 @@ const FormItems = (props: FormItemsProps) => {
     onChange && onChange(newData);
   };
 
-  const handleCloseModal = () => {
-    setVisible(false);
-  };
-
   const handleSaveItem = (data: baseFormUnion) => {
     let newData = formData.map(v => (v.id === data.id ? data : v));
     setFormData(newData);
@@ -168,12 +164,7 @@ const FormItems = (props: FormItemsProps) => {
         </div>
       </div>
 
-      <EditorModal
-        item={curItem}
-        onSave={handleSaveItem}
-        visible={visible}
-        onCancel={handleCloseModal}
-      />
+      <EditorModal item={curItem} onSave={handleSaveItem} visible={visible} />
     </div>
   );
 };
diff --git a/src/pages/editor/components/Header/index.tsx b/src/pages/editor/components/Header/index.tsx
index a166a2f..f5847c7 100644
--- a/src/pages/editor/components/Header/index.tsx
+++ b/src/pages/editor/components/Header/index.tsx
@@ -280,6 +280,7 @@ const HeaderComponent = memo((props: HeaderComponentProps) => {
         destroyOnClose={true}
       >
         <iframe
+          title="editor"
           src={`/h5_plus/preview?tid=${props.location.query.tid}&gf=1`}
           style={{ width: '100%', border: 'none', height: '600px' }}
         ></iframe>