From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26

---
 src/mob/components/menubar/normal-menubar/menucomponent/index.jsx |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index 2fe6362..daac1c6 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -2,7 +2,7 @@
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
 import { Popover, Col } from 'antd'
-import { SwapOutlined, ArrowLeftOutlined, ArrowRightOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined } from '@ant-design/icons'
+import { SwapOutlined, ArrowLeftOutlined, ArrowRightOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined, RightOutlined } from '@ant-design/icons'
 
 import asyncIconComponent from '@/utils/asyncIconComponent'
 import Utils from '@/utils/utils.js'
@@ -17,7 +17,6 @@
 
 class MenuBoxComponent extends Component {
   static propTpyes = {
-    offset: PropTypes.any,           // 鍋忕Щ閲�
     cards: PropTypes.object,         // 鍗$墖琛岄厤缃俊鎭�
     card: PropTypes.object,          // 鍗$墖閰嶇疆淇℃伅
     move: PropTypes.func,            // 鍗$墖绉诲姩
@@ -76,7 +75,7 @@
     const { card } = this.state
 
     let _style = card.style ? fromJS(card.style).toJS() : {}
-    let options = ['font', 'border', 'padding']
+    let options = ['font', 'border', 'padding', 'margin', 'background']
 
     MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
   }
@@ -110,6 +109,7 @@
       MKEmitter.emit('changeEditMenu', {
         MenuID: card.setting.type === 'linkmenu' ? card.setting.linkMenuId : card.uuid,
         copyMenuId: card.setting.type === 'menu' ? card.setting.copyMenuId : '',
+        clearMenu: card.setting.clearMenu || 'true',
         MenuNo: card.setting.MenuNo || '',
         MenuName: card.setting.name,
       })
@@ -117,7 +117,6 @@
   }
 
   render() {
-    const { offset } = this.props
     const { card } = this.state
 
     let _style = {...card.style}
@@ -125,7 +124,7 @@
     _style = resetStyle(_style)
 
     return (
-      <Col span={card.setting.width || 6} offset={offset || 0}>
+      <Col span={card.setting.width || 6}>
         <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
           <div className="mk-popover-control">
             <NormalForm title="鑿滃崟缂栬緫" width={900} update={this.updateSetting} getForms={this.getSettingForms}>
@@ -151,14 +150,19 @@
                 padding: card.setting.padding,
                 background: card.setting.background,
                 color: card.setting.color,
-                borderRadius: card.setting.borderRadius || '15%'
-              }} type={card.setting.icon}/>
+                borderRadius: card.setting.borderRadius || '15%',
+                opacity: !card.setting.icon ? 0 : 1
+              }} type={card.setting.icon || 'cloud'}/>
               {card.setting.tip ? <sup className="am-badge-text"></sup> : null}
             </div> : <div className="menu-sign">
               <img style={{width: card.setting.imgWidth, height: card.setting.imgWidth, borderRadius: card.setting.borderRadius || '15%'}} src={card.setting.url} alt=""/>
               {card.setting.tip ? <sup className="am-badge-text"></sup> : null}
             </div>}
-            <div className="menu-name">{card.setting.name}</div>
+            <div className="menu-name" style={{opacity: !card.setting.name ? 0 : 1}}>{card.setting.name || '鏄庣'}</div>
+            <RightOutlined className="menu-right" />
+            {!card.setting.name ? <NormalForm title="鑿滃崟缂栬緫" width={900} update={this.updateSetting} cancel={() => this.props.deleteElement(card, 'direct')} getForms={this.getSettingForms}>
+              <span id={card.uuid}></span>
+            </NormalForm> : null}
           </div>
         </Popover>
       </Col>

--
Gitblit v1.8.0