From 4de0acf2a232ae29f2b5bd7bb2ee61a238c5d2d0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 十月 2023 17:31:55 +0800
Subject: [PATCH] 2023-10-24
---
src/tabviews/custom/components/table/edit-table/index.jsx | 122 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 42 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index cbbbbed..9d5d2cb 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -19,7 +19,6 @@
class EditableTable extends Component {
static propTpyes = {
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
}
state = {
@@ -28,7 +27,6 @@
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -37,7 +35,8 @@
pageIndex: 1, // 椤电爜
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
- search: '' // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
+ search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
+ allSearch: null
}
/**
@@ -86,6 +85,10 @@
if (item.Hide === 'true') return false
item.tableId = setting.tableId
+
+ if (setting.commit === 'blur') {
+ item.blur = true
+ }
if (item.type === 'colspan') {
item.subcols = getColumns(item.subcols)
@@ -165,6 +168,18 @@
_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({
pageSize: setting.pageSize || 10,
BID: BID || '',
@@ -174,8 +189,8 @@
setting: setting,
actions: _config.action,
columns: _columns,
- arr_field: _config.columns.map(col => col.field).join(','),
- search: Utils.initMainSearch(_config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: _config.$searches,
+ allSearch
}, () => {
if (_config.setting.onload === 'true') {
setTimeout(() => {
@@ -191,8 +206,7 @@
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
async loadmaindata (reset, repage) {
- const { mainSearch } = this.props
- 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({
@@ -205,17 +219,17 @@
}
let searches = fromJS(search).toJS()
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
@@ -224,7 +238,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) {
@@ -254,10 +268,22 @@
return item
})
+ let total = result.total || 0
+ if (config.setting.custompage && data.length) {
+ 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: [],
- total: result.total,
+ allSearch: allSearch,
+ total: total,
loading: false
})
@@ -300,16 +326,21 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadmainLinedata (id) {
- const { mainSearch } = this.props
- 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 (config.forbidLine) {
+ this.reloadtable()
+ return
+ }
+
let searches = fromJS(search).toJS()
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
@@ -318,7 +349,7 @@
})
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) {
@@ -437,26 +468,24 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { mainSearch } = this.props
- const { arr_field, config, orderBy, search, setting} = this.state
+ const { config, orderBy, search, setting } = this.state
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
callback({
- arr_field: arr_field,
orderBy: orderBy || setting.order,
- search: searches,
- menuName: config.name
+ search: searches
})
}
@@ -537,14 +566,14 @@
})
}
- UNSAFE_componentWillReceiveProps(nextProps) {
+ searchRefresh = (searchId) => {
const { config } = this.state
- if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({pageIndex: 1}, () => {
- this.reloadtable()
- })
- }
+ if (config.$searchId !== searchId) return
+
+ this.setState({pageIndex: 1}, () => {
+ this.reloadtable()
+ })
}
shouldComponentUpdate (nextProps, nextState) {
@@ -552,11 +581,17 @@
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshLineData', this.refreshLineData)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
}
/**
@@ -567,14 +602,15 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+ MKEmitter.removeListener('refreshLineData', this.refreshLineData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
- MKEmitter.removeListener('refreshLineData', this.refreshLineData)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
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) {
@@ -600,9 +636,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