From 255ecf5d7b1c16026928e089d8ed384528764e45 Mon Sep 17 00:00:00 2001
From: zhangjinlong <zhangjinlongll@163.com>
Date: Wed, 14 Oct 2020 15:47:44 +0800
Subject: [PATCH] =?UTF-8?q?:art:=201=E3=80=81=E9=81=BF=E5=85=8D=E6=AD=A7?=
 =?UTF-8?q?=E4=B9=89=EF=BC=8C=E7=88=B1=E5=A5=BD=E6=9E=9A=E4=B8=BE=E5=88=97?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=87=AA=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=8F=B3=E4=BE=A7?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                             | 2 +-
 .../BasicShop/BasicComponents/Form/BasePopoverForm.tsx   | 9 +++------
 src/components/BasicShop/BasicComponents/Form/schema.ts  | 6 +++---
 .../CommonComponents/VisualComponents/Form/schema.ts     | 6 +++---
 src/components/PanelComponents/FormEditor/index.tsx      | 4 ++--
 src/pages/editor/Container.tsx                           | 2 +-
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 17e811f..f5bfe38 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
   ],
   "contributors": [
     "徐小夕 <xujiang156@qq.com> (https://github.com/MrXujiang))",
+    "dragon <zhangjinlongll@163.com> (https://github.com/zhangjinlongll))",
     "yehuozhili <yehuozhili@outlook.com> (https://github.com/yehuozhili))"
-    "dragon <zhangjinlongll@163.com> (https://github.com/zhangjinlongll))"
   ],
   "scripts": {
     "start": "umi dev",
diff --git a/src/components/BasicShop/BasicComponents/Form/BasePopoverForm.tsx b/src/components/BasicShop/BasicComponents/Form/BasePopoverForm.tsx
index 08c1eb4..fa758b1 100644
--- a/src/components/BasicShop/BasicComponents/Form/BasePopoverForm.tsx
+++ b/src/components/BasicShop/BasicComponents/Form/BasePopoverForm.tsx
@@ -1,4 +1,3 @@
-import styles from './baseForm.less';
 import React, { ReactText } from 'react';
 import { Button } from 'antd';
 import {
@@ -54,11 +53,9 @@ const BaseForm: TBaseForm = {
   MyRadio: (props: baseFormMyRadioTpl & { onChange: (v: string | undefined | number) => void }) => {
     const { label, onChange } = props;
     return (
-      <div>
-        <Button style={{ color: '#fff', backgroundColor: '#4A4A4A' }} onChange={() => onChange}>
-          {label}
-        </Button>
-      </div>
+      <Button style={{ color: '#fff', backgroundColor: '#4A4A4A' }} onChange={() => onChange}>
+        {label}
+      </Button>
     );
   },
   MyCheckbox: (
diff --git a/src/components/BasicShop/BasicComponents/Form/schema.ts b/src/components/BasicShop/BasicComponents/Form/schema.ts
index 4bf7f90..89185a9 100644
--- a/src/components/BasicShop/BasicComponents/Form/schema.ts
+++ b/src/components/BasicShop/BasicComponents/Form/schema.ts
@@ -97,9 +97,9 @@ const Form: IFormSchema = {
         type: 'MySelect',
         label: '爱好',
         options: [
-          { label: '选项一', value: '1' },
-          { label: '选项二', value: '2' },
-          { label: '选项三', value: '3' },
+          { label: '篮球', value: '1' },
+          { label: '乒乓球', value: '2' },
+          { label: '健身', value: '3' },
         ],
       },
     ],
diff --git a/src/components/CommonComponents/VisualComponents/Form/schema.ts b/src/components/CommonComponents/VisualComponents/Form/schema.ts
index 4bf7f90..89185a9 100644
--- a/src/components/CommonComponents/VisualComponents/Form/schema.ts
+++ b/src/components/CommonComponents/VisualComponents/Form/schema.ts
@@ -97,9 +97,9 @@ const Form: IFormSchema = {
         type: 'MySelect',
         label: '爱好',
         options: [
-          { label: '选项一', value: '1' },
-          { label: '选项二', value: '2' },
-          { label: '选项三', value: '3' },
+          { label: '篮球', value: '1' },
+          { label: '乒乓球', value: '2' },
+          { label: '健身', value: '3' },
         ],
       },
     ],
diff --git a/src/components/PanelComponents/FormEditor/index.tsx b/src/components/PanelComponents/FormEditor/index.tsx
index ce84764..7c92e98 100644
--- a/src/components/PanelComponents/FormEditor/index.tsx
+++ b/src/components/PanelComponents/FormEditor/index.tsx
@@ -163,8 +163,8 @@ const FormEditor = (props: FormEditorProps) => {
           </React.Fragment>
         );
       })}
-      <Form.Item wrapperCol={{ span: 12, offset: 6 }}>
-        <Button danger style={{ marginLeft: '20px' }} onClick={handleDel}>
+      <Form.Item>
+        <Button danger style={{ width: '251px' }} block onClick={handleDel}>
           删除
         </Button>
       </Form.Item>
diff --git a/src/pages/editor/Container.tsx b/src/pages/editor/Container.tsx
index 33e4f54..072e57b 100644
--- a/src/pages/editor/Container.tsx
+++ b/src/pages/editor/Container.tsx
@@ -552,7 +552,7 @@ const Container = (props: {
         </div>
         <div
           style={{
-            width: rightColla ? 0 : '400px',
+            width: rightColla ? 0 : '304px',
             transition: 'all ease-in-out 0.5s',
           }}
         ></div>