From afb39f8ab004b2607bb718edab02e99c7a010114 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 三月 2023 14:36:44 +0800
Subject: [PATCH] 2023-03-22
---
src/tabviews/custom/components/table/edit-table/index.jsx | 189 +++++++++++++++++++++++++----------------------
1 files changed, 101 insertions(+), 88 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 75c6619..3496def 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -1,8 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification } from 'antd'
+import { notification, Modal } from 'antd'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -19,20 +18,17 @@
class EditableTable extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
BID: '', // 涓婄骇ID
BData: '', // 涓婄骇缁勪欢琛屾暟鎹�
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
- searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
+ arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -51,20 +47,39 @@
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
*/
UNSAFE_componentWillMount () {
- const { BID, BData } = this.props
let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
- let setting = {..._config.setting, ..._config.wrap, style: {}}
+ let setting = {..._config.setting, ..._config.wrap}
setting.tableId = Utils.getuuid()
+
+ let BID = ''
+ let BData = ''
+
+ if (_config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(_config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(_config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
+
+ _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
+ }
+ if (_config.submit.style.marginBottom) {
+ _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
+ }
+ } else {
+ _config.submit.wrapStyle.paddingTop = '15px'
+ }
if (setting.height) {
setting.operType = 'btnMode'
}
-
- _config.columns.forEach(item => {
- if (item.type !== 'number') return
- _cols.set(item.field, item)
- })
let _columns = []
let signAdd = false
@@ -96,17 +111,6 @@
})
}
- if (column.type === 'custom') {
- column.elements = column.elements.map(item => {
- if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
- item.decimal = _cols.get(item.field).decimal || 0
- }
- return item
- })
- } else if (column.type === 'action') {
- column.operations = column.elements
- }
-
_columns.push(column)
})
@@ -118,12 +122,12 @@
}
}
- if (setting.color) {
- setting.style.color = setting.color
- }
- if (setting.fontSize) {
- setting.style.fontSize = setting.fontSize
- }
+ // if (setting.color) {
+ // setting.style.color = setting.color
+ // }
+ // if (setting.fontSize) {
+ // setting.style.fontSize = setting.fontSize
+ // }
if (!_config.lineMarks || _config.lineMarks.length === 0) {
_config.lineMarks = null
@@ -136,7 +140,6 @@
title: _config.wrap.title,
config: _config,
setting: setting,
- searchlist: _config.search,
actions: _config.action,
columns: _columns,
arr_field: _config.columns.map(col => col.field).join(','),
@@ -166,7 +169,7 @@
selectedData: [],
total: 0
})
- reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+ reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
return
}
@@ -190,7 +193,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -208,6 +211,15 @@
item.$Index = start + index + ''
item.$type = 'upt'
item.$origin = true
+
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(item[f])) {
+ item[f] = Math.abs(item[f])
+ }
+ })
+ }
+
return item
})
@@ -223,11 +235,18 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -253,7 +272,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -266,6 +285,14 @@
_data.$$BData = BData || ''
_data.$type = 'upt'
_data.$origin = true
+
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(_data[f])) {
+ _data[f] = Math.abs(_data[f])
+ }
+ })
+ }
try {
data = data.map(item => {
@@ -344,7 +371,7 @@
}
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID, this.props.menuType)
+ let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID)
Api.genericInterface(param).then(res => {
if (res.status) {
@@ -447,7 +474,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, orderBy, search, setting} = this.state
@@ -463,7 +490,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: searches,
@@ -475,7 +502,6 @@
const { config } = this.state
if (config.uuid !== menuId) return
- if (id === 'empty') return
if (!id) {
this.reloadtable()
@@ -511,20 +537,19 @@
if (config.uuid !== menuId) return
- if (position === 'line' && lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn)
+ }
+ } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
- this.reloadtable(btn) // 鏁版嵁鍒锋柊
+ this.reloadtable(btn)
}
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
- }
-
- if (position === 'mainline' && config.setting.supModule) { // 涓昏〃琛屽埛鏂�
- MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
- } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊
- config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -532,7 +557,7 @@
UNSAFE_componentWillReceiveProps(nextProps) {
const { config } = this.state
- if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({pageIndex: 1}, () => {
this.reloadtable()
})
@@ -564,13 +589,13 @@
}
render() {
- const { BID, setting, searchlist, actions, config, columns, BData, selectedData, lock } = this.state
+ const { BID, setting, actions, config, columns, BData, selectedData, lock } = this.state
return (
- <div className="custom-edit-table" style={config.style}>
+ <div className="custom-edit-table" id={'anchor' + config.uuid} style={config.style}>
<NormalHeader config={config}/>
- {searchlist && searchlist.length ?
- <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ {config.search && config.search.length ?
+ <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
<MainAction
BID={BID}
@@ -581,36 +606,24 @@
columns={config.columns}
selectedData={selectedData}
/>
- <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
- <MainTable
- BID={BID}
- setting={setting}
- columns={columns}
- MenuID={config.uuid}
- submit={config.submit}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
- changeLock={(lock) => this.setState({lock: lock})}
- statFValue={this.state.statFValue}
- />
- </div>
+ <MainTable
+ BID={BID}
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ submit={config.submit}
+ fields={config.columns}
+ total={this.state.total}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ changeLock={(lock) => this.setState({lock: lock})}
+ statFValue={this.state.statFValue}
+ />
</div>
)
}
}
-const mapStateToProps = (state) => {
- return {
- menuType: state.editLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(EditableTable)
\ No newline at end of file
+export default EditableTable
\ No newline at end of file
--
Gitblit v1.8.0