From b35e3f0bacdbadf5823e06fe8dc6e047089aae38 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 一月 2020 00:25:45 +0800
Subject: [PATCH] 2020-01-19

---
 src/components/sidemenu/editthdmenu/index.jsx |  101 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/src/components/sidemenu/editthdmenu/index.jsx b/src/components/sidemenu/editthdmenu/index.jsx
index b747b99..65d02ee 100644
--- a/src/components/sidemenu/editthdmenu/index.jsx
+++ b/src/components/sidemenu/editthdmenu/index.jsx
@@ -449,55 +449,78 @@
   }
 
   handleSubConfig = (item, originMenu, config, type) => {
-    if (type === 'button') { // 涓夌骇鑿滃崟椤甸潰锛屾寜閽厤缃�
-      if (item.OpenType === 'pop') {
+    this.setState({
+      tabview: ''
+    }, () => {
+      if (type === 'button') { // 涓夌骇鑿滃崟椤甸潰锛屾寜閽厤缃�
+        if (item.OpenType === 'pop') {
+          let pageParam = ''
+          if (config && config.type === 'Modal') {
+            pageParam = config
+          }
+    
+          this.setState({
+            editMenu: originMenu,
+            editTab: '',
+            editAction: item,
+            btnParam: pageParam,
+            tabview: 'Modal'
+          })
+        }
+      } else if (type === 'tab') { // 涓夌骇鑿滃崟椤甸潰锛屾爣绛鹃厤缃�
+        if (item.type === 'SubTable' || item.tabType === 'SubTable') {
+          this.setState({
+            editMenu: originMenu,
+            editTab: config,
+            editAction: '',
+            tabview: 'SubTable'
+          })
+        }
+      } else if (type === 'tabButton') { // 涓夌骇鑿滃崟涓嬶紝鏍囩涓嬶紝鎸夐挳閰嶇疆
+        console.log(item)
         let pageParam = ''
-        if (config && config.type === 'Modal') {
+        if (item.OpenType === 'popview') {
+          if (config && config.Template === 'SubTable') {
+            pageParam = config
+          } else {
+            pageParam = {
+              ...item,
+              uuid: item.linkTab,
+              create: true
+            }
+          }
+  
+          this.setState({
+            editMenu: originMenu,
+            editTab: pageParam,
+            editAction: item,
+            tabview: 'SubTable'
+          })
+        } else {
+          if (config && config.type === 'Modal') {
+            pageParam = config
+          }
+          this.setState({
+            editTab: originMenu,
+            editAction: item,
+            btnParam: pageParam,
+            tabview: 'Modal'
+          })
+        }
+      } else if (type === 'tabview') { // 涓夌骇鑿滃崟涓嬶紝鎵撳紑鏂版爣绛鹃〉鎴栧綋鍓嶉〉璺宠浆锛岀被鍨嬬殑鎸夐挳閰嶇疆
+        let pageParam = ''
+        if (config && config.type === 'FormTab') {
           pageParam = config
         }
   
         this.setState({
           editMenu: originMenu,
-          editTab: '',
           editAction: item,
           btnParam: pageParam,
-          tabview: 'Modal'
+          tabview: 'FormTab'
         })
       }
-    } else if (type === 'tab') { // 涓夌骇鑿滃崟椤甸潰锛屾爣绛鹃厤缃�
-      if (item.type === 'SubTable' || item.tabType === 'SubTable') {
-        this.setState({
-          editMenu: originMenu,
-          editTab: config,
-          editAction: '',
-          tabview: 'SubTable'
-        })
-      }
-    } else if (type === 'tabButton') { // 涓夌骇鑿滃崟涓嬶紝鏍囩涓嬶紝鎸夐挳閰嶇疆
-      let pageParam = ''
-      if (config && config.type === 'Modal') {
-        pageParam = config
-      }
-
-      this.setState({
-        editTab: originMenu,
-        editAction: item,
-        btnParam: pageParam,
-        tabview: 'Modal'
-      })
-    } else if (type === 'tabview') { // 涓夌骇鑿滃崟涓嬶紝鎵撳紑鏂版爣绛鹃〉鎴栧綋鍓嶉〉璺宠浆锛岀被鍨嬬殑鎸夐挳閰嶇疆
-      let pageParam = ''
-      if (config && config.type === 'FormTab') {
-        pageParam = config
-      }
-
-      this.setState({
-        editMenu: originMenu,
-        editAction: item,
-        btnParam: pageParam,
-        tabview: 'FormTab'
-      })
-    }
+    })
   }
 
   UNSAFE_componentWillMount () {

--
Gitblit v1.8.0