From f3ec8c20eeabee6eaab1508d2f3896c28aab611c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 七月 2021 14:42:42 +0800
Subject: [PATCH] 修改页面中按钮保存

---
 src/menu/components/card/cardcellcomponent/index.jsx |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 5fa02a8..e46935d 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -34,6 +34,7 @@
 
   state = {
     dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    appType: sessionStorage.getItem('appType'),
     card: null,          // 缂栬緫涓厓绱�
     formlist: null,      // 琛ㄥ崟淇℃伅
     elements: null,      // 鎸夐挳缁�
@@ -63,9 +64,9 @@
   }
 
   componentDidMount () {
-    MKEmitter.addListener('cardAddElement', this.cardAddElement)
     MKEmitter.addListener('submitStyle', this.getStyle)
     MKEmitter.addListener('submitModal', this.handleSave)
+    MKEmitter.addListener('cardAddElement', this.cardAddElement)
     MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
   }
 
@@ -92,9 +93,9 @@
     this.setState = () => {
       return
     }
-    MKEmitter.removeListener('cardAddElement', this.cardAddElement)
     MKEmitter.removeListener('submitStyle', this.getStyle)
     MKEmitter.removeListener('submitModal', this.handleSave)
+    MKEmitter.removeListener('cardAddElement', this.cardAddElement)
     MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
   }
 
@@ -414,17 +415,14 @@
    */
   deleteElement = (card) => {
     const { cards, cardCell, side } = this.props
-    const { dict, elements } = this.state
+    const { dict, elements, appType } = this.state
     let _this = this
 
     confirm({
       content: dict['model.confirm'] + dict['model.delete'] + '鍏冪礌鍚楋紵',
       onOk() {
         let _elements = elements.filter(item => item.uuid !== card.uuid)
-
-        if (card.eleType === 'button') {
-          MKEmitter.emit('delButtons', [card.uuid])
-        }
+        
         if (card.OpenType === 'popview' || card.verify || card.modal) {
           card.$parentId = cardCell.uuid
           card.$side = side || ''
@@ -437,6 +435,11 @@
         }, () => {
           _this.props.updateElement(_elements)
         })
+
+        if (card.eleType !== 'button') return
+        if (appType === 'mob' || (appType === 'pc' && card.OpenType !== 'popview')) return
+        
+        MKEmitter.emit('delButtons', [card.uuid])
       },
       onCancel() {}
     })

--
Gitblit v1.8.0