Merge pull request #54 from MrXujiang/feature/zjl

Feature/zjl

package.json

@@ -18,6 +18,7 @@
   ],
   "contributors": [
     "徐小夕 <xujiang156@qq.com> (https://github.com/MrXujiang))",
+    "dragon <zhangjinlongll@163.com> (https://github.com/zhangjinlongll))",
     "yehuozhili <yehuozhili@outlook.com> (https://github.com/yehuozhili))"
   ],
   "scripts": {

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: (

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' },
         ],
       },
     ],

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' },
         ],
       },
     ],

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>

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>