From 55071f5a06673369ceba07e36cd7f85e584c3eac Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十二月 2019 10:55:49 +0800
Subject: [PATCH] 2019-12-23
---
src/templates/comtableconfig/index.jsx | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 0c14c97..02c1f4d 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -68,7 +68,8 @@
originActions: null, // 鍘熷鎸夐挳淇℃伅锛屼娇鐢ㄥ凡鏈夌敤鎴锋ā鏉�
delActions: [], // 鍒犻櫎鎸夐挳鍒楄〃
funcLoading: false, // 瀛樺偍杩囩▼鍒涘缓涓�
- showColumnName: false // 鏄剧ず鍒楀瓧娈靛悕鎺у埗
+ showColumnName: false, // 鏄剧ず鍒楀瓧娈靛悕鎺у埗
+ tabviews: false // 鎵�鏈夋爣绛鹃〉
}
/**
@@ -83,13 +84,8 @@
let _config = ''
if (!_LongParam) {
- _config = JSON.parse(JSON.stringify((Source.baseConfig)))
+ _config = JSON.parse(JSON.stringify(Source.baseConfig))
} else {
- let _setting = Source.baseConfig.setting
- if (_LongParam.setting) {
- _setting = {..._setting, ..._LongParam.setting}
- }
- _LongParam.setting = _setting
_config = _LongParam
}
@@ -170,6 +166,7 @@
* @description 鍔犺浇瀹屾垚鍚�
* 1銆佽幏鍙栫郴缁熷彲浣跨敤琛�
* 2銆佹牴鎹厤缃俊鎭腑宸蹭娇鐢ㄨ〃鑾峰彇鐩稿叧瀛楁淇℃伅
+ * 3銆佽幏鍙栨墍鏈夋爣绛鹃〉淇℃伅
*/
componentDidMount () {
let param = {
@@ -263,6 +260,31 @@
tableColumns: _columns
})
})
+
+ // let param = {
+ // func: 'sPC_Get_SelectedList',
+ // LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
+ // obj_name: 'data',
+ // arr_field: 'TbName,Remark'
+ // }
+
+ // param.LText = Utils.formatOptions(param.LText)
+ // param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ // param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+
+ // Api.getSystemConfig(param).then(res => {
+ // if (res.status) {
+ // this.setState({
+ // tables: res.data
+ // })
+ // } else {
+ // notification.warning({
+ // top: 92,
+ // message: res.message,
+ // duration: 10
+ // })
+ // }
+ // })
}
handleList = (type, list, card) => {
@@ -1768,7 +1790,7 @@
return
}
- let btnParam = {
+ let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
func: 'sPC_Button_AddUpt',
ParentID: menu.MenuID,
MenuNo: res.menuNo,
@@ -1784,6 +1806,18 @@
btnParam.LText = Utils.formatOptions(btnParam.LText)
btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+
+ let tabParam = { // 娣诲姞鑿滃崟tab椤�
+ func: 'sPC_sMenusTab_AddUpt',
+ LText: config.tabs.map((item, index) => {
+ return `select '${menu.MenuID}' as MenuID ,'${item.uuid}' as Tabid,'${item.label}' as TabName ,'${(index + 1) * 10}' as Sort`
+ })
+ }
+
+ tabParam.LText = tabParam.LText.join(' union all ')
+ tabParam.LText = Utils.formatOptions(tabParam.LText)
+ tabParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ tabParam.secretkey = Utils.encrypt(tabParam.LText, tabParam.timestamp)
let param = {
func: 'sPC_TrdMenu_AddUpt',
@@ -1832,7 +1866,7 @@
this.props.reloadmenu()
- this.submitAction(btnParam)
+ this.submitAction(btnParam, tabParam)
} else {
this.setState({
menuloading: false,
@@ -1857,7 +1891,8 @@
/**
* @description 淇濆瓨鎴栦慨鏀硅彍鍗曟寜閽�
*/
- submitAction = (param) => {
+ submitAction = (btnParam, tabParam) => {
+ console.log(tabParam)
const { config } = this.state
new Promise(resolve => {
// 鍐呴儴璇锋眰
@@ -1892,17 +1927,17 @@
this.setState({
delActions: []
})
- resolve(param)
+ resolve(true)
}
})
} else if (this.state.delActions.length === 0) {
- resolve(param)
+ resolve(true)
}
}).then(res => {
if (res === false) return res
- if (res.LText) {
- return Api.getSystemConfig(res)
+ if (btnParam.LText) {
+ return Api.getSystemConfig(btnParam)
} else {
return 'copy'
}
@@ -2430,13 +2465,21 @@
}
})
} else if (type === 'tab') {
- this.props.handleSubConfig(btn, originMenu, '', type)
- // this.setState({
- // loading: true
- // })
+ if (btn.linkTab) {
+
+ } else {
+ let _tab = {
+ uuid: btn.linkId,
+ create: true
+ }
+ this.props.handleSubConfig(btn, originMenu, _tab, type)
+ }
+ this.setState({
+ loading: true
+ })
// Api.getSystemConfig({
// func: 'sPC_Get_LongParam',
- // MenuID: btn.uuid
+ // MenuID: btn.linkId
// }).then(res => {
// if (res.status) {
// this.setState({
@@ -2451,7 +2494,7 @@
// _LongParam = ''
// }
// }
- // this.props.handleSubConfig(btn, originMenu, _LongParam)
+ // console.log(_LongParam)
// } else {
// this.setState({
// loading: false
@@ -2687,7 +2730,6 @@
<Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃爣绛鹃〉銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬爣绛鹃〉鎷栬嚦姝ゅ娣诲姞銆�">
<Icon type="question-circle" />
</Tooltip>
- {/* {this.state.config.tabs.length > 0 ? <Icon type="setting" onClick={this.changeSetting} /> : null} */}
{!this.state.tabloading ?
<TabDragElement
type="tabs"
--
Gitblit v1.8.0