From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28

---
 src/menu/components/card/cardcomponent/settingform/index.jsx |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/menu/components/card/cardcomponent/settingform/index.jsx b/src/menu/components/card/cardcomponent/settingform/index.jsx
index 738bd50..6424977 100644
--- a/src/menu/components/card/cardcomponent/settingform/index.jsx
+++ b/src/menu/components/card/cardcomponent/settingform/index.jsx
@@ -17,15 +17,15 @@
   state = {
     type: this.props.setting.type || 'simple',
     click: this.props.setting.click || '',
-    isApp: sessionStorage.getItem('appType') === 'pc',
+    appType: sessionStorage.getItem('appType'),
     menulist: []
   }
 
   UNSAFE_componentWillMount() {
-    const { isApp } = this.state
+    const { appType } = this.state
     let menulist = null
 
-    if (isApp) {
+    if (appType) {
       menulist = sessionStorage.getItem('appMenus')
     } else {
       menulist = sessionStorage.getItem('fstMenuList')
@@ -67,7 +67,7 @@
   render() {
     const { setting, cards } = this.props
     const { getFieldDecorator } = this.props.form
-    const { menulist, click, isApp } = this.state
+    const { menulist, click, appType } = this.state
 
     const formItemLayout = {
       labelCol: {
@@ -81,7 +81,7 @@
     }
 
     return (
-      <div className="model-menu-setting-form">
+      <div className="model-menu-card-setting-form">
         <Form {...formItemLayout}>
           <Row gutter={24}>
             <Col span={12}>
@@ -102,7 +102,7 @@
                 })(<InputNumber min={1} max={24} precision={0} onPressEnter={this.handleSubmit}/>)}
               </Form.Item>
             </Col>
-            <Col span={12}>
+            {appType !== 'mob' ? <Col span={12}>
               <Form.Item label={
                 <Tooltip placement="topLeft" title="閫夋嫨澶嶅紡鍗℃椂锛屽彲閰嶇疆榧犳爣鎮诞鏃剁殑鏄剧ず淇℃伅銆�">
                   <Icon type="question-circle" />
@@ -118,7 +118,7 @@
                   </Radio.Group>
                 )}
               </Form.Item>
-            </Col>
+            </Col> : null}
             {this.state.type === 'multi' ? <Col span={12}>
               <Form.Item label={
                 <Tooltip placement="topLeft" title="澶嶅紡鍗＄墖榧犳爣鎮诞淇℃伅鐨勫姩鐢绘晥鏋溿��">
@@ -155,19 +155,25 @@
               </Form.Item>
             </Col> : null}
             <Col span={12}>
-              <Form.Item label="鐐瑰嚮浜嬩欢">
+              <Form.Item label={
+                <Tooltip placement="topLeft" title="褰撻�夋嫨瑙﹀彂鎸夐挳鏃讹紝鍙湁褰撳崱鐗囦腑鍙瓨鍦ㄤ竴涓寜閽椂鏈夋晥銆�">
+                  <Icon type="question-circle" />
+                  鐐瑰嚮浜嬩欢
+                </Tooltip>
+              }>
                 {getFieldDecorator('click', {
                   initialValue: click
                 })(
-                  <Radio.Group onChange={(e) => this.setState({click: e.target.value})}>
+                  <Radio.Group style={{whiteSpace: 'nowrap'}} onChange={(e) => this.setState({click: e.target.value})}>
                     <Radio value="">鏃�</Radio>
                     <Radio value="menu">鑿滃崟</Radio>
                     <Radio value="link">閾炬帴</Radio>
+                    <Radio value="button">鎸夐挳</Radio>
                   </Radio.Group>
                 )}
               </Form.Item>
             </Col>
-            {!isApp && click === 'menu' ? <Col span={12}>
+            {!appType && click === 'menu' ? <Col span={12}>
               <Form.Item label="鑿滃崟">
                 {getFieldDecorator('menu', {
                   initialValue: setting.menu || [],
@@ -182,7 +188,7 @@
                 )}
               </Form.Item>
             </Col> : null}
-            {isApp && click === 'menu' ? <Col span={12}>
+            {appType && click === 'menu' ? <Col span={12}>
               <Form.Item label="鍏宠仈鑿滃崟">
                 {getFieldDecorator('menu', {
                   initialValue: setting.menu || '',
@@ -217,7 +223,7 @@
                 })( <TextArea rows={2}/> )}
               </Form.Item>
             </Col> : null}
-            {isApp ? <Col span={12}>
+            {appType === 'pc' && click !== '' && click !== 'button' ? <Col span={12}>
               <Form.Item label="鎵撳紑鏂瑰紡">
                 {getFieldDecorator('open', {
                   initialValue: setting.open || 'blank'
@@ -229,7 +235,7 @@
                 )}
               </Form.Item>
             </Col> : null}
-            {click !== '' ? <Col span={12}>
+            {click !== '' && click !== 'button' ? <Col span={12}>
               <Form.Item label="鍙傛暟鎷兼帴">
                 {getFieldDecorator('joint', {
                   initialValue: setting.joint || 'true'

--
Gitblit v1.8.0