From b6ccd63b80fc7017bfabc446787732a98c7cbab7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 06 一月 2021 19:10:28 +0800
Subject: [PATCH] 2021-01-06

---
 src/views/menudesign/index.jsx |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 908789a..fb9e3ae 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -33,11 +33,14 @@
 const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
 const PaddingController = asyncComponent(() => import('@/menu/padcontroller'))
 const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
+const StyleCombController = asyncComponent(() => import('@/menu/stylecombcontroller'))
+const StyleCombControlButton = asyncComponent(() => import('@/menu/stylecombcontrolbutton'))
 const ModalController = asyncComponent(() => import('@/menu/modalconfig/controller'))
 const PopviewController = asyncComponent(() => import('@/menu/popview'))
 const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
 
 sessionStorage.setItem('isEditState', 'true')
+sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
 document.body.className = ''
 
 class MenuDesign extends Component {
@@ -129,11 +132,14 @@
     btn.config = _config
     btn.component = card
 
+    sessionStorage.setItem('editMenuType', 'popview') // 缂栬緫寮圭獥鏍囩
+
     this.setState({popBtn: btn, visible: true})
   }
 
   handleBack = () => {
     this.setState({popBtn: null, delButtons: []}, () => {
+      sessionStorage.setItem('editMenuType', 'menu')
       this.setState({visible: false})
     })
   }
@@ -698,6 +704,7 @@
                   <div> {config && config.MenuName} </div>
                 } bordered={false} extra={
                   <div>
+                    <StyleCombControlButton menu={config} />
                     <PasteController type="menu" Tab={null} insert={this.insert} />
                     {config ? <Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config.enabled} onChange={this.onEnabledChange} /> : null}
                     <Button type="primary" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
@@ -711,6 +718,7 @@
           </DndProvider> : null}
           {popBtn && visible ? <PopviewController btn={popBtn} handleBack={this.handleBack}/> : null}
           <StyleController />
+          <StyleCombController />
           <ModalController />
         </div>
       </ConfigProvider>

--
Gitblit v1.8.0