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/subtableconfig/index.jsx | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index a3da1e4..6cdd3a1 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -37,7 +37,6 @@
class SubTableConfig extends Component {
static propTpyes = {
menu: PropTypes.any,
- optionLibs: PropTypes.any,
editTab: PropTypes.any,
tabConfig: PropTypes.any,
editSubTab: PropTypes.any,
@@ -61,7 +60,6 @@
delActions: [], // 鍒犻櫎鎸夐挳鍒楄〃
copyActions: [], // 澶嶅埗鎸夐挳缁�
tabviews: [], // 鎵�鏈夋爣绛鹃〉
- optionLibs: null, // 鑷畾涔変笅鎷夐�夐」搴�
thawButtons: [], // 宸查�夋嫨瑕佽В鍐荤殑鎸夐挳
activeKey: '0', // 榛樿灞曞紑鍩烘湰淇℃伅
chartview: null, // 褰撳墠瑙嗗浘
@@ -75,7 +73,7 @@
* 2銆佽缃搷浣滅被鍨嬨�佸師濮嬭彍鍗曚俊鎭紙姣忔淇濆瓨鍚庨噸缃級銆佸凡浣跨敤琛ㄥ強鍩烘湰淇℃伅琛ㄥ崟
*/
UNSAFE_componentWillMount () {
- const { config, editTab, editSubTab, optionLibs } = this.props
+ const { config, editTab, editSubTab } = this.props
let _config = null
@@ -86,22 +84,6 @@
_config.isAdd = true
} else {
_config = fromJS(config).toJS()
-
- _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(_config.uuid + item.uuid, {
- uuid: _config.uuid + item.uuid,
- label: item.label,
- parname: _config.tabName,
- type: 'search',
- options: item.options
- })
- }
- })
}
let _oriActions = []
@@ -131,7 +113,6 @@
openEdition: editSubTab ? (editSubTab.open_edition || '') : (editTab.open_edition || ''),
chartview: _config.charts[0].uuid,
originActions: _oriActions,
- optionLibs: optionLibs,
config: _config,
activeKey: _activeKey || '0',
originConfig: fromJS(_config).toJS(),
@@ -226,7 +207,6 @@
let param = {
editMenu: menu,
- optionLibs: this.state.optionLibs,
editTab: editSubTab ? editTab : null,
tabConfig: null,
editSubTab: null,
@@ -797,7 +777,6 @@
let param = {
editMenu: menu,
- optionLibs: this.state.optionLibs,
editTab: editTab,
tabConfig: editSubTab ? tabConfig : originConfig,
editSubTab: _subtab,
@@ -956,12 +935,10 @@
/**
* @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
*/
- updatesearch = (config, options) => {
- const { optionLibs } = this.state
+ updatesearch = (config) => {
this.setState({
- config: config,
- optionLibs: options || optionLibs
+ config: config
})
}
@@ -1130,7 +1107,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