From eebe63a6727e6495321d1433ebd2779b5a36d45a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 22:08:14 +0800
Subject: [PATCH] 2020-12-31
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index 629c8db..913ca8d 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -18,7 +18,6 @@
dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
- permFuncField: PropTypes.array, // 鑷畾涔夊嚱鏁板彲鐢ㄥ瓧娈�
search: PropTypes.array // 鎼滅储鏉′欢
}
@@ -70,10 +69,6 @@
})
}
- // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
- let allSearch = Utils.initMainSearch(search)
- allSearch = Utils.getAllSearchOptions(allSearch)
-
// 鎼滅储鐨剋here鏉′欢
let _search = this.formatSearch(search)
_search = Utils.joinMainSearchkey(_search)
@@ -85,7 +80,7 @@
setting: _setting,
search: _search,
arr_field: arr_field.join(','),
- regoptions: allSearch,
+ regoptions: Utils.getRegOptions(search), // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
scripts: _scripts
})
@@ -100,6 +95,8 @@
let newsearches = []
searches.forEach(search => {
+ if (!search.field) return
+
let item = {
key: search.field,
match: search.match,
@@ -376,7 +373,7 @@
}
render() {
- const { config, menu, dict, permFuncField } = this.props
+ const { config, menu, dict } = this.props
const { loading, activeKey, setting, defaultSql, columns, scripts } = this.state
return (
@@ -385,13 +382,12 @@
<Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
- type={config.Template === 'CommonTable' ? 'main' : ''}
menu={menu}
dict={dict}
+ config={config}
columns={columns}
setting={setting}
scripts={scripts}
- permFuncField={permFuncField}
wrappedComponentRef={(inst) => this.settingForm = inst}
/>
</TabPane>
--
Gitblit v1.8.0