From bd1dfc9e6c9b9f8076ca2783ce598e0936b4c664 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 十二月 2021 14:36:03 +0800
Subject: [PATCH] 2021-12-22
---
src/tabviews/commontable/index.jsx | 121 +++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 45 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index d139bbc..9469b12 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification, Spin, Tabs, Icon, Switch, Row, Col } from 'antd'
+import { notification, Spin, Tabs, Switch, Row, Col } from 'antd'
import Api from '@/api'
import zhCN from '@/locales/zh-CN/main.js'
@@ -13,6 +13,7 @@
import { updateCommonTable } from '@/utils/utils-update.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
+import MkIcon from '@/components/mk-icon'
import MKEmitter from '@/utils/events.js'
import NotFount from '@/components/404'
import './index.scss'
@@ -75,11 +76,11 @@
* @description 鑾峰彇椤甸潰閰嶇疆淇℃伅
*/
async loadconfig () {
- const { permAction, permMenus, param, MenuName } = this.props
+ const { permAction, permMenus, param, MenuName, MenuID } = this.props
let _param = {
func: 'sPC_Get_LongParam',
- MenuID: this.props.MenuID
+ MenuID: MenuID
}
let result = await Api.getCacheConfig(_param)
@@ -89,7 +90,7 @@
try { // 閰嶇疆淇℃伅瑙ｆ瀽
config = JSON.parse(window.decodeURIComponent(window.atob(result.LongParam)))
- config.MenuID = this.props.MenuID
+ config.MenuID = MenuID
config.MenuName = MenuName
config.setting.MenuName = MenuName
config.setting.$name = MenuName
@@ -160,7 +161,21 @@
if (this.props.menuType !== 'HS') {
config.action = config.action.filter(item => permAction[item.uuid])
config.tabgroups.forEach(group => {
- group.sublist = group.sublist.filter(tab => permAction[tab.linkTab])
+ group.sublist = group.sublist.filter(tab => {
+ if (tab.supMenu === 'mainTable') {
+ tab.supMenu = MenuID
+ }
+ return permAction[tab.linkTab]
+ })
+ })
+ } else {
+ config.tabgroups.forEach(group => {
+ group.sublist = group.sublist.map(tab => {
+ if (tab.supMenu === 'mainTable') {
+ tab.supMenu = MenuID
+ }
+ return tab
+ })
})
}
// 鍘婚櫎绌鸿鏍囩
@@ -378,12 +393,15 @@
_actions.forEach(item => {
if (item.uuid === config.autoMatic.action && (['pop', 'prompt', 'exec'].includes(item.OpenType) || (item.OpenType === 'funcbutton' && item.funcType === 'print'))) {
autoMatic = config.autoMatic
+ autoMatic.OpenType = item.execMode || item.OpenType
config.setting.selected = 'false'
+ item.autoMatic = true
}
})
}
this.setState({
+ pageSize: config.setting.pageSize || 10,
loadingview: false,
absFields,
autoMatic,
@@ -460,16 +478,13 @@
}
loadData = () => {
- const { setting, search, BIDs, loadCustomApi, hasReqFields } = this.state
+ const { MenuID } = this.props
+ const { setting, search, loadCustomApi, hasReqFields, ContainerId } = this.state
this.setState({
- selectedData: [],
- BIDs: {
- ...BIDs,
- mainTable: '',
- mainTabledata: ''
- }
+ selectedData: []
})
+ MKEmitter.emit('changeTableLine', ContainerId, MenuID, '', '')
if (hasReqFields) {
let requireFields = search.filter(item => item.required && item.value === '')
@@ -676,7 +691,7 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
async loadmaindata () {
- const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
+ const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields, autoMatic } = this.state
this.setState({
loading: true
@@ -726,10 +741,21 @@
loading: false,
pickup: false
})
+
+ if (autoMatic) {
+ if (result.data && result.data.length > 0) {
+ MKEmitter.emit('autoGetData', this.props.MenuID)
+ } else {
+ MKEmitter.emit('autoMaticOver', this.props.MenuID)
+ }
+ }
} else {
this.setState({
loading: false
})
+ if (autoMatic) {
+ MKEmitter.emit('autoMaticError', this.props.MenuID)
+ }
notification.error({
top: 92,
message: result.message,
@@ -867,7 +893,7 @@
this.loadData()
})
} else {
- MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
+ MKEmitter.emit('resetTable', this.props.MenuID) // 鍒楄〃閲嶇疆
this.setState({
pageIndex: 1,
search: searches
@@ -881,6 +907,15 @@
* @description 琛ㄦ牸鏉′欢鏀瑰彉鏃堕噸缃暟鎹紙鍒嗛〉鎴栨帓搴忥級
*/
refreshbytable = (pagination, filters, sorter) => {
+ if (!sorter) {
+ this.setState({
+ pageIndex: pagination.pageIndex
+ }, () => {
+ this.loadData()
+ })
+ return
+ }
+
if (sorter.order) {
let _chg = {
ascend: 'asc',
@@ -903,14 +938,14 @@
*/
reloadtable = (btn) => {
if (!btn || btn.resetPageIndex !== 'false') {
- MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
+ MKEmitter.emit('resetTable', this.props.MenuID) // 鍒楄〃閲嶇疆
this.setState({
pageIndex: 1
}, () => {
this.loadData()
})
} else {
- MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable', 'false') // 鍒楄〃閲嶇疆
+ MKEmitter.emit('resetTable', this.props.MenuID, 'false') // 鍒楄〃閲嶇疆
this.loadData()
}
}
@@ -949,21 +984,6 @@
*/
changeSelectedData = (selectedData) => {
this.setState({selectedData})
- }
-
- /**
- * @description 琛ㄦ牸Id鍙樺寲
- */
- handleTableId = (type, id, data) => {
- const { BIDs } = this.state
-
- this.setState({
- BIDs: {
- ...BIDs,
- [type]: id,
- [type + 'data']: data
- }
- })
}
/**
@@ -1021,18 +1041,30 @@
this.setShortcut()
}
+ changeTableLine = (ContainerId, tableId, id, data) => {
+ if (this.state.ContainerId !== ContainerId) return
+
+ this.setState({
+ BIDs: {...this.state.BIDs, [tableId]: id, [tableId + 'data']: data}
+ })
+ }
+
/**
* @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
* @param {*} menuId // 鑿滃崟Id
* @param {*} position // 鍒锋柊浣嶇疆
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
- refreshByButtonResult = (menuId, position, btn) => {
+ refreshByButtonResult = (menuId, position, btn, id, lines) => {
const { MenuID } = this.props
if (MenuID !== menuId) return
- this.reloadtable(btn)
+ if (position === 'line' && lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn)
+ }
}
UNSAFE_componentWillMount () {
@@ -1047,6 +1079,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.addListener('changeTableLine', this.changeTableLine)
MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -1062,13 +1095,14 @@
document.onkeydown = () => {}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.removeListener('changeTableLine', this.changeTableLine)
MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
- const { menuType } = this.props
+ const { menuType, MenuID } = this.props
const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData, shortcuts, autoMatic } = this.state
return (
@@ -1081,7 +1115,7 @@
{/* 瑙嗗浘缁� */}
{!config.expand ? <Tabs activeKey={chartId} onChange={this.changeChart}>
{config.charts.map(item => (
- <TabPane tab={<Icon type={item.icon} />} key={item.uuid}></TabPane>
+ <TabPane tab={<MkIcon type={item.icon} />} key={item.uuid}></TabPane>
))}
</Tabs> : null}
{config.charts.map(item => {
@@ -1098,7 +1132,7 @@
actions={actions}
columns={columns}
dict={this.state.dict}
- MenuID={this.props.MenuID}
+ MenuID={MenuID}
selectedData={selectedData}
ContainerId={this.state.ContainerId}
/>
@@ -1108,7 +1142,8 @@
<Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
<MainTable
- tableId="mainTable"
+ MenuID={MenuID}
+ tableId={MenuID}
pickup={pickup}
setting={setting}
columns={columns}
@@ -1116,12 +1151,10 @@
dict={this.state.dict}
data={this.state.data}
total={this.state.total}
- MenuID={this.props.MenuID}
loading={this.state.loading}
statFValue={this.state.statFValue}
ContainerId={this.state.ContainerId}
refreshdata={this.refreshbytable}
- handleTableId={this.handleTableId}
chgSelectData={this.changeSelectedData}
/>
</div>
@@ -1133,14 +1166,13 @@
<CardComponent
BID={BID}
plot={item}
+ MenuID={MenuID}
config={config}
+ tableId={MenuID}
columns={columns}
- tableId="mainTable"
data={this.state.data}
- MenuID={this.props.MenuID}
loading={this.state.loading}
ContainerId={this.state.ContainerId}
- handleTableId={this.handleTableId}
/>
</Col>
)
@@ -1165,19 +1197,18 @@
return (
<TabPane tab={
<span id={_tab.uuid}>
- {_tab.icon ? <Icon type={_tab.icon} /> : null}
+ {_tab.icon ? <MkIcon type={_tab.icon} /> : null}
{_tab.label}
</span>
} key={_tab.uuid}>
<SubTable
Tab={_tab}
+ SupMenuID={MenuID}
MenuID={_tab.linkTab}
mainSearch={_tab.searchPass === 'true' ? search : null}
- SupMenuID={this.props.MenuID}
ContainerId={this.state.ContainerId}
BID={this.state.BIDs[_tab.supMenu] || ''}
BData={this.state.BIDs[_tab.supMenu + 'data'] || ''}
- handleTableId={this.handleTableId}
/>
</TabPane>
)
--
Gitblit v1.8.0