From 33619e75e07ceaccba20acdc1dd402af086bbcfa Mon Sep 17 00:00:00 2001
From: xujiang <xujiang156@qq.com>
Date: Sat, 19 Sep 2020 16:04:23 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6key=E5=80=BC=E9=87=8D=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PanelComponents/FormItems/FormItems.tsx | 3 ++-
 src/global.css                                         | 6 ++++++
 src/pages/editor/Container.js                          | 3 +--
 src/pages/editor/SourceBox.js                          | 3 ++-
 src/pages/editor/components/Header/index.js            | 8 +-------
 src/pages/editor/preview.js                            | 3 ---
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/components/PanelComponents/FormItems/FormItems.tsx b/src/components/PanelComponents/FormItems/FormItems.tsx
index bd103ac..a853321 100644
--- a/src/components/PanelComponents/FormItems/FormItems.tsx
+++ b/src/components/PanelComponents/FormItems/FormItems.tsx
@@ -4,6 +4,7 @@ import EditorModal from './EditorModal';
 import { EditOutlined, MinusCircleOutlined } from '@ant-design/icons';
 import styles from './formItems.less';
 import { baseFormUnion, TFormItemsDefaultType } from '../FormEditor/types';
+import { uuid } from '@/utils/tool';
 
 // import { Popconfirm } from 'antd';
 
@@ -67,7 +68,7 @@ const FormItems = (props: FormItemsProps) => {
 
   const handleAddItem = (item: baseFormUnion) => {
     let tpl = formTpl.find(v => v.type === item.type);
-    let newData = [...formData, tpl!];
+    let newData = [...formData, { ...tpl!, id: uuid(6, 10) }];
     setFormData(newData);
     onChange && onChange(newData);
   };
diff --git a/src/global.css b/src/global.css
index ca19bf9..08a8694 100644
--- a/src/global.css
+++ b/src/global.css
@@ -26,6 +26,12 @@ body {
   border-color: #2F54EB !important;
 }
 
+.ant-btn-link[disabled], .ant-btn-link[disabled]:active, .ant-btn-link[disabled]:focus, .ant-btn-link[disabled]:hover {
+  color: rgba(0,0,0,.25) !important;
+  background: transparent !important;
+  border-color: transparent !important;
+}
+
 @import '~react-grid-layout/css/styles.css'; 
 @import '~react-resizable/css/styles.css';
 @import '~zarm/dist/zarm.min.css';
diff --git a/src/pages/editor/Container.js b/src/pages/editor/Container.js
index 0c89388..a382521 100644
--- a/src/pages/editor/Container.js
+++ b/src/pages/editor/Container.js
@@ -124,8 +124,7 @@ const Container = props => {
               message={
                 <TextLoop mask>
                   <div>Dooring升级啦！</div>
-                  <div>Dooring添加自动保存功能</div>
-                  <div>已有500+人使用</div>
+                  <div>已有1000+人使用</div>
                   <div>持续迭代中...</div>
                 </TextLoop>
               }
diff --git a/src/pages/editor/SourceBox.js b/src/pages/editor/SourceBox.js
index 44a9954..73996cb 100644
--- a/src/pages/editor/SourceBox.js
+++ b/src/pages/editor/SourceBox.js
@@ -7,6 +7,7 @@ import { connect } from 'dva';
 import DynamicEngine from 'components/DynamicEngine';
 import styles from './index.less';
 import { uuid } from '@/utils/tool';
+
 const SourceBox = memo(props => {
   const { pstate, scaleNum, canvasId, allType, dispatch } = props;
 
@@ -123,7 +124,7 @@ const SourceBox = memo(props => {
                 className={styles.layout}
                 cols={24}
                 rowHeight={2}
-                width={canvasRect[0]}
+                width={canvasRect[0] || 0}
                 margin={[0, 0]}
                 onDragStop={dragStop}
                 onDragStart={onDragStart}
diff --git a/src/pages/editor/components/Header/index.js b/src/pages/editor/components/Header/index.js
index 6092c1b..1020f17 100644
--- a/src/pages/editor/components/Header/index.js
+++ b/src/pages/editor/components/Header/index.js
@@ -193,13 +193,7 @@ const HeaderComponent = memo(props => {
         >
           <UndoOutlined />
         </Button>
-        <Button
-          type="link"
-          style={{ marginRight: '9px' }}
-          title="重做"
-          onClick={redohandler}
-          disabled={!pointData.length}
-        >
+        <Button type="link" style={{ marginRight: '9px' }} title="重做" onClick={redohandler}>
           <RedoOutlined />
         </Button>
         <Button type="link" onClick={toPreview} disabled={!pointData.length}>
diff --git a/src/pages/editor/preview.js b/src/pages/editor/preview.js
index 4d496c8..ebbb69e 100644
--- a/src/pages/editor/preview.js
+++ b/src/pages/editor/preview.js
@@ -4,9 +4,6 @@ import DynamicEngine from 'components/DynamicEngine';
 import req from '@/utils/req';
 import styles from './index.less';
 
-// 可视化组件类型
-// const componentTypes = ['Column', 'Pie']
-
 const isMac = navigator.platform.indexOf('Mac') === 0;
 
 const pcStyle = {