From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02

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

diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index c11a768..b80811c 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -58,7 +58,7 @@
     delButtons: [],
     copyButtons: [],
     thawButtons: [],
-    activeKey: 'basedata',
+    activeKey: 'component',
     menuloading: false,
     oriConfig: null,
     config: null,
@@ -194,9 +194,9 @@
 
     if (menu.fixed && menu.MenuNo && menu.MenuName) {
       param.fixed = true
-      param.MenuNo = menu.MenuNo
-      param.MenuName = menu.MenuName
     }
+    param.MenuNo = menu.MenuNo || ''
+    param.MenuName = menu.MenuName || ''
 
     param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
 
@@ -443,8 +443,8 @@
             MenuID: MenuId,
             Template: 'webPage',
             enabled: false,
-            MenuName: '',
-            MenuNo: '',
+            MenuName: urlParam.MenuName || '',
+            MenuNo: urlParam.MenuNo || '',
             tables: [],
             components: [],
             viewType: 'menu',
@@ -459,10 +459,8 @@
         config.open_edition = result.open_edition || ''
         window.GLOB.urlFields = config.urlFields || []
 
-        if (urlParam.fixed) {
+        if (urlParam.fixed && urlParam.MenuName && urlParam.MenuNo) {
           config.fixed = true
-          config.MenuName = urlParam.MenuName
-          config.MenuNo = urlParam.MenuNo
         }
 
         let indeComs = []
@@ -476,6 +474,7 @@
           this.setState({
             oriConfig: isCreate ? null : config,
             config: fromJS(config).toJS(),
+            activeKey: isCreate ? 'basedata' : 'component',
             loading: false
           })
           window.GLOB.customMenu = config
@@ -665,6 +664,7 @@
 
       this.setState({
         oriConfig: isCreate ? null : fromJS(config).toJS(),
+        activeKey: isCreate ? 'basedata' : 'component',
         config: config,
         loading: false
       })

--
Gitblit v1.8.0