From 3fc643dea8f8c957a95a86d250b5d8b06fb740e1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 三月 2022 23:48:59 +0800
Subject: [PATCH] 2022-03-03
---
src/tabviews/custom/components/table/edit-table/index.jsx | 210 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 153 insertions(+), 57 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 9d6eea6..09e5078 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -6,8 +6,6 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -29,7 +27,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
BID: '', // 涓婄骇ID
BData: '', // 涓婄骇缁勪欢琛屾暟鎹�
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
@@ -39,6 +36,7 @@
arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
+ selectedData: [], // 宸查�夎〃鏍兼暟鎹�
total: 0, // 鎬绘暟
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
pageIndex: 1, // 椤电爜
@@ -53,48 +51,72 @@
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
*/
UNSAFE_componentWillMount () {
- const { data, initdata, BID, BData } = this.props
+ const { BID, BData } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
- let _data = null
- let _sync = _config.setting.sync === 'true'
let setting = {..._config.setting, ..._config.wrap, style: {}}
+ setting.tableId = Utils.getuuid()
- if (_config.setting.sync === 'true' && data) {
- _data = data[_config.dataName] || []
- _sync = false
- } else if (_config.setting.sync === 'true' && initdata) {
- _data = initdata || []
- _sync = false
- }
-
- if (_data) {
- _data = _data.map((item, index) => {
- item.key = index
- item.$$uuid = item[_config.setting.primaryKey] || ''
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
- return item
- })
+ 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
_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
+ })
+ }
+
if (column.type === 'custom') {
column.elements = column.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ 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)
})
+
+ 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
+ }
+ }
if (setting.color) {
setting.style.color = setting.color
@@ -108,24 +130,23 @@
}
this.setState({
+ pageSize: setting.pageSize || 10,
BID: BID || '',
BData: BData || '',
title: _config.wrap.title,
- sync: _sync,
- data: _data,
config: _config,
setting: setting,
searchlist: _config.search,
actions: _config.action,
- columns: _config.cols,
+ columns: _columns,
arr_field: _config.columns.map(col => col.field).join(','),
search: Utils.initMainSearch(_config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
}, () => {
- if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadmaindata()
- this.getStatFieldsValue()
- } else if (_config.setting.onload === 'true') {
- this.getStatFieldsValue()
+ if (_config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadmaindata()
+ this.getStatFieldsValue()
+ }, _config.setting.delay || 0)
}
})
}
@@ -142,6 +163,7 @@
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
data: [],
+ selectedData: [],
total: 0
})
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
@@ -186,9 +208,88 @@
item.$$BID = BID || ''
item.$$BData = BData || ''
item.$Index = start + index + ''
+ item.$type = 'upt'
+ item.$origin = true
return item
}),
+ selectedData: [],
total: result.total,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ })
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
+ }
+
+ /**
+ * @description 鑾峰彇鍗曡鏁版嵁
+ */
+ async loadmainLinedata (id) {
+ const { mainSearch } = this.props
+ const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+
+ 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)
+ }
+ })
+ }
+
+ this.setState({
+ loading: true
+ })
+
+ let _orderBy = orderBy || setting.order
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
+
+ let result = await Api.genericInterface(param)
+ if (result.status) {
+ let data = fromJS(this.state.data).toJS()
+ let selectedData = fromJS(this.state.selectedData).toJS()
+ if (result.data && result.data[0]) {
+ let _data = result.data[0] || {}
+ _data.$$uuid = _data[setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
+ _data.$type = 'upt'
+ _data.$origin = true
+
+ try {
+ data = data.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ _data.key = item.key
+ _data.$Index = item.$Index
+ return _data
+ } else {
+ return item
+ }
+ })
+ selectedData = selectedData.map(item => {
+ if (_data.$$uuid === item.$$uuid) {
+ return _data
+ }
+ return item
+ })
+ } catch (e) {
+ console.warn('鏁版嵁鏌ヨ閿欒')
+ }
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+ }
+
+ this.setState({
+ data,
+ selectedData,
loading: false
})
} else {
@@ -365,15 +466,20 @@
const { config } = this.state
if (config.uuid !== menuId) return
+ if (id === 'empty') return
- this.reloadtable()
+ if (!id) {
+ this.reloadtable()
+ } else {
+ this.loadmainLinedata(id)
+ }
}
resetParentParam = (MenuID, id, data) => {
const { setting } = this.state
if (!setting.supModule || setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
+ if (id !== this.state.BID || id !== '') {
this.setState({
pageIndex: 1,
BID: id,
@@ -391,12 +497,16 @@
* @param {*} position // 鍒锋柊浣嶇疆
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
- refreshByButtonResult = (menuId, position, btn) => {
+ refreshByButtonResult = (menuId, position, btn, id, lines) => {
const { config, BID } = this.state
if (config.uuid !== menuId) return
- this.reloadtable(btn) // 鏁版嵁鍒锋柊
+ if (position === 'line' && lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn) // 鏁版嵁鍒锋柊
+ }
if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
@@ -411,24 +521,9 @@
}
UNSAFE_componentWillReceiveProps(nextProps) {
- const { sync, config, BID, BData } = this.state
+ const { config } = this.state
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
- _data = _data.map((item, index) => {
- item.key = index
- item.$$uuid = item[config.setting.primaryKey] || ''
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
- return item
- })
- }
-
- this.setState({sync: false, data: _data})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({pageIndex: 1}, () => {
this.reloadtable()
})
@@ -460,7 +555,7 @@
}
render() {
- const { BID, setting, searchlist, actions, config, columns, BData } = this.state
+ const { BID, setting, searchlist, actions, config, columns, BData, data, selectedData } = this.state
return (
<div className="custom-edit-table" style={config.style}>
@@ -474,21 +569,22 @@
actions={actions}
BData={BData}
columns={config.columns}
- selectedData={[]}
+ selectedData={selectedData}
/>
<div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
<MainTable
BID={BID}
+ data={data}
setting={setting}
columns={columns}
MenuID={config.uuid}
- data={this.state.data}
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})}
statFValue={this.state.statFValue}
/>
</div>
--
Gitblit v1.8.0