From 920e94fc5483b081b3d43c86df8f56d838f2f14d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 一月 2024 22:07:15 +0800
Subject: [PATCH] 2024-01-06
---
src/tabviews/custom/components/table/edit-table/index.jsx | 215 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 159 insertions(+), 56 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index fc305fe..77c9061 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -27,7 +27,6 @@
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -36,7 +35,8 @@
pageIndex: 1, // 椤电爜
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
- search: '' // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
+ search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
+ allSearch: null
}
/**
@@ -46,10 +46,10 @@
UNSAFE_componentWillMount () {
let _config = fromJS(this.props.config).toJS()
let setting = {..._config.setting, ..._config.wrap}
- setting.tableId = Utils.getuuid()
-
let BID = ''
let BData = ''
+
+ setting.tableId = Utils.getuuid().substr(-6).toUpperCase()
if (_config.setting.supModule) {
BData = window.GLOB.CacheData.get(_config.setting.supModule)
@@ -76,9 +76,12 @@
})
let _columns = []
- setting.initId = ''
- let triMap = new Map()
+ let initId = ''
+
setting.hasSubmit = false
+ if (setting.commit === 'change' || setting.commit === 'simple') {
+ setting.commit = 'change'
+ }
let getColumns = (cols) => {
return cols.filter(item => {
@@ -110,19 +113,26 @@
item.type = 'text'
}
- if (item.marks && item.marks.length === 0) {
- item.marks = ''
- }
-
if (item.editable === 'true') {
- setting.hasSubmit = true
- if (!setting.initId) {
- setting.initId = item.uuid
+ setting.hasSubmit = setting.commit !== 'change'
+ item.$ctrl = setting.commit === 'change'
+
+ if (!initId) {
+ initId = item.uuid
}
- if (item.type === 'text' && (item.editType === 'switch' || item.editType === 'select')) {
- triMap.set(item.uuid, item.editType)
+ if (item.enter === '$sub') {
+ item.enter = '$noAct'
+ } else if (item.enter === '$next') {
+ item.enter = '$next_' + initId
}
- if (item.type === 'text' && item.editType === 'select') {
+
+ if (item.linkSubField && item.linkSubField.length === 0) {
+ item.linkSubField = null
+ }
+
+ if (item.type === 'number') {
+
+ } else if (item.editType === 'select') {
item.options = item.options || []
item.options = item.options.filter(cell => {
cell.value = cell.Value
@@ -130,6 +140,16 @@
return !cell.Hide
})
+ } else if (item.editType === 'popSelect') {
+ if (item.pops) {
+ item.pops.forEach(cell => {
+ cell.linkSubField = item.linkSubField
+ this.resetPop(cell)
+ cell.tabName = cell.initval.replace(/^tab:/, '')
+ })
+ } else {
+ this.resetPop(item)
+ }
}
}
}
@@ -140,28 +160,22 @@
_columns = getColumns(_config.cols)
- if (triMap.size > 0) {
- let setColumns = (cols) => {
- return cols.map(item => {
- if (item.type === 'colspan') {
- item.subcols = setColumns(item.subcols)
- } else if (item.editable === 'true' && triMap.has(item.enter)) {
- item.triType = 'click'
- }
-
- return item
- })
- }
-
- _columns = setColumns(_columns)
-
- if (setting.initId && triMap.has(setting.initId)) {
- setting.triType = 'click'
- }
- }
+ setting.initId = initId
if (!_config.lineMarks || _config.lineMarks.length === 0) {
_config.lineMarks = null
+ }
+
+ let allSearch = null
+ if (_config.colsCtrls && _config.colsCtrls.length > 0) {
+ allSearch = [{key: 'BID', value: BID || ''}]
+ allSearch.push(..._config.$searches)
+ if (_config.setting.useMSearch) {
+ let mainSearch = window.GLOB.SearchBox.get(_config.$searchId) || []
+ allSearch.push(...mainSearch)
+ }
+ } else {
+ _config.colsCtrls = null
}
this.setState({
@@ -173,8 +187,8 @@
setting: setting,
actions: _config.action,
columns: _columns,
- arr_field: _config.columns.map(col => col.field).join(','),
- search: _config.$searches
+ search: _config.$searches,
+ allSearch
}, () => {
if (_config.setting.onload === 'true') {
setTimeout(() => {
@@ -184,13 +198,74 @@
})
}
+ resetPop = (config) => {
+ let arrfield = config.columns.map(f => f.field)
+
+ if (config.linkSubField && config.linkSubField.length > 0) {
+ config.linkSubField.forEach(n => {
+ if (!arrfield.includes(n)) {
+ arrfield.push(n)
+ }
+ })
+ }
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ config.dataSource = config.dataSource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ config.dataSource = config.dataSource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
+ config.dataSource = config.dataSource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ config.dataSource = config.dataSource.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ config.dataSource = config.dataSource.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ config.dataSource = config.dataSource.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+
+ if (/\s/.test(config.dataSource)) { // 鎷兼帴鍒悕
+ config.dataSource = '(' + config.dataSource + ') tb'
+ }
+
+ let labels = {}
+ config.cols = []
+ config.columns.forEach(col => {
+ labels[col.field] = col.label
+
+ if (col.Hide === 'true') return
+
+ config.cols.push({
+ dataIndex: col.field,
+ title: col.label,
+ sorter: col.IsSort === 'true',
+ width: col.Width || 120
+ })
+ })
+
+ let placeholder = ''
+ if (!config.searchKey) {
+ config.onload = 'true'
+ } else {
+ placeholder = []
+ config.searchKey.split(',').forEach(key => {
+ if (!labels[key]) {
+ placeholder = ''
+ } else if (placeholder) {
+ placeholder.push(labels[key])
+ }
+ })
+
+ placeholder = placeholder ? placeholder.join('銆�') : ''
+ }
+
+ config.placeholder = placeholder
+ config.arr_field = arrfield.join(',')
+ }
+
/**
* @description 涓昏〃鏁版嵁鍔犺浇
* @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
async loadmaindata (reset, repage) {
- const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+ const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -222,7 +297,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
+ let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -257,14 +332,21 @@
total = data[data.length - 1].mk_total || 0
}
+ let allSearch = null
+ if (config.colsCtrls) {
+ allSearch = [{key: 'BID', value: BID || ''}]
+ allSearch.push(...searches)
+ }
+
this.setState({
data: data,
selectedData: [],
+ allSearch: allSearch,
total: total,
loading: false
})
- MKEmitter.emit('transferData', config.uuid, data)
+ MKEmitter.emit('transferData' + setting.tableId, data)
if (result.message) {
if (result.ErrCode === 'Y') {
@@ -302,9 +384,14 @@
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadmainLinedata (id) {
- const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+ async loadLinedata (id, position) {
+ const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+ if (config.forbidLine) {
+ this.reloadtable()
+ return
+ }
+
let searches = fromJS(search).toJS()
if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
@@ -321,15 +408,29 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
+ let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
+ if (position === 'line_grid' && (!result.data || !result.data[0])) {
+ this.loadmaindata(true, 'false')
+ return
+ }
+
if (!result.data || !result.data[0]) {
+ let data = fromJS(this.state.data).toJS()
+ let selectedData = fromJS(this.state.selectedData).toJS()
+
+ data = data.filter(item => item.$$uuid !== id)
+ selectedData = selectedData.filter(item => item.$$uuid !== id)
+
+ MKEmitter.emit('transferData' + setting.tableId, id, 'delete')
+
this.setState({
+ data,
+ selectedData,
loading: false
})
-
return
}
@@ -367,7 +468,7 @@
return item
})
- MKEmitter.emit('transferData', config.uuid, _data, 'line')
+ MKEmitter.emit('transferData' + setting.tableId, _data, 'line')
MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
this.setState({
@@ -440,7 +541,7 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { arr_field, config, orderBy, search, setting} = this.state
+ const { config, orderBy, search, setting } = this.state
if (config.uuid !== menuId) return
@@ -456,10 +557,8 @@
}
callback({
- arr_field: arr_field,
orderBy: orderBy || setting.order,
- search: searches,
- menuName: config.name
+ search: searches
})
}
@@ -471,7 +570,7 @@
if (!id) {
this.reloadtable()
} else {
- this.loadmainLinedata(id)
+ this.loadLinedata(id)
}
}
@@ -485,9 +584,11 @@
BID: id,
BData: data
}, () => {
- setTimeout(() => {
- this.loadmaindata(true, 'true')
- }, setting.delay || 0)
+ if (!setting.checkBid) {
+ setTimeout(() => {
+ this.loadmaindata(true, 'true')
+ }, setting.delay || 0)
+ }
})
}
}
@@ -503,9 +604,9 @@
if (config.uuid !== menuId) return
- if (position === 'line') {
+ if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ this.loadLinedata(lines[0].$$uuid, position)
} else {
this.reloadtable(btn)
}
@@ -584,7 +685,7 @@
}
render() {
- const { BID, setting, actions, config, columns, BData, data, selectedData } = this.state
+ const { BID, setting, actions, config, columns, BData, data, selectedData, allSearch } = this.state
let style = {...config.style}
if (config.wrap.empty === 'hidden' && data.length === 0) {
@@ -610,9 +711,11 @@
setting={setting}
columns={columns}
MenuID={config.uuid}
+ allSearch={allSearch}
submit={config.submit}
fields={config.columns}
total={this.state.total}
+ colsCtrls={config.colsCtrls}
lineMarks={config.lineMarks}
loading={this.state.loading}
refreshdata={this.refreshbytable}
--
Gitblit v1.8.0