From 7449eee8fa9f8a251e9c4e9162030f1e004bae0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 15 十月 2020 09:17:04 +0800
Subject: [PATCH] 2020-10-15

---
 src/templates/comtableconfig/index.jsx |   30 ++++--------------------------
 1 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 5d8ab5e..b26feb3 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -37,7 +37,6 @@
 class ComTableConfig extends Component {
   static propTpyes = {
     menu: PropTypes.any,
-    optionLibs: PropTypes.any,
     reloadmenu: PropTypes.func,
     handleView: PropTypes.func
   }
@@ -57,7 +56,6 @@
     delActions: [],          // 鍒犻櫎鎸夐挳鍒楄〃
     copyActions: [],         // 澶嶅埗鎸夐挳缁�
     tabviews: [],            // 鎵�鏈夋爣绛鹃〉
-    optionLibs: null,        // 鑷畾涔変笅鎷夐�夐」搴�
     thawButtons: [],         // 宸查�夋嫨瑕佽В鍐荤殑鎸夐挳
     activeKey: '0',          // 榛樿灞曞紑鍩烘湰淇℃伅
     chartview: null,         // 褰撳墠瑙嗗浘
@@ -71,7 +69,7 @@
    * 2銆佽缃搷浣滅被鍨嬨�佸師濮嬭彍鍗曚俊鎭紙姣忔淇濆瓨鍚庨噸缃級銆佸凡浣跨敤琛ㄥ強鍩烘湰淇℃伅琛ㄥ崟
    */
   UNSAFE_componentWillMount () {
-    const { menu, optionLibs } = this.props
+    const { menu } = this.props
     let _LongParam = menu.LongParam
     let _config = ''
 
@@ -83,21 +81,6 @@
       _config.isAdd = true
     } else {
       _config = _LongParam
-      _config.search.forEach(item => {
-        if (
-          (item.type === 'select' || item.type === 'multiselect' || item.type === 'link') &&
-          item.resourceType === '0' &&
-          item.options && item.options.length > 0
-        ) {
-          optionLibs.set(menu.MenuID + item.uuid, {
-            uuid: menu.MenuID + item.uuid,
-            label: item.label,
-            parname: menu.MenuName,
-            type: 'search',
-            options: item.options
-          })
-        }
-      })
     }
 
     // 椤甸潰閰嶇疆涓繚鐣欒彍鍗曚俊鎭紝鍙敤浜庢暟鎹紶閫�
@@ -157,7 +140,6 @@
       config: _config,
       openEdition: menu.open_edition || '',
       activeKey: menu.activeKey || '0',
-      optionLibs: optionLibs,
       originActions: _oriActions,
       originMenu: fromJS(_config).toJS()
     })
@@ -882,7 +864,7 @@
    */
   setSubConfig = (item, type) => {
     const { menu } = this.props
-    const { config, originMenu, optionLibs, activeKey, openEdition } = this.state
+    const { config, originMenu, activeKey, openEdition } = this.state
 
     if (config.isAdd) { // 鏂板缓鑿滃崟锛屾彁绀鸿彍鍗曞皻鏈繚瀛�
       notification.warning({
@@ -948,7 +930,6 @@
       _Menu.open_edition = openEdition  // 鏇存柊鐗堟湰鍙�
 
       let param = {
-        optionLibs: optionLibs,
         editMenu: _Menu,
         editTab: !isbutton ? item : '',
         tabConfig: null,
@@ -1176,12 +1157,10 @@
   /**
    * @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
    */
-  updatesearch = (config, options) => {
-    const { optionLibs } = this.state
+  updatesearch = (config) => {
 
     this.setState({
-      config: config,
-      optionLibs: options || optionLibs
+      config: config
     })
   }
 
@@ -1377,7 +1356,6 @@
                 config={config}
                 pasteContent={this.state.pasteContent}
                 sysRoles={this.props.sysRoles}
-                optionLibs={this.state.optionLibs}
                 updatesearch={this.updatesearch}
               />
               <div className="chart-view" style={{position: 'relative'}}>

--
Gitblit v1.8.0