From d5c3340757ae00a2ad617c4241dfd3792f36e036 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 十二月 2020 18:23:42 +0800
Subject: [PATCH] 2020-12-14

---
 src/menu/components/card/data-card/wrapsetting/settingform/index.jsx |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/menu/components/card/data-card/wrapsetting/settingform/index.jsx b/src/menu/components/card/data-card/wrapsetting/settingform/index.jsx
index 0de3f34..a20bfd9 100644
--- a/src/menu/components/card/data-card/wrapsetting/settingform/index.jsx
+++ b/src/menu/components/card/data-card/wrapsetting/settingform/index.jsx
@@ -73,13 +73,13 @@
       <div className="model-menu-setting-form">
         <Form {...formItemLayout}>
           <Row gutter={24}>
-            {config.subtype === 'tablecard' ? <Col span={12}>
+            <Col span={12}>
               <Form.Item label="鏍囬">
                 {getFieldDecorator('title', {
                   initialValue: wrap.title || ''
                 })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
               </Form.Item>
-            </Col> : null}
+            </Col>
             <Col span={12}>
               <Form.Item label={
                 <Tooltip placement="topLeft" title="鐢ㄤ簬缁勪欢闂寸殑鍖哄垎銆�">
@@ -135,34 +135,30 @@
             </Col> : null}
             {MenuType !== 'billPrint' && config.subtype === 'datacard' ? <Col span={12}>
               <Form.Item label={
-                <Tooltip placement="topLeft" title="閫夋嫨鍚湁娣诲姞鎸夐挳鏃讹紝璇峰畬鍠勬寜閽厤缃俊鎭��">
+                <Tooltip placement="topLeft" title="鏁版嵁婧愪腑閫夋嫨鍒嗛〉鏃舵湁鏁堛��">
                   <Icon type="question-circle" />
-                  娣诲姞鎸夐挳
+                  鍒嗛〉椋庢牸
                 </Tooltip>
               }>
-                {getFieldDecorator('addable', {
-                  initialValue: wrap.addable || 'false'
+                {getFieldDecorator('pagestyle', {
+                  initialValue: wrap.pagestyle || 'page'
                 })(
                   <Radio.Group>
-                    <Radio value="true">鏈�</Radio>
-                    <Radio value="false">鏃�</Radio>
+                    <Radio value="page">椤电爜</Radio>
+                    <Radio value="switch">宸﹀彸鍒囨崲</Radio>
                   </Radio.Group>
                 )}
               </Form.Item>
             </Col> : null}
             {MenuType !== 'billPrint' && config.subtype !== 'tablecard' ? <Col span={12}>
-              <Form.Item label={
-                <Tooltip placement="topLeft" title="鍗$墖鐐瑰嚮鏃讹紝鏄惁鍚戝叾浠栫粍浠朵紶閫掍富閿�笺��">
-                  <Icon type="question-circle" />
-                  浼犻�掍富閿�
-                </Tooltip>
-              }>
-                {getFieldDecorator('switch', {
-                  initialValue: wrap.switch || 'false'
+              <Form.Item label="鍗$墖灞炴��">
+                {getFieldDecorator('cardType', {
+                  initialValue: wrap.cardType || ''
                 })(
-                  <Radio.Group>
-                    <Radio value="true">鏄�</Radio>
-                    <Radio value="false">鍚�</Radio>
+                  <Radio.Group style={{whiteSpace: 'nowrap'}}>
+                    <Radio key="" value=""> 涓嶅彲閫� </Radio>
+                    <Radio key="radio" value={'radio'}> 鍗曢�� </Radio>
+                    <Radio key="checkbox" value={'checkbox'}> 澶氶�� </Radio>
                   </Radio.Group>
                 )}
               </Form.Item>

--
Gitblit v1.8.0