From bde2916433c7830e2879e6524e32b9f6c8bd0bab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 02 一月 2022 16:31:32 +0800
Subject: [PATCH] 2022-01-02
---
src/tabviews/subtable/index.jsx | 696 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 453 insertions(+), 243 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index df9cbc2..31c67cd 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -2,17 +2,18 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification, Spin, Switch, Row, Col, Icon, Tabs} from 'antd'
+import { notification, Spin, Switch, Row, Col, Tabs} from 'antd'
import Api from '@/api'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
+import options from '@/store/options.js'
import UtilsDM from '@/utils/utils-datamanage.js'
-import UtilsUpdate from '@/utils/utils-update.js'
-import { modifyTabview } from '@/store/action'
+import { updateSubTable } from '@/utils/utils-update.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
+import MkIcon from '@/components/mk-icon'
import NotFount from '@/components/404'
import MKEmitter from '@/utils/events.js'
@@ -34,8 +35,6 @@
SupMenuID: PropTypes.string, // 涓婄骇鑿滃崟Id
mainSearch: PropTypes.any, // 涓昏〃鎼滅储鏉′欢
ContainerId: PropTypes.any, // 涓夌骇鑿滃崟Container(html) ID
- handleTableId: PropTypes.func, // 鎺у埗琛ㄦ牸鏁版嵁鍒囨崲鏃讹紝鏇存柊鍦ㄤ富琛ㄤ腑鐨刬d
- userConfig: PropTypes.any, // 鐢ㄦ埛鑷畾涔夎缃�
}
state = {
@@ -49,7 +48,7 @@
columns: null, // 鏄剧ず鍒�
arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
- data: null, // 鍒楄〃鏁版嵁闆�
+ data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
total: 0, // 鎬绘暟
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
@@ -62,29 +61,22 @@
statFields: [], // 鍚堣瀛楁
statFValue: [], // 鍚堣鍊�
absFields: [], // 缁濆鍊煎瓧娈�
+ loadCustomApi: true, // 鍔犺浇澶栭儴璧勬簮
+ hasReqFields: false,
+ BID: '',
+ BData: ''
}
/**
* @description 涓婄骇鑿滃崟id鍙樺寲鏃讹紝鍒锋柊鏁版嵁
*/
UNSAFE_componentWillReceiveProps(nextProps) {
- if (this.state.config && this.props.Tab.supMenu && !is(fromJS(this.props.BID), fromJS(nextProps.BID))) {
- MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid) // 鍒楄〃閲嶇疆
- this.setState({
- pageIndex: 1
- }, () => {
- if (this.state.setting) {
- this.loadmaindata(nextProps.BID, 'refresh')
- this.getStatFieldsValue(nextProps.BID, 'refresh')
- }
+ const { setting } = this.state
+
+ if (setting && !this.props.Tab.supMenu && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({}, () => {
+ this.loadData()
})
- } else if (!this.props.Tab.supMenu && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (this.state.setting) {
- this.setState({}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
- })
- }
}
}
@@ -92,7 +84,7 @@
* @description 鑾峰彇椤甸潰閰嶇疆淇℃伅
*/
async loadconfig () {
- const { permAction, permMenus, Tab, BID, userConfig } = this.props
+ const { permAction, permMenus, Tab } = this.props
let param = {
func: 'sPC_Get_LongParam',
@@ -104,6 +96,8 @@
try { // 閰嶇疆淇℃伅瑙ｆ瀽
config = JSON.parse(window.decodeURIComponent(window.atob(result.LongParam)))
+ config.setting.MenuName = Tab.label
+ config.setting.$name = Tab.label
} catch (e) {
console.warn('Parse Failure')
config = ''
@@ -136,23 +130,24 @@
let absFields = [] // 缁濆鍊煎瓧娈�
// 鐗堟湰鍏煎
- config = UtilsUpdate.updateSubTable(config)
+ config = updateSubTable(config)
// 鏉冮檺杩囨护
if (this.props.menuType !== 'HS') {
config.action = config.action.filter(item => permAction[item.uuid])
}
- let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
- // 瀛楁鏉冮檺榛戝悕鍗�
- config.search = config.search.map(item => {
- item.oriInitval = item.initval
- if (!item.blacklist || item.blacklist.length === 0) return item
- if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- item.Hide = 'true'
+ config.search = Utils.initSearchVal(config.search)
+
+ let hasReqFields = false
+ config.search.forEach(field => {
+ if (field.required) {
+ hasReqFields = true
}
- return item
})
+
+ // 瀛楁鏉冮檺榛戝悕鍗�
+ let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
config.columns = config.columns.map(col => {
if (!col.blacklist || col.blacklist.length === 0) return col
@@ -176,36 +171,17 @@
let chartId = config.charts[0] ? config.charts[0].uuid : ''
- if (userConfig) {
- config.action = config.action.map(item => {
- if (userConfig.action[item.uuid]) {
- delete userConfig.action[item.uuid].label
- item = {...item, ...userConfig.action[item.uuid]}
- }
-
- if (item.execMode) {
- item.OpenType = 'funcbutton'
- }
-
- if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify && item.printer) {
- item.verify.defaultPrinter = item.printer.defaultPrinter || ''
- if (item.verify.printerTypeList && item.printer.printerList) {
- item.verify.printerTypeList = item.verify.printerTypeList.map(cell => {
- cell.printer = item.printer.printerList[cell.Value] || ''
-
- return cell
- })
- }
- }
-
- return item
- })
- }
-
// 1銆佺瓫閫夊瓧娈甸泦锛�2銆佽繃婊ら殣钘忓垪鍙婂悎骞跺垪涓殑瀛楁uuid
config.columns.forEach(col => {
if (col.field) {
_arrField.push(col.field)
+
+ if (col.linkmenu && col.linkmenu.length > 0) {
+ let menu_id = col.linkmenu.slice(-1)[0]
+ col.linkThdMenu = permMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ } else {
+ col.linkThdMenu = ''
+ }
col.nameField && _arrField.push(col.nameField) // 閾炬帴鍚嶅瓧娈�
if (col.Hide !== 'true' && col.type === 'number' && col.sum === 'true') {
@@ -225,13 +201,6 @@
config.columns.forEach((col, index) => {
if (_hideCol.includes(col.uuid)) return
- if (col.linkmenu && col.linkmenu.length > 0) {
- let menu_id = col.linkmenu.slice(-1)[0]
- col.linkThdMenu = permMenus.filter(m => m.MenuID === menu_id)[0] || ''
- } else {
- col.linkThdMenu = ''
- }
-
col.sort = index
if (col.type === 'colspan') {
@@ -246,8 +215,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
@@ -258,10 +229,22 @@
config.action.forEach(item => {
item.logLabel = Tab.label + '-' + item.label // 鐢ㄤ簬sPC_TableData_InUpDe璁板綍鎿嶄綔鎸夐挳
- if (item.execMode) {
- item.OpenType = 'funcbutton'
- }
+ item.$menuId = this.props.MenuID
+ if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify) { // 鎵撳嵃鏈鸿缃�
+ let _item = window.GLOB.UserCacheMap.get(Tab.uuid + item.uuid)
+
+ if (_item) {
+ item.verify.defaultPrinter = _item.printer || ''
+ if (item.verify.printerTypeList && _item.printerList) {
+ item.verify.printerTypeList = item.verify.printerTypeList.map(cell => {
+ cell.printer = _item.printerList[cell.Value] || ''
+
+ return cell
+ })
+ }
+ }
+ }
if (item.position === 'toolbar') {
_actions.push(item)
} else if (item.position === 'grid') {
@@ -274,36 +257,13 @@
_columns.push(config.gridBtn)
}
- let valid = true // 鎼滅储鏉′欢蹇呭～楠岃瘉
- config.search.forEach(field => {
- if (field.required === 'true' && !field.initval) {
- valid = false
- }
- })
-
- // 娣诲姞鐢ㄦ埛鏄剧ず鍒楄缃�
- if (userConfig) {
- _columns = _columns.map(item => {
- if (userConfig.columns[item.uuid]) {
- delete userConfig.columns[item.uuid].label
- item = {...item, ...userConfig.columns[item.uuid]}
- }
-
- return item
- })
-
- _columns.sort((pre, next) => {
- return pre.sort - next.sort
- })
- }
-
config.setting.tabType = 'sub'
// 鏁版嵁婧愪俊鎭澶勭悊
config.setting.laypage = config.setting.laypage !== 'false' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.execute = config.setting.default !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.customScript = '' // 鑷畾涔夎剼鏈�
- if (config.setting.interType === 'system') {
+ if (config.setting.interType === 'system' || (config.setting.interType === 'custom' && config.setting.requestMode === 'system')) {
if (config.setting.scripts && config.setting.scripts.length > 0) {
let _customScript = ''
config.setting.scripts.forEach(item => {
@@ -333,9 +293,46 @@
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
}
+
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
+
+ let regs = [
+ { reg: /@userName@/ig, value: `'${userName}'` },
+ { reg: /@fullName@/ig, value: `'${fullName}'` },
+ { reg: /@login_city@/ig, value: `'${city}'` }
+ ]
+
+ regs.forEach(cell => {
+ config.setting.dataresource = config.setting.dataresource.replace(cell.reg, cell.value)
+ config.setting.customScript = config.setting.customScript.replace(cell.reg, cell.value)
+ })
+ }
+
+ if (config.setting.selected !== 'init' && config.setting.selected !== 'always') {
+ config.setting.selected = 'false'
+ } else if (config.setting.selected === 'init' && config.setting.onload === 'false') {
+ config.setting.selected = 'false'
+ }
+
+ if (config.setting.controlField) {
+ if (config.setting.controlVal) {
+ config.setting.controlVal = config.setting.controlVal.split(',')
+ } else {
+ config.setting.controlVal = ['']
+ }
}
this.setState({
+ pageSize: config.setting.pageSize || 10,
+ BID: this.props.BID || '',
+ BData: this.props.BData || '',
loadingview: false,
chartId,
config,
@@ -346,11 +343,11 @@
actions: _actions,
columns: _columns,
arr_field: _arrField.join(','),
- search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: Utils.initMainSearch(config.search),
+ hasReqFields
}, () => {
- if (config.setting.onload !== 'false' && (!Tab.supMenu || BID || Tab.isTreeNode) && valid) { // 鍒濆鍖栧彲鍔犺浇
- this.loadmaindata()
- this.getStatFieldsValue()
+ if (config.setting.onload !== 'false' && (!Tab.supMenu || this.props.BID || Tab.isTreeNode)) { // 鍒濆鍖栧彲鍔犺浇
+ this.loadData()
}
})
} else {
@@ -367,62 +364,268 @@
})
}
}
-
- /**
- * @description 瀛愯〃鏁版嵁鍔犺浇
- */
- async loadmaindata (bid, type) {
+
+ loadData = () => {
const { mainSearch } = this.props
- const { setting, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
+ const { setting, BID, search, loadCustomApi, hasReqFields } = this.state
- let _BID = this.props.BID
let searches = fromJS(search).toJS()
if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
searches = [...mainSearch, ...searches]
}
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
- let prex = this.props.Tab && this.props.Tab.label ? this.props.Tab.label + '-' : ''
+ if (hasReqFields) {
+ let requireFields = searches.filter(item => item.required && item.value === '')
+ if (requireFields.length > 0) {
+ this.setState({
+ loading: false
+ })
+ return
+ }
+ }
- if (requireFields.length > 0) {
- let labels = requireFields.map(item => item.label)
- labels = Array.from(new Set(labels))
-
+ if (this.props.Tab.supMenu && !BID) { // 涓昏〃ID涓嶅瓨鍦ㄦ椂锛屼笉鏌ヨ瀛愯〃
+ this.setState({
+ data: [],
+ selectedData: [],
+ statFValue: [],
+ total: 0
+ })
+ MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.Tab.uuid, '', '')
+ return
+ } else if (window.GLOB.systemType === 'production' && setting.interType === 'custom' && !setting.proInterface) {
notification.warning({
top: 92,
- message: prex + this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
+ message: '鏈缃寮忕郴缁熷湴鍧�!',
duration: 3
})
return
}
- if (type === 'refresh') {
- if (!bid) { // 涓昏〃ID涓嶅瓨鍦ㄦ椂锛屼笉鏌ヨ瀛愯〃
- this.setState({
- data: [],
- total: 0
- })
- return
+ this.setState({
+ selectedData: []
+ })
+ MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.Tab.uuid, '', '')
+
+ if (setting.interType === 'custom' && loadCustomApi) {
+ if (setting.execTime === 'once') {
+ this.setState({loadCustomApi: false})
+ }
+
+ this.loadOutResource(searches)
+ if (setting.execType === 'async') {
+ this.loadmaindata()
+ }
+ } else {
+ this.loadmaindata()
+ }
+ }
+
+ loadOutResource = (searches) => {
+ const { setting, BID } = this.state
+
+ let param = UtilsDM.getPrevQueryParams(setting, searches, BID, this.props.menuType)
+
+ if (setting.execType === 'sync') {
+ this.setState({
+ loading: true
+ })
+ }
+
+ Api.genericInterface(param).then(res => {
+ if (res.status) {
+ if (res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) {
+ this.loadmaindata()
+ } else {
+ this.customOuterRequest(res)
+ }
} else {
- _BID = bid
+ this.setState({
+ loading: false
+ })
+ notification.error({
+ top: 92,
+ message: res.message,
+ duration: 10
+ })
+ }
+ }, () => {
+ this.setState({
+ loading: false
+ })
+ })
+ }
+
+ customOuterRequest = (result) => {
+ const { setting } = this.state
+ let url = ''
+
+ if (window.GLOB.systemType === 'production') {
+ url = setting.proInterface
+ } else {
+ url = setting.interface
+ }
+
+ let mkey = result.mk_api_key || ''
+
+ delete result.mk_ex_invoke
+ delete result.status
+ delete result.message
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.mk_api_key
+
+ let param = {}
+
+ Object.keys(result).forEach(key => {
+ key = key.replace(/^mk_/ig, '')
+ param[key] = result[key]
+ })
+
+ Api.directRequest(url, setting.method, param, setting.cross).then(res => {
+ if (typeof(res) !== 'object') {
+ let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
+
+ if (typeof(res) === 'string') {
+ error = res.replace(/'/ig, '"')
+ }
+
+ let _result = {
+ mk_api_key: mkey,
+ $ErrCode: 'E',
+ $ErrMesg: error
+ }
+
+ this.customCallbackRequest(_result)
+ } else {
+ if (Array.isArray(res)) {
+ res = { data: res }
+ }
+ res.mk_api_key = mkey
+ this.customCallbackRequest(res)
+ }
+ }, (e) => {
+ let _result = {
+ mk_api_key: mkey,
+ $ErrCode: 'E',
+ $ErrMesg: e && e.statusText ? e.statusText : ''
+ }
+
+ this.customCallbackRequest(_result)
+ })
+ }
+
+ customCallbackRequest = (result) => {
+ const { setting, BID } = this.state
+ let errSql = ''
+ if (result.$ErrCode === 'E') {
+ errSql = `
+ set @ErrorCode='E'
+ set @retmsg='${result.$ErrMesg}'
+ `
+ delete result.$ErrCode
+ delete result.$ErrMesg
+ }
+
+ let lines = UtilsDM.getCallBackSql(setting, result)
+ let param = {}
+
+ if (setting.callbackType === 'script') { // 浣跨敤鑷畾涔夎剼鏈�
+ let sql = lines.map(item => (`
+ ${item.insert}
+ ${item.selects.join(` union all
+ `)}
+ `))
+ sql = sql.join('')
+
+ param = UtilsDM.getCallBackQueryParams(setting, sql, errSql)
+
+ if (BID) {
+ param.BID = BID
+ }
+
+ if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+ }
+ } else {
+ param.func = 's_ex_result_back'
+ param.s_ex_result = lines.map((item, index) => ({
+ MenuID: this.props.MenuID,
+ MenuName: this.props.Tab.label,
+ TableName: item.table,
+ LongText: window.btoa(window.encodeURIComponent(`${item.insert} ${item.selects.join(` union all `)}`)),
+ Sort: index + 1
+ }))
+
+ if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ let sql = lines.map(item => (`
+ ${item.insert}
+ ${item.selects.join(` union all
+ `)}
+ `))
+ sql = sql.join('')
+ console.info(sql.replace(/\n\s{10}/ig, '\n'))
}
}
+
+ Api.genericInterface(param).then(res => {
+ if (res.status) {
+ this.loadmaindata()
+ } else {
+ this.setState({
+ loading: false
+ })
+ notification.error({
+ top: 92,
+ message: res.message,
+ duration: 10
+ })
+ }
+ }, () => {
+ this.setState({
+ loading: false
+ })
+ })
+ }
+
+ /**
+ * @description 瀛愯〃鏁版嵁鍔犺浇
+ */
+ async loadmaindata () {
+ const { mainSearch } = this.props
+ const { setting, BID, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
+
+ let searches = fromJS(search).toJS()
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ searches = [...mainSearch, ...searches]
+ }
+
this.setState({
- selectedData: [],
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, _BID, this.props.menuType)
-
- this.handleTableId()
-
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.Tab.label || ''
- }
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
let result = await Api.genericInterface(param)
+
+ this.getStatFieldsValue(searches)
+
if (result.status) {
+ let start = 1
+ if (setting.laypage) {
+ start = pageSize * (pageIndex - 1) + 1
+ }
+
+ if (setting.selected !== 'false') {
+ setTimeout(() => {
+ MKEmitter.emit('mkTableCheckTopLine', this.props.MenuID)
+ }, 200)
+ if (setting.selected === 'init') {
+ this.setState({setting: {...setting, selected: 'false'}})
+ }
+ }
+
this.setState({
data: result.data.map((item, index) => {
if (absFields.length) {
@@ -434,6 +637,16 @@
})
}
item.key = index
+ item.$$uuid = item[setting.primaryKey] || ''
+ item.$$BID = BID || ''
+ item.$Index = start + index + ''
+
+ if (setting.controlField) {
+ if (setting.controlVal.includes(item[setting.controlField])) {
+ item.$disabled = true
+ }
+ }
+
return item
}),
total: result.total,
@@ -441,6 +654,7 @@
loading: false
})
} else {
+ let prex = this.props.Tab && this.props.Tab.label ? this.props.Tab.label + '-' : ''
this.setState({
loading: false
})
@@ -457,8 +671,8 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadmainLinedata (id) {
- const { mainSearch, BID } = this.props
- const { setting, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
+ const { mainSearch } = this.props
+ const { setting, BID, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
let searches = fromJS(search).toJS()
if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -472,15 +686,12 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.Tab.label || ''
- }
-
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]
+ let _data = result.data[0] || {}
if (absFields.length) {
absFields.forEach(field => {
@@ -491,22 +702,33 @@
})
}
+ _data.$$uuid = _data[setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+
try {
data = data.map(item => {
- if (item[setting.primaryKey] === _data[setting.primaryKey]) {
+ if (item.$$uuid === _data.$$uuid) {
_data.key = item.key
+ _data.$Index = item.$Index
return _data
} else {
return item
}
})
- } catch {
+ selectedData = selectedData.map(item => {
+ if (_data.$$uuid === item.$$uuid) {
+ return _data
+ }
+ return item
+ })
+ } catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
}
this.setState({
- data: data,
+ data,
+ selectedData,
loading: false
})
} else {
@@ -524,41 +746,14 @@
/**
* @description 鑾峰彇鍚堣瀛楁鍊�
*/
- getStatFieldsValue = (bid, type) => {
- const { mainSearch } = this.props
- const { setting, search, orderBy, statFields } = this.state
+ getStatFieldsValue = (searches) => {
+ const { setting, BID, orderBy, statFields } = this.state
- let _BID = this.props.BID
- let searches = fromJS(search).toJS()
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- searches = [...mainSearch, ...searches]
- }
-
- if (statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
-
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
- if (requireFields.length > 0) {
- return
- }
-
- if (type === 'refresh') {
- if (!bid) { // 涓昏〃ID涓嶅瓨鍦ㄦ椂锛屼笉鏌ヨ瀛愯〃鍚堣鍊�
- this.setState({
- statFValue: []
- })
- return
- } else {
- _BID = bid
- }
- }
+ if (statFields.length === 0 || !(setting.interType === 'system' || (setting.interType === 'custom' && setting.requestMode === 'system')) || !setting.dataresource) return
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, statFields, searches, _orderBy, _BID, this.props.menuType)
+ let param = UtilsDM.getStatQueryDataParams(setting, statFields, searches, _orderBy, BID, this.props.menuType)
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.Tab.label || ''
- }
-
Api.genericInterface(param).then(res => {
if (res.status) {
let _data = res.data[0]
@@ -597,13 +792,12 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid) // 鍒楄〃閲嶇疆
+ MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
this.setState({
pageIndex: 1,
search: searches,
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
}
@@ -624,7 +818,7 @@
pageSize: pagination.pageSize,
orderBy: (sorter.field && sorter.order) ? `${sorter.field} ${sorter.order}` : ''
}, () => {
- this.loadmaindata()
+ this.loadData()
})
}
@@ -633,63 +827,38 @@
*/
reloadtable = (btn) => {
if (!btn || btn.resetPageIndex !== 'false') {
- MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid) // 鍒楄〃閲嶇疆
+ MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
this.setState({
pageIndex: 1
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
} else {
- MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid, 'false') // 鍒楄〃閲嶇疆
- this.loadmaindata()
- this.getStatFieldsValue()
- }
- }
-
- /**
- * @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
- */
- refreshbyaction = (position, btn) => {
- const { Tab, SupMenuID, BID } = this.props
-
- if (position === 'grid' || position === 'view') {
- this.reloadtable(btn)
- } else if (position === 'maingrid' || position === 'mainline') {
- this.reloadtable(btn)
- if (Tab.supMenu === 'mainTable') {
- MKEmitter.emit('reloadData', SupMenuID, (BID || 'empty')) // 涓昏〃閲嶇疆
- } else if (Tab.supMenu) {
- MKEmitter.emit('reloadData', Tab.supMenu, (BID || 'empty')) // 涓昏〃閲嶇疆
- } else if (!Tab.supMenu && Tab.level === 0) {
- MKEmitter.emit('reloadData', SupMenuID, (BID || 'empty')) // 鏍戝舰缁撴瀯锛�0绾ф爣绛�
- }
- } else if (position === 'equaltab') {
- this.reloadtable(btn)
- if (Tab.equalTab && Tab.equalTab.length > 0) {
- MKEmitter.emit('reloadData', Tab.equalTab.join(',')) // 鍚岀骇鏍囩閲嶇疆
- }
+ MKEmitter.emit('resetTable', this.props.Tab.uuid, 'false') // 鍒楄〃閲嶇疆
+ this.loadData()
}
}
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = () => {
- const { Tab, mainSearch } = this.props
+ queryModuleParam = (menuId, btnId) => {
+ const { Tab, mainSearch, MenuID } = this.props
const { arr_field, orderBy, search, setting} = this.state
+
+ if (MenuID !== menuId) return
let searches = search
if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
searches = [...mainSearch, ...search]
}
- return {
+ MKEmitter.emit('returnModuleParam', MenuID, btnId, {
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: searches,
menuName: Tab.label
- }
+ })
}
/**
@@ -697,13 +866,6 @@
*/
changeSelectedData = (selectedData) => {
this.setState({selectedData})
- }
-
- /**
- * @description 琛ㄦ牸Id鍙樺寲
- */
- handleTableId = (type = this.props.Tab.uuid, id = '', data = '') => {
- this.props.handleTableId(type, id, data)
}
/**
@@ -724,7 +886,7 @@
this.setState({chartId: uuid})
}
- reloadData = (menuId, id) => {
+ reloadData = (menuId, id) => { // Id瀛樺湪鏃讹紝鍒锋柊琛�
const { MenuID } = this.props
if (menuId.indexOf(MenuID) === -1) return
@@ -737,17 +899,73 @@
}
}
+ /**
+ * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+ * @param {*} menuId // 鑿滃崟Id
+ * @param {*} position // 鍒锋柊浣嶇疆
+ * @param {*} btn // 鎵ц鐨勬寜閽�
+ */
+ refreshByButtonResult = (menuId, position, btn, id, lines) => {
+ const { MenuID } = this.props
+
+ if (MenuID !== menuId) return
+
+ const { Tab, SupMenuID } = this.props
+ const { BID } = this.state
+
+ if (position === 'line' && lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else if (position === 'grid' || position === 'view') {
+ this.reloadtable(btn)
+ } else if (position === 'maingrid' || position === 'mainline') {
+ this.reloadtable(btn)
+ if (Tab.supMenu) {
+ MKEmitter.emit('reloadData', Tab.supMenu, (BID || 'empty')) // 涓昏〃閲嶇疆
+ } else if (!Tab.supMenu && Tab.level === 0) {
+ MKEmitter.emit('reloadData', SupMenuID, (BID || 'empty')) // 鏍戝舰缁撴瀯锛�0绾ф爣绛�
+ }
+ } else if (position === 'equaltab') {
+ this.reloadtable(btn)
+ if (Tab.equalTab && Tab.equalTab.length > 0) {
+ MKEmitter.emit('reloadData', Tab.equalTab.join(',')) // 鍚岀骇鏍囩閲嶇疆
+ }
+ }
+ }
+
+ changeTableLine = (ContainerId, tableId, id, data) => {
+ const { Tab } = this.props
+ const { setting } = this.state
+
+ if (!Tab.supMenu || tableId !== Tab.supMenu) return
+
+ this.setState({BData: data, BID: id})
+
+ if (!setting) return
+
+ if (id !== this.state.BID || id !== '') {
+ MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ }
+ }
+
UNSAFE_componentWillMount() {
// 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
this.loadconfig()
}
- shouldComponentUpdate (nextProps, nextState) { // handleTableId 鍑芥暟鍒ゆ柇鏃朵笉鐩哥瓑
- return !is(fromJS({...this.props, handleTableId: ''}), fromJS({...nextProps, handleTableId: ''})) || !is(fromJS(this.state), fromJS(nextState))
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.state), fromJS(nextState))
}
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('changeTableLine', this.changeTableLine)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
/**
@@ -758,22 +976,25 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('changeTableLine', this.changeTableLine)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
- const { config, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, chartId, selectedData } = this.state
+ const { config, BID, BData, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, chartId, selectedData } = this.state
return (
<div className="subtable" id={'subtable' + this.props.MenuID}>
{loadingview && <Spin />}
{searchlist && searchlist.length ?
- <SubSearch BID={this.props.BID} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ <SubSearch BID={BID} setting={setting} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
}
{config ? <Row className="chart-view" gutter={16}>
{/* 瑙嗗浘缁� */}
{!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 => {
@@ -784,41 +1005,36 @@
{config.charts.length > 1 ? <p className="chart-table chart-title">{item.title}</p> : null}
<div className="sub-action">
<SubAction
+ BID={BID}
+ BData={BData}
setting={setting}
actions={actions}
columns={columns}
Tab={this.props.Tab}
- BID={this.props.BID}
- BData={this.props.BData}
MenuID={this.props.MenuID}
selectedData={selectedData}
- refreshdata={this.refreshbyaction}
ContainerId={this.props.ContainerId}
- getexceloutparam={this.getexceloutparam}
/>
</div>
<div className="subtable-box">
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && this.state.data && this.state.data.length > 0 ?
- <Switch title="鏀惰捣" className="subtable-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
+ <Switch title="鏀惰捣" className="subtable-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
<SubTable
+ BData={BData}
tableId={this.props.Tab.uuid}
pickup={pickup}
setting={setting}
columns={columns}
pageSize={pageSize}
- BID={this.props.BID}
dict={this.state.dict}
data={this.state.data}
- BData={this.props.BData}
total={this.state.total}
MenuID={this.props.MenuID}
loading={this.state.loading}
- refreshdata={this.refreshbytable}
statFValue={this.state.statFValue}
- handleTableId={this.handleTableId}
ContainerId={this.props.ContainerId}
- refreshbyaction={this.refreshbyaction}
+ refreshdata={this.refreshbytable}
chgSelectData={this.changeSelectedData}
/>
</div>
@@ -828,19 +1044,17 @@
return (
<Col className="card-view" span={item.width} key={item.uuid}>
<CardComponent
+ BID={BID}
plot={item}
+ BData={BData}
config={config}
columns={columns}
Tab={this.props.Tab}
- BID={this.props.BID}
- BData={this.props.BData}
data={this.state.data}
MenuID={this.props.MenuID}
loading={this.state.loading}
tableId={this.props.Tab.uuid}
- refreshdata={this.refreshbyaction}
- handleTableId={this.handleTableId}
- getexceloutparam={this.getexceloutparam}
+ ContainerId={this.props.ContainerId}
/>
</Col>
)
@@ -848,12 +1062,11 @@
return (
<Col span={item.width} key={item.uuid}>
<ChartComponent
+ BID={BID}
plot={item}
config={config}
- BID={this.props.BID}
Tab={this.props.Tab}
data={this.state.data}
- getexceloutparam={this.getexceloutparam}
loading={this.state.loading}
/>
</Col>
@@ -869,17 +1082,14 @@
const mapStateToProps = (state) => {
return {
- tabviews: state.tabviews,
menuType: state.editLevel,
permAction: state.permAction,
permMenus: state.permMenus,
}
}
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
- }
+const mapDispatchToProps = () => {
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(SubTabViewTable)
\ No newline at end of file
--
Gitblit v1.8.0