From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
index 6d701af..9fa3613 100644
--- a/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx
@@ -21,7 +21,7 @@
         required: true
       },
       {
-        type: 'select',
+        type: 'radio',
         key: 'Align',
         label: this.props.dict['model.form.align'],
         initVal: this.props.card.Align,
@@ -44,6 +44,20 @@
         label: this.props.dict['model.form.columnWidth'],
         initVal: this.props.card.Width,
         required: true
+      },
+      {
+        type: 'radio',
+        key: 'position',
+        label: '鏄剧ず浣嶇疆',
+        initVal: this.props.card.position || 'right',
+        required: true,
+        options: [{
+          MenuID: 'left',
+          text: '宸︿晶'
+        }, {
+          MenuID: 'right',
+          text: '鍙充晶'
+        }]
       }
     ]
   }
@@ -60,7 +74,7 @@
     const { getFieldDecorator } = this.props.form
     const fields = []
     this.state.formlist.forEach((item, index) => {
-      if (item.type === 'text') { // 鏂囨湰鎼滅储
+      if (item.type === 'text') {
         fields.push(
           <Col span={12} key={index}>
             <Form.Item label={item.label}>
@@ -80,7 +94,7 @@
             </Form.Item>
           </Col>
         )
-      } else if (item.type === 'number') { // 鏂囨湰鎼滅储
+      } else if (item.type === 'number') {
         fields.push(
           <Col span={12} key={index}>
             <Form.Item label={item.label}>

--
Gitblit v1.8.0