From 213c70792e6af7f9ccef17d778c5f8806fbd513c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 28 十一月 2019 15:01:24 +0800
Subject: [PATCH] 2019-11-28-01
---
src/templates/comtableconfig/index.jsx | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index aa3fd6a..5774698 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -137,7 +137,8 @@
* 2銆佹牴鎹厤缃俊鎭腑宸蹭娇鐢ㄨ〃鑾峰彇鐩稿叧瀛楁淇℃伅
*/
componentDidMount () {
- let _text = "select TbName ,Remark from sDataDictionary where IsKey!='' and Deleted =0"
+ let _text = "select TbName ,Remark from sDataDictionary where IsKey!='' and Deleted =0 and Remark != '鍏徃'"
+ // let _text = "select TbName ,Remark from sDataDictionary where IsKey!='' and Deleted =0"
_text = Utils.formatOptions(_text)
Api.getSystemConfig({func: 'sPC_Get_SelectedList', LText: _text, obj_name: 'data', arr_field: 'TbName,Remark'}).then(res => {
@@ -716,6 +717,16 @@
this.formRef.handleConfirm().then(res => {
let _config = this.state.config
+ if (res.type === 'search') {
+ if ((res.values.type === 'select' || res.values.type === 'link') && res.values.resourceType === '1') {
+ let sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ' from (' + res.values.dataSource + ')'
+ if (res.values.orderBy) {
+ sql = sql + ' ld order by ' + res.values.orderBy + ' ' + res.values.orderType
+ }
+ res.values.dataSourceSql = Utils.formatOptions(sql)
+ }
+ }
+
if (this.state.operaType === 'add') {
_config[res.type] = _config[res.type].map(item => {
if (item.uuid === res.values.uuid) {
@@ -733,7 +744,6 @@
return item
}
})
- // _config[res.type] = _config[res.type].filter(item => !item.origin)
}
this.setState({
--
Gitblit v1.8.0