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/menu/components/card/cardcellcomponent/index.jsx |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index db7b2ed..dbe882a 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -525,33 +525,23 @@
 
     if ((sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') === 'true')) return
 
-    if (btn.eleType === 'button') {
-      if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
-        if (!btn.modal) {
-          btn.modal = {
-            setting: { title: btn.label, width: appType === 'mob' ? 100 : 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
-            tables: [],
-            groups: [],
-            fields: []
-          }
+    if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
+      if (!btn.modal) {
+        btn.modal = {
+          setting: { title: btn.label, width: appType === 'mob' ? 100 : 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
+          tables: [],
+          groups: [],
+          fields: []
         }
-  
-        MKEmitter.emit('changeModal', cards, btn)
-      } else if (btn.OpenType === 'popview') {
-        MKEmitter.emit('changePopview', cards, btn)
-      } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'page') {
-        MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
-      } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
-        MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
-      } else {
-        this.handleElement(item)
       }
+
+      MKEmitter.emit('changeModal', cards, btn)
+    } else if (btn.OpenType === 'popview') {
+      MKEmitter.emit('changePopview', cards, btn)
+    } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
+      MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
     } else {
-      if (btn.link === 'page') {
-        MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
-      } else if (btn.link === 'linkpage') {
-        MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
-      }
+      this.handleElement(item)
     }
   }
 
@@ -676,7 +666,7 @@
           </Modal>
           {/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
           <Modal
-            title={dict['model.action'] + '-' + (card && card.copyType === 'action' ? dict['model.copy'] : dict['model.edit'])}
+            title="鎸夐挳路缂栬緫"
             visible={actvisible}
             width={800}
             maskClosable={false}
@@ -702,7 +692,7 @@
             wrapClassName="model-table-action-verify-modal"
             title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
             visible={profVisible}
-            width={'75vw'}
+            width={'90vw'}
             maskClosable={false}
             okText={dict['model.submit']}
             onOk={this.verifySubmit}

--
Gitblit v1.8.0