From bc1d24ea98a6f5a7350d067dc0e55836ded106b2 Mon Sep 17 00:00:00 2001
From: cuiwenlong7 <cuiwenlong7@jd.com>
Date: Mon, 15 Nov 2021 12:14:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=B7=A8=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B9=E5=85=A8=E5=B1=80=E6=A0=A1=E9=AA=8Cmodal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.tsx             |  2 +-
 src/steps/form/index.tsx | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main.tsx b/src/main.tsx
index c16d7ab..1ed4e67 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -14,7 +14,7 @@ export default class CCMSComponent extends CCMS {
       children
     } = props
     return (
-      <div className={styles['ccms_antd']}>
+      <div id="ccms_antd" className={styles['ccms_antd']}>
         {
           (title || description) &&
           <div className={styles['header']}>
diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx
index f8cd7eb..47bdb47 100644
--- a/src/steps/form/index.tsx
+++ b/src/steps/form/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { FormStep } from 'ccms'
-import { IForm, IFormItem, FormConfig } from 'ccms/dist/src/steps/form'
-import { Button, Form, Space } from 'antd'
+import { IForm, IFormItem, IFormStepModal, FormConfig } from 'ccms/dist/src/steps/form'
+import { Button, Form, Space, Modal } from 'antd'
 
 import { FormProps } from 'antd/lib/form'
 import getALLComponents from '../../components/formFields'
@@ -12,6 +12,21 @@ import newstyles from "../../main.less"
 export default class FormStepComponent extends FormStep {
   getALLComponents = (type: any) => getALLComponents[type]
 
+  renderModalComponent= (props: IFormStepModal) => {
+    return new Promise((resolve) => {
+      Modal.error({
+        getContainer: () => {
+          return document.getElementById('ccms_antd') || document.body
+        },
+        centered: true,
+        title: props.message,
+        onOk: () => {
+          resolve(null)
+        }
+      })
+    })
+  }
+
   renderComponent = (props: IForm) => {
     const {
       layout,
-- 
Gitee


From 45d4c4d3b3901ad258610b52160442bec6ea1dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=B0=BE=E5=B7=B4?= <niuxg0@hotmail.com>
Date: Wed, 24 Nov 2021 08:45:19 +0000
Subject: [PATCH 2/3] Update src/main.tsx

---
 src/main.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.tsx b/src/main.tsx
index 1ed4e67..1d36ea2 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -14,7 +14,7 @@ export default class CCMSComponent extends CCMS {
       children
     } = props
     return (
-      <div id="ccms_antd" className={styles['ccms_antd']}>
+      <div id="ccms-antd" className={styles['ccms-antd']}>
         {
           (title || description) &&
           <div className={styles['header']}>
-- 
Gitee


From bb6708e2ea10aaaee6d1e162f8f0e6d022949295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=B0=BE=E5=B7=B4?= <niuxg0@hotmail.com>
Date: Wed, 24 Nov 2021 08:45:52 +0000
Subject: [PATCH 3/3] Update src/steps/form/index.tsx

---
 src/steps/form/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx
index 764181e..0df776c 100644
--- a/src/steps/form/index.tsx
+++ b/src/steps/form/index.tsx
@@ -16,7 +16,7 @@ export default class FormStepComponent extends FormStep {
     return new Promise((resolve) => {
       Modal.error({
         getContainer: () => {
-          return document.getElementById('ccms_antd') || document.body
+          return document.getElementById('ccms-antd') || document.body
         },
         centered: true,
         title: props.message,
-- 
Gitee