From 89949fc82a0194f985cb542abb7118724804bd5b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 五月 2020 11:41:06 +0800
Subject: [PATCH] 2020-05-19

---
 src/templates/comtableconfig/index.jsx |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index f729761..33d5f0b 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -65,7 +65,8 @@
     thawButtons: [],         // 宸查�夋嫨瑕佽В鍐荤殑鎸夐挳
     activeKey: '0',          // 榛樿灞曞紑鍩烘湰淇℃伅
     chartview: null,         // 褰撳墠瑙嗗浘
-    pasteContent: null       // 绮樿创閰嶇疆淇℃伅
+    pasteContent: null,      // 绮樿创閰嶇疆淇℃伅
+    openEdition: ''          // 缂栬緫鐗堟湰鏍囪锛岄槻姝㈠浜烘搷浣�
   }
 
   /**
@@ -184,6 +185,7 @@
     this.setState({
       chartview: _config.charts[0].uuid,
       config: _config,
+      openEdition: menu.open_edition || '',
       activeKey: menu.activeKey || '0',
       optionLibs: optionLibs,
       originActions: _oriActions,
@@ -287,7 +289,7 @@
    */
   submitConfig = () => {
     const { menu } = this.props
-    const { originMenu, delActions, thawButtons } = this.state
+    const { originMenu, delActions, thawButtons, openEdition } = this.state
 
     let config = fromJS(this.state.config).toJS()
 
@@ -652,6 +654,10 @@
           if (resp === false) return
           let localParam = fromJS(param).toJS()
 
+          if (openEdition) {
+            param.open_edition = openEdition
+          }
+
           Api.getSystemConfig(param).then(response => {
             if (response.status) {
               let _FMenu = originMenu.fstMenuList.filter(fstM => fstM.MenuID === res.fstMenuId)[0]
@@ -662,6 +668,7 @@
 
               this.setState({
                 config: _config,
+                openEdition: response.open_edition || '',
                 originMenu: {
                   ...originMenu,
                   LongParam: _config,
@@ -1010,6 +1017,11 @@
           subConfig: '',
           tabview: _view
         }
+        
+        // 褰撳瓙琛ㄤ娇鐢ㄤ富椤垫悳绱㈡潯浠舵椂锛屽皢涓婚〉鎼滅储鍚戜笅浼犻��
+        if (param.editTab && param.editTab.searchPass === 'true') {
+          param.editTab.mainsearch = fromJS(_config.search).toJS()
+        }
 
         this.setState({
           loading: true
@@ -1041,6 +1053,14 @@
               param.subConfig = _LongParam
             }
 
+            if (param.editTab) {
+              param.editTab.open_edition = res.open_edition || ''
+            } else if (param.editAction) {
+              param.editAction.open_edition = res.open_edition || ''
+            } else if (param.btnTab) {
+              param.btnTab.open_edition = res.open_edition || ''
+            }
+
             this.props.handleView(param)
           } else {
             this.setState({

--
Gitblit v1.8.0