From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/tabviews/custom/components/table/edit-table/index.jsx | 254 +++++++++++++++++++++-----------------------------
1 files changed, 105 insertions(+), 149 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index a0568c2..d0802d5 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -38,8 +38,6 @@
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
- statFValue: [], // 鍚堣鍊�
- lock: false
}
/**
@@ -65,69 +63,100 @@
_config.submit.style = _config.submit.style || {}
_config.submit.wrapStyle = {}
- _config.submit.hasAction = _config.action.length > 0
- if (!_config.submit.hasAction) {
- if (_config.submit.style.marginTop) {
- _config.submit.wrapStyle.paddingTop = _config.submit.style.marginTop
+ setting.hasAction = _config.action.length > 0
+
+ _config.action.forEach(btn => {
+ if (btn.funcType === 'addline') {
+ setting.addable = true
}
- if (_config.submit.style.marginBottom) {
- _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
+ btn.$tableId = setting.tableId
+ if (!btn.controlField) {
+ btn.controlField = '$lock'
+ btn.controlVals = []
}
- } else {
- _config.submit.wrapStyle.paddingTop = '15px'
- }
-
- if (setting.height) {
- setting.operType = 'btnMode'
- }
-
- let _columns = []
- let signAdd = false
- _config.cols.forEach(column => {
- if (column.Hide === 'true') return
- if (column.type === 'index') {
- column.field = '$Index'
- column.type = 'text'
- }
-
- if (setting.addable === 'true' && setting.operType === 'buoyMode' && column.type !== 'action' && !signAdd) {
- column.addable = true
- signAdd = true
- }
-
- if (column.marks && column.marks.length === 0) {
- column.marks = ''
- }
-
- column.tableId = setting.tableId
-
- if (column.type === 'text' && column.editable === 'true' && column.editType === 'select') {
- column.options = column.options || []
- column.options = column.options.filter(cell => {
- cell.value = cell.Value
- cell.label = cell.Text
-
- return !cell.Hide
- })
- }
-
- _columns.push(column)
})
- if (setting.delable !== 'false' && setting.operType === 'buoyMode') {
- if (_columns[_columns.length - 1] && _columns[_columns.length - 1].type !== 'action') {
- _columns[_columns.length - 1].delable = true
- } else if (_columns[_columns.length - 2] && _columns[_columns.length - 2].type !== 'action') {
- _columns[_columns.length - 2].delable = true
- }
+ let _columns = []
+ setting.initId = ''
+ let triMap = new Map()
+
+ let getColumns = (cols) => {
+ return cols.filter(item => {
+ if (item.Hide === 'true') return false
+
+ item.tableId = setting.tableId
+
+ if (item.type === 'colspan') {
+ item.subcols = getColumns(item.subcols)
+
+ if (item.subcols.length === 0) {
+ return false
+ }
+ } else if (item.type === 'action') {
+ item.elements.forEach(btn => {
+ if (btn.funcType === 'addline') {
+ setting.addable = true
+ }
+ btn.$tableId = setting.tableId
+ if (!btn.controlField) {
+ btn.controlField = '$lock'
+ btn.controlVals = []
+ }
+ })
+ } else {
+ if (item.type === 'index') {
+ item.field = '$Index'
+ item.type = 'text'
+ }
+
+ if (item.marks && item.marks.length === 0) {
+ item.marks = ''
+ }
+
+ if (item.editable === 'true') {
+ if (!setting.initId) {
+ setting.initId = item.uuid
+ }
+ if (item.type === 'text' && (item.editType === 'switch' || item.editType === 'select')) {
+ triMap.set(item.uuid, item.editType)
+ }
+ if (item.type === 'text' && item.editType === 'select') {
+ item.options = item.options || []
+ item.options = item.options.filter(cell => {
+ cell.value = cell.Value
+ cell.label = cell.Text
+
+ return !cell.Hide
+ })
+ }
+ }
+ }
+
+ return true
+ })
}
- // if (setting.color) {
- // setting.style.color = setting.color
- // }
- // if (setting.fontSize) {
- // setting.style.fontSize = setting.fontSize
- // }
+ _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'
+ }
+ }
if (!_config.lineMarks || _config.lineMarks.length === 0) {
_config.lineMarks = null
@@ -148,7 +177,6 @@
if (_config.setting.onload === 'true') {
setTimeout(() => {
this.loadmaindata()
- this.getStatFieldsValue()
}, _config.setting.delay || 0)
}
})
@@ -253,7 +281,7 @@
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadmainLinedata (id, line) {
+ async loadmainLinedata (id) {
const { mainSearch } = this.props
const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
@@ -276,10 +304,18 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ if (!result.data || !result.data[0]) {
+ this.setState({
+ loading: false
+ })
+
+ return
+ }
+
let data = fromJS(this.state.data).toJS()
let selectedData = fromJS(this.state.selectedData).toJS()
- let _data = result.data[0] || {}
+ let _data = result.data[0]
_data.$$uuid = _data[setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
@@ -314,14 +350,8 @@
console.warn('鏁版嵁鏌ヨ閿欒')
}
- if (line) {
- if (line.$type === 'del' && !result.data[0]) {
- data = data.filter(m => m.$$uuid === line.$$uuid)
- }
- MKEmitter.emit('transferData', config.uuid, _data, 'line')
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
- }
+ MKEmitter.emit('transferData', config.uuid, _data, 'line')
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
this.setState({
data,
@@ -341,72 +371,6 @@
}
/**
- * @description 鑾峰彇鍚堣瀛楁鍊�
- */
- getStatFieldsValue = () => {
- const { mainSearch } = this.props
- const { setting, config, search, BID, orderBy } = this.state
-
- if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
- this.setState({
- statFValue: []
- })
- return
- }
-
- if (config.statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
-
- let searches = fromJS(search).toJS()
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
- mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
- })
- }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
- return
- }
-
- let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID)
-
- Api.genericInterface(param).then(res => {
- if (res.status) {
- let _data = res.data[0]
- let values = []
-
- if (_data) {
- config.statFields.forEach(item => {
- if (_data[item.field] || _data[item.field] === 0) {
- let val = +_data[item.field]
- if (isNaN(val)) {
- val = 0
- }
- val = val.toFixed(item.decimal)
- values.push({label: item.label, value: val})
- }
- })
- }
- this.setState({
- statFValue: values
- })
- } else {
- this.setState({
- statFValue: []
- })
- notification.error({
- top: 92,
- message: res.message,
- duration: 10
- })
- }
- })
- }
-
- /**
* @description 鎼滅储鏉′欢鏀瑰彉鏃讹紝閲嶇疆琛ㄦ牸鏁版嵁
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
@@ -420,7 +384,6 @@
setting: {...setting, onload: 'true'}
}, () => {
this.loadmaindata()
- this.getStatFieldsValue()
})
} else {
this.setState({
@@ -428,7 +391,6 @@
search: searches
}, () => {
this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
})
}
}
@@ -463,11 +425,9 @@
pageIndex: 1
}, () => {
this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
})
} else {
this.loadmaindata(true, 'false')
- this.getStatFieldsValue()
}
}
@@ -498,7 +458,7 @@
})
}
- reloadData = (menuId, id, item) => {
+ reloadData = (menuId, id) => {
const { config } = this.state
if (config.uuid !== menuId) return
@@ -506,7 +466,7 @@
if (!id) {
this.reloadtable()
} else {
- this.loadmainLinedata(id, item)
+ this.loadmainLinedata(id)
}
}
@@ -521,7 +481,6 @@
BData: data
}, () => {
this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
})
}
}
@@ -589,7 +548,7 @@
}
render() {
- const { BID, setting, actions, config, columns, BData, data, selectedData, lock } = this.state
+ const { BID, setting, actions, config, columns, BData, data, selectedData } = this.state
let style = {...config.style}
if (config.wrap.empty === 'hidden' && data.length === 0) {
@@ -602,15 +561,14 @@
{config.search && config.search.length ?
<MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
- <MainAction
+ {actions.length > 0 ? <MainAction
BID={BID}
setting={setting}
actions={actions}
BData={BData}
- lock={lock}
columns={config.columns}
selectedData={selectedData}
- />
+ /> : null}
<MainTable
BID={BID}
setting={setting}
@@ -623,8 +581,6 @@
loading={this.state.loading}
refreshdata={this.refreshbytable}
chgSelectData={(selects) => this.setState({selectedData: selects})}
- changeLock={(lock) => this.setState({lock: lock})}
- statFValue={this.state.statFValue}
/>
</div>
)
--
Gitblit v1.8.0