From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01
---
src/tabviews/commontable/index.jsx | 1038 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 578 insertions(+), 460 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 10b5d2e..a4658c6 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -2,35 +2,32 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification, Spin, Tabs, Icon, Switch, Modal, Button, message, Tree, Typography, Row, Col } from 'antd'
+import { notification, Spin, Tabs, Icon, Switch, Row, Col } from 'antd'
import Api from '@/api'
-import options from '@/store/options.js'
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 { updateCommonTable } from '@/utils/utils-update.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
-import { refreshTabView } from '@/store/action'
import MKEmitter from '@/utils/events.js'
-
-import MainSearch from '@/tabviews/zshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'
// 閫氱敤缁勪欢
+const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const MainAction = asyncSpinComponent(() => import('@/tabviews/zshare/actionList'))
const MainTable = asyncSpinComponent(() => import('@/tabviews/zshare/normalTable'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
const SubTable = asyncSpinComponent(() => import('@/tabviews/subtable'))
const CardComponent = asyncSpinComponent(() => import('@/tabviews/zshare/cardcomponent'))
const ChartComponent = asyncSpinComponent(() => import('@/tabviews/zshare/chartcomponent'))
+const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
const { TabPane } = Tabs
-const { TreeNode } = Tree
-const { Paragraph } = Typography
class NormalTable extends Component {
static propTpyes = {
@@ -48,14 +45,13 @@
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
- userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
+ shortcuts: null, // 蹇嵎閿�
searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- logcolumns: null, // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
- data: null, // 鍒楄〃鏁版嵁闆�
+ data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
total: 0, // 鎬绘暟
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
@@ -65,19 +61,19 @@
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
BIDs: {}, // 涓婄骇琛╥d
pickup: false, // 涓昏〃鏁版嵁闅愯棌鏄剧ず鍒囨崲
- treevisible: false, // 鑿滃崟缁撴瀯鏍戝脊妗嗘樉绀洪殣钘忔帶鍒�
- refreshtabs: null, // 闇�瑕佸埛鏂扮殑鏍囩闆�
- tabActive: null, // 鏍囩椤靛睍寮�鎺у埗
chartId: '', // 灞曞紑鍥捐〃ID
statFields: [], // 鍚堣瀛楁
- statFValue: [] // 鍚堣鍊�
+ statFValue: [], // 鍚堣鍊�
+ absFields: [], // 缁濆鍊煎瓧娈�
+ loadCustomApi: true, // 鍔犺浇澶栭儴璧勬簮
+ hasReqFields: false
}
/**
* @description 鑾峰彇椤甸潰閰嶇疆淇℃伅
*/
async loadconfig () {
- const { permAction, permMenus, param } = this.props
+ const { permAction, permMenus, param, MenuName } = this.props
let _param = {
func: 'sPC_Get_LongParam',
@@ -87,11 +83,14 @@
if (result.status) {
let config = ''
- let userConfig = null
- let _curUserConfig = ''
+ let shortcuts = []
try { // 閰嶇疆淇℃伅瑙ｆ瀽
config = JSON.parse(window.decodeURIComponent(window.atob(result.LongParam)))
+ config.MenuID = this.props.MenuID
+ config.MenuName = MenuName
+ config.setting.MenuName = MenuName
+ config.setting.$name = MenuName
} catch (e) {
console.warn('Parse Failure')
config = ''
@@ -100,11 +99,36 @@
// HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
if (result.LongParamUser && this.props.menuType !== 'HS') {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
- userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
- _curUserConfig = userConfig[this.props.MenuID]
+ let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
+ if (userConfig && !userConfig.version) {
+ Object.keys(userConfig).forEach(key => {
+ let component = userConfig[key]
+
+ if (!component.action) return
+
+ Object.keys(component.action).forEach(uuid => {
+ let item = {uuid: uuid, parentId: key, shortcut: component.action[uuid].shortcut}
+ let printer = component.action[uuid].printer
+
+ if (item.shortcut) {
+ item.$shortcut = item.shortcut.join('+')
+ shortcuts.push(item)
+ }
+ if (printer) {
+ item.printer = printer.defaultPrinter || ''
+ item.printerList = printer.printerList || ''
+ window.GLOB.UserCacheMap.set(key + uuid, item)
+ }
+ })
+ })
+ } else if (userConfig) {
+ shortcuts = userConfig.action
+ userConfig.printers.forEach(item => {
+ window.GLOB.UserCacheMap.set(item.parentId + item.uuid, item)
+ })
+ }
} catch (e) {
console.warn('Parse Failure')
- userConfig = null
}
}
@@ -128,7 +152,7 @@
}
// 鐗堟湰鍏煎
- config = UtilsUpdate.updateCommonTable(config)
+ config = updateCommonTable(config)
// 鏉冮檺杩囨护
if (this.props.menuType !== 'HS') {
@@ -140,20 +164,12 @@
// 鍘婚櫎绌鸿鏍囩
config.tabgroups = config.tabgroups.filter(group => group.sublist.length > 0)
+ let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
// 瑙嗗浘鏉冮檺
config.charts = config.charts.filter(item => {
if (item.Hide === 'true') return false
if (!item.blacklist || item.blacklist.length === 0) return true
-
- let _black = item.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
-
- if (_black.length > 0 || item.Hide === 'true') {
- return false
- } else {
- return true
- }
+ return item.blacklist.filter(v => roleId.indexOf(v) > -1).length === 0
})
if (config.charts.length <= 1) {
@@ -161,40 +177,25 @@
}
let chartId = config.charts[0] ? config.charts[0].uuid : ''
- // 瀛楁鏉冮檺榛戝悕鍗�
+ config.search = Utils.initSearchVal(config.search)
+
+ // 瀛楁閫忚鍙婂繀濉爣蹇�
+ let hasReqFields = false
config.search = config.search.map(item => {
- item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param) {
- if (param.searchkey === item.field) {
- item.initval = param.searchval
- } else if (param.BID && item.field.toLowerCase() === 'bid') {
- item.initval = param.BID
- } else if (param.data && param.data[item.field]) {
- item.initval = param.data[item.field]
- }
+ if (['text', 'select', 'link'].includes(item.type) && param && param.$searchkey === item.field) {
+ item.initval = param.$searchval
}
- if (!item.blacklist || item.blacklist.length === 0) return item
-
- let _black = item.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
-
- if (_black.length > 0) {
- item.Hide = 'true'
+ if (item.required) {
+ hasReqFields = true
}
return item
})
config.columns = config.columns.map(col => {
- if (!col.field || !col.blacklist || col.blacklist.length === 0 || config.setting.primaryKey === col.field) return col
-
- let _black = col.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
-
- if (_black.length > 0) {
+ if (!col.field || !col.blacklist || col.blacklist.length === 0) return col
+ if (col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
col.Hide = 'true'
}
@@ -208,8 +209,9 @@
config.setting.laypage = config.setting.laypage !== 'false' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.execute = config.setting.default !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.customScript = '' // 鑷畾涔夎剼鏈�
+ config.setting.dataresource = config.setting.dataresource || ''
- 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 => {
@@ -223,14 +225,11 @@
if (!config.setting.execute) { // 榛樿sql 涓嶆墽琛屾椂 缃┖
config.setting.dataresource = ''
- } else {
- config.setting.dataresource = config.setting.dataresource || ''
- }
- if (/\s/.test(config.setting.dataresource)) {
+ } else if (/\s/.test(config.setting.dataresource)) {
config.setting.dataresource = '(' + config.setting.dataresource + ') tb'
}
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*')
config.setting.dataresource = config.setting.dataresource.replace(/@\$/ig, '*/')
config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*')
@@ -239,58 +238,68 @@
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
}
- }
- if (_curUserConfig) {
- config.setting = {...config.setting, ..._curUserConfig.setting}
- config.easyCode = _curUserConfig.easyCode || config.easyCode || ''
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
- config.action = config.action.map(item => {
- if (item.execMode) {
- item.OpenType = 'funcbutton'
- }
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
- if (_curUserConfig.action[item.uuid]) {
- delete _curUserConfig.action[item.uuid].label
- item = {...item, ..._curUserConfig.action[item.uuid]}
- }
-
- 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] || ''
+ let regs = [
+ { reg: /@userName@/ig, value: `'${userName}'` },
+ { reg: /@fullName@/ig, value: `'${fullName}'` },
+ { reg: /@login_city@/ig, value: `'${city}'` }
+ ]
- return cell
- })
- }
- }
-
- return item
+ 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.urlFields) {
+ let _param = param || {}
+ config.urlFields.forEach(field => {
+ let reg = new RegExp('@' + field + '@', 'ig')
+ let val = `'${_param[field] || ''}'`
+ config.setting.dataresource = config.setting.dataresource.replace(reg, val)
+ config.setting.customScript = config.setting.customScript.replace(reg, val)
+ })
+ }
}
-
- let _tabActive = {} // 绛涢�夊睍寮�鐨則ab椤�
-
- config.tabgroups.forEach(group => {
- _tabActive[group.uuid] = group.sublist[0].uuid
- })
let _arrField = [] // 瀛楁闆�
let _columns = [] // 鏄剧ず鍒�
- let _logcolumns = [] // 鏃ュ織鏄剧ず鍒�
let _hideCol = [] // 闅愯棌鍙婂悎骞跺垪涓瓧娈电殑uuid闆�
let colMap = new Map() // 鐢ㄤ簬瀛楁杩囨护
let statFields = [] // 鍚堣瀛楁淇℃伅
+ let absFields = [] // 缁濆鍊煎瓧娈�
let _actions = [] // 宸ュ叿鏍忔寜閽�
let _operations = [] // 鎿嶄綔鍒楁寜閽紙瀛樺湪鏃讹級
config.action.forEach(item => {
- if (item.execMode) {
- item.OpenType = 'funcbutton'
- }
+ item.logLabel = MenuName + '-' + item.label // 鐢ㄤ簬sPC_TableData_InUpDe璁板綍鎿嶄綔鎸夐挳
+ item.$menuId = this.props.MenuID
+ if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify) { // 鎵撳嵃鏈鸿缃�
+ let _item = window.GLOB.UserCacheMap.get(this.props.MenuID + item.uuid)
+
+ if (_item) {
+ item.printer = _item.printer || ''
+ 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') {
@@ -302,17 +311,24 @@
config.columns.forEach(col => {
if (col.field) {
_arrField.push(col.field)
- _logcolumns.push(col)
+
+ 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') {
statFields.push(col)
}
+ if (col.format === 'abs') {
+ absFields.push(col.field)
+ }
}
if (col.type === 'colspan' && col.sublist) { // 绛涢�夐殣钘忓垪
_hideCol = _hideCol.concat(col.sublist)
- } else if (col.Hide === 'true') {
- _hideCol.push(col.uuid)
}
colMap.set(col.uuid, col)
})
@@ -321,22 +337,24 @@
config.columns.forEach((col, index) => {
if (_hideCol.includes(col.uuid)) return
- if (col.linkThdMenu && !permMenus[col.linkThdMenu.MenuID]) {
- col.linkThdMenu = ''
- }
-
col.sort = index
- if (col.type === 'colspan' && col.sublist) {
+ if (col.type === 'colspan') {
+ if (col.unfold !== 'true') { // 涓嶅睍寮�涓烘棫鐗堝悎骞跺垪
+ col.type = 'old_colspan'
+ }
+
let _col = fromJS(col).toJS()
- let subColumn = []
- _col.sublist.forEach(sub => {
+ let subcols = []
+ _col.sublist && _col.sublist.forEach(sub => {
if (colMap.has(sub)) {
- subColumn.push(colMap.get(sub))
+ subcols.push(colMap.get(sub))
}
})
- _col.subColumn = subColumn
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
@@ -347,50 +365,24 @@
_columns.push(config.gridBtn)
}
- let valid = true // 鎼滅储鏉′欢蹇呭～楠岃瘉, 鍒濆鎼滅储鏉′欢, 濡傞�氳繃涓婄骇閫忚锛屽啓鍏ユ悳绱㈡潯浠�
- let initSearch = config.search.map(item => {
- let _item = fromJS(item).toJS()
-
- if (_item.required === 'true' && !_item.initval) {
- valid = false
- }
- return _item
- })
-
- if (_curUserConfig) {
- _columns = _columns.map(item => {
- if (_curUserConfig.columns[item.uuid]) {
- delete _curUserConfig.columns[item.uuid].label
- item = {...item, ..._curUserConfig.columns[item.uuid]}
- }
-
- return item
- })
-
- _columns.sort((pre, next) => {
- return pre.sort - next.sort
- })
- }
-
this.setState({
- BID: param && param.BID ? param.BID : '',
loadingview: false,
- chartId: chartId,
- config: config,
- statFields: statFields,
- tabActive: _tabActive,
- userConfig: userConfig,
+ absFields,
+ chartId,
+ config,
+ statFields,
+ shortcuts,
setting: config.setting,
searchlist: config.search,
actions: _actions,
columns: _columns,
- logcolumns: _logcolumns,
arr_field: _arrField.join(','),
- search: Utils.initMainSearch(initSearch) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ BID: param && param.$BID ? param.$BID : '',
+ search: Utils.initMainSearch(config.search),
+ hasReqFields
}, () => {
- if (config.setting.onload !== 'false' && valid) { // 鍒濆鍖栧彲鍔犺浇
- this.loadmaindata()
- this.getStatFieldsValue()
+ if (config.setting.onload !== 'false') { // 鍒濆鍖栧彲鍔犺浇
+ this.loadData()
}
this.setShortcut()
})
@@ -408,8 +400,12 @@
}
setShortcut = () => {
- const { actions, userConfig, config } = this.state
- if (!userConfig) return
+ const { shortcuts } = this.state
+
+ if (!shortcuts || shortcuts.length === 0) {
+ document.onkeydown = () => {}
+ return
+ }
document.onkeydown = (event) => {
let e = event || window.event
@@ -424,70 +420,28 @@
preKey = 'alt'
}
- if (!preKey) return
+ if (!preKey || !keyCode) return
- let triggerId = ''
+ let _shortcut = `${preKey}+${keyCode}`
- actions.some(item => {
- if (Array.isArray(item.shortcut) && preKey === item.shortcut[0] && keyCode === item.shortcut[1]) {
- e.preventDefault()
- triggerId = item.uuid
+ shortcuts.some(item => {
+ if (item.$shortcut === _shortcut) {
+ MKEmitter.emit('triggerBtnId', item.uuid)
+
+ let element = item.parentId && item.parentId !== this.props.MenuID ? document.getElementById(item.parentId) : '' // 鏍囩鍒囨崲
+ if (element && element.click) {
+ element.click()
+ }
+
return true
}
- return false
- })
-
- if (triggerId) {
- MKEmitter.emit('triggerBtnId', triggerId)
- return
- }
-
- Object.keys(userConfig).some(key => {
- if (key === this.props.MenuID || !userConfig[key].action) return false
-
- let _actions = userConfig[key].action
-
- Object.keys(_actions).some(btnkey => {
- let item = _actions[btnkey]
-
- if (Array.isArray(item.shortcut) && preKey === item.shortcut[0] && keyCode === item.shortcut[1]) {
- e.preventDefault()
- triggerId = btnkey
-
- let _groupId = ''
- let _ActiveTabId = ''
- config.tabgroups.forEach(group => {
- let _tab = group.sublist.filter(tab => tab.uuid === key)[0]
-
- if (!_tab) return
-
- _groupId = group.uuid
- _ActiveTabId = _tab.uuid
- })
-
- this.setState({
- tabActive: {...this.state.tabActive, [_groupId]: _ActiveTabId}
- }, () => {
- MKEmitter.emit('triggerBtnId', triggerId)
- })
-
- return true
- }
- return false
- })
-
- if (triggerId) return true
return false
})
}
}
- /**
- * @description 涓昏〃鏁版嵁鍔犺浇
- */
- async loadmaindata () {
- const { setting, arr_field, BIDs, search, orderBy, BID, pageIndex, pageSize } = this.state
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+ loadData = () => {
+ const { setting, search, BIDs, loadCustomApi, hasReqFields } = this.state
this.setState({
selectedData: [],
@@ -498,34 +452,246 @@
}
})
- if (requireFields.length > 0) {
- let labels = requireFields.map(item => item.label)
- labels = Array.from(new Set(labels))
+ if (hasReqFields) {
+ let requireFields = search.filter(item => item.required && item.value === '')
+ if (requireFields.length > 0) {
+ this.setState({
+ loading: false
+ })
+ return
+ }
+ }
+
+ if (window.GLOB.systemType === 'production' && setting.interType === 'custom' && !setting.proInterface) {
notification.warning({
top: 92,
- message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
+ message: '鏈缃寮忕郴缁熷湴鍧�!',
duration: 3
})
return
}
+
+ if (setting.interType === 'custom' && loadCustomApi) {
+ if (setting.execTime === 'once') {
+ this.setState({loadCustomApi: false})
+ }
+
+ this.loadOutResource()
+ if (setting.execType === 'async') {
+ this.loadmaindata()
+ }
+ } else {
+ this.loadmaindata()
+ }
+ }
+
+ loadOutResource = () => {
+ const { setting, search, BID } = this.state
+
+ let param = UtilsDM.getPrevQueryParams(setting, search, 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 {
+ 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 // 褰撳墠璇锋眰鐨刱ey鍊硷紝鐢ㄤ簬鍥炶皟
+
+ 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 } = 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 (this.state.BID) {
+ param.BID = this.state.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.state.config.MenuID,
+ MenuName: this.state.config.MenuName,
+ 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 { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
this.setState({
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager)
-
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.MenuName || ''
- }
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
let result = await Api.genericInterface(param)
+
+ this.getStatFieldsValue()
+
if (result.status) {
+ let start = 1
+ if (setting.laypage) {
+ start = pageSize * (pageIndex - 1) + 1
+ }
+
this.setState({
data: result.data.map((item, index) => {
+ if (absFields.length) {
+ absFields.forEach(field => {
+ if (!item[field]) return
+ if (isNaN(Math.abs(item[field]))) return
+
+ item[field] = Math.abs(item[field])
+ })
+ }
+
item.key = index
+ item.$$uuid = item[setting.primaryKey] || ''
+ item.$$BID = BID || ''
+ item.$Index = start + index + ''
+
return item
}),
total: result.total,
@@ -545,24 +711,84 @@
}
/**
+ * @description 鑾峰彇鍗曡鏁版嵁
+ */
+ async loadmainLinedata (id) {
+ const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
+
+ this.setState({
+ loading: true
+ })
+
+ let _orderBy = orderBy || setting.order
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _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] || {}
+
+ if (absFields.length) {
+ absFields.forEach(field => {
+ if (!_data[field]) return
+ if (isNaN(Math.abs(_data[field]))) return
+
+ _data[field] = Math.abs(_data[field])
+ })
+ }
+ _data.$$uuid = _data[setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+
+ 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('鏁版嵁鏌ヨ閿欒')
+ }
+ }
+
+ this.setState({
+ data,
+ selectedData,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ })
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
+ }
+
+ /**
* @description 鑾峰彇鍚堣瀛楁鍊�
*/
getStatFieldsValue = () => {
const { setting, search, BID, orderBy, statFields } = this.state
- 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 (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, search, _orderBy, BID, this.props.menuType, this.props.dataManager)
-
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.MenuName || ''
- }
+ let param = UtilsDM.getStatQueryDataParams(setting, statFields, search, _orderBy, BID, this.props.menuType)
Api.genericInterface(param).then(res => {
if (res.status) {
@@ -610,8 +836,7 @@
search: searches,
setting: {...setting, onload: 'true'}
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
} else {
MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
@@ -619,8 +844,7 @@
pageIndex: 1,
search: searches
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
}
}
@@ -642,29 +866,33 @@
pageSize: pagination.pageSize,
orderBy: (sorter.field && sorter.order) ? `${sorter.field} ${sorter.order}` : ''
}, () => {
- this.loadmaindata()
+ this.loadData()
})
}
/**
* @description 琛ㄦ牸鍒锋柊
*/
- reloadtable = () => {
- MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
- })
+ reloadtable = (btn) => {
+ if (!btn || btn.resetPageIndex !== 'false') {
+ MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ } else {
+ MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable', 'false') // 鍒楄〃閲嶇疆
+ this.loadData()
+ }
}
/**
* @description 椤甸潰鍒锋柊锛岄噸鏂拌幏鍙栭厤缃�
*/
reloadview = () => {
- this.setState({ loadingview: true, viewlost: false, lostmsg: '',
- data: null, total: 0, loading: false, pageIndex: 1,
+ this.setState({ loadingview: true, viewlost: false, config: {}, setting: null,
+ data: null, total: 0, loading: false, pageIndex: 1, shortcuts: null,
pageSize: 10, orderBy: '', search: '', BIDs: {}, pickup: false
}, () => {
this.loadconfig()
@@ -672,56 +900,20 @@
}
/**
- * @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
- */
- refreshbyaction = (position) => {
- if (position === 'grid') {
- this.reloadtable()
- } else if (position === 'view') {
- this.reloadview()
- }
- }
-
- /**
- * @description 瀛愯〃鎿嶄綔瀹屾垚鍚庡埛鏂颁富琛�
- */
- handleMainTable = (type, tab) => {
- if (type === 'maingrid' && tab.supMenu === 'mainTable') {
- this.reloadtable()
- } else if (type === 'mainline' && tab.supMenu === 'mainTable') {
- this.reloadtable()
- } else if ((type === 'maingrid' || type === 'mainline') && tab.supMenu) {
- this.setState({
- refreshtabs: [type, tab.supMenu]
- }, () => {
- this.setState({
- refreshtabs: null
- })
- })
- } else if (type === 'equaltab' && tab.equalTab && tab.equalTab.length > 0) {
- this.setState({
- refreshtabs: tab.equalTab
- }, () => {
- this.setState({
- refreshtabs: null
- })
- })
- }
- }
-
- /**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = () => {
- const { MenuName } = this.props
+ queryModuleParam = (menuId, btnId) => {
+ const { MenuName, MenuID } = this.props
const { arr_field, orderBy, search, setting} = this.state
- return {
+ if (MenuID !== menuId) return
+
+ MKEmitter.emit('returnModuleParam', MenuID, btnId, {
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: search,
menuName: MenuName
- }
+ })
}
/**
@@ -756,70 +948,63 @@
})
}
- handleviewconfig = (e) => {
- e.stopPropagation()
-
- const { MenuNo } = this.props
- const { config } = this.state
-
- if (config && config.funcs && config.funcs.length > 0) {
- this.setState({
- treevisible: true
- })
- } else {
- let oInput = document.createElement('input')
- oInput.value = MenuNo || ''
- document.body.appendChild(oInput)
- oInput.select()
- document.execCommand('Copy')
- document.body.removeChild(oInput)
- message.success(this.state.dict['main.copy.success'])
- }
- }
-
- getTreeNode = (data) => {
- let _type = {
- view: '椤甸潰',
- btn: '鎸夐挳',
- tab: '鏍囩'
- }
-
- return data.map(item => {
- let _title = _type[item.subtype]
- let _others = []
-
- _others.push(
- (item.menuNo ? item.menuNo + '(鑿滃崟鍙傛暟)' : ''),
- (item.tableName ? item.tableName + '(琛ㄥ悕) ' : ''),
- (item.innerFunc ? item.innerFunc + '(鍐呴儴鍑芥暟) ' : ''),
- (item.outerFunc ? item.outerFunc + '(澶栭儴鍑芥暟)' : '')
- )
- _others = _others.filter(Boolean)
- _others = _others.join('銆�')
-
- if (item.label) {
- _title = _title + '(' + item.label + ')'
- }
- if (_others) {
- _title = _title + ': ' + _others
- }
-
- if (item.subfuncs && item.subfuncs.length > 0) {
- return (
- <TreeNode title={_title} key={item.uuid} dataRef={item} selectable={false}>
- {this.getTreeNode(item.subfuncs)}
- </TreeNode>
- )
- }
- return <TreeNode key={item.uuid} title={_title} isLeaf selectable={false} />
- })
- }
-
/**
* @description 鍥捐〃瑙嗗浘鍒囨崲
*/
changeChart = (uuid) => {
this.setState({chartId: uuid})
+ }
+
+ reloadData = (menuId, id, btn) => {
+ const { MenuID } = this.props
+
+ if (MenuID !== menuId) return
+ if (id === 'empty') return
+
+ if (id === 'formtab') { // 琛ㄥ崟鏍囩椤靛埛鏂�
+ this.reloadtable(btn)
+ return
+ }
+
+ if (!id) {
+ this.reloadtable()
+ } else {
+ this.loadmainLinedata(id)
+ }
+ }
+
+ reloadMenuView = (menuId, position) => {
+ const { MenuID } = this.props
+
+ if (MenuID !== menuId) return
+
+ if (position === 'table') {
+ this.reloadtable()
+ } else {
+ this.reloadview()
+ }
+ }
+
+ resetActiveMenu = (menuId) => {
+ const { MenuID } = this.props
+
+ if (MenuID !== menuId) return
+
+ this.setShortcut()
+ }
+
+ /**
+ * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+ * @param {*} menuId // 鑿滃崟Id
+ * @param {*} position // 鍒锋柊浣嶇疆
+ * @param {*} btn // 鎵ц鐨勬寜閽�
+ */
+ refreshByButtonResult = (menuId, position, btn) => {
+ const { MenuID } = this.props
+
+ if (MenuID !== menuId) return
+
+ this.reloadtable(btn)
}
UNSAFE_componentWillMount () {
@@ -828,31 +1013,24 @@
}
UNSAFE_componentWillReceiveProps(nextProps) {
- if (nextProps.refreshTab && nextProps.refreshTab.MenuID === this.props.MenuID) {
- if (nextProps.refreshTab.position === 'grid') {
- this.reloadtable()
- } else if (nextProps.refreshTab.position === 'view') {
- this.reloadview()
- }
- this.props.refreshTabView('')
- } else if (!is(fromJS(this.props.tabviews), fromJS(nextProps.tabviews))) {
+ if (!is(fromJS(this.props.tabviews), fromJS(nextProps.tabviews))) {
let selectTab = nextProps.tabviews.filter(tab => tab.selected)[0]
if (selectTab && selectTab.MenuID === this.props.MenuID) {
this.setShortcut()
}
- } else if (nextProps.param && !is(fromJS(this.props.param), fromJS(nextProps.param))) {
- let search = this.state.search.map(item => {
- if (item.type === 'text' && item.key === nextProps.param.searchkey) {
- item.value = nextProps.param.searchval
- }
- return item
- })
- this.refreshbysearch(search)
}
}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ componentDidMount () {
+ MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
/**
@@ -863,26 +1041,24 @@
return
}
document.onkeydown = () => {}
+ MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
- const { menuType, MenuName } = this.props
- const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, userConfig, tabActive, chartId, search, selectedData } = this.state
+ const { menuType } = this.props
+ const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData, shortcuts } = this.state
return (
<div className="commontable" id={this.state.ContainerId}>
- {loadingview && <Spin size="large" />}
- {searchlist && searchlist.length > 0 ?
- <MainSearch
- BID={BID}
- dict={this.state.dict}
- searchlist={searchlist}
- menuType={this.props.menuType}
- dataManager={this.props.dataManager}
- refreshdata={this.refreshbysearch}
- /> : null
+ {loadingview ? <Spin size="large" /> : null}
+ {searchlist && searchlist.length ?
+ <MainSearch BID={BID} searchlist={searchlist} setting={setting} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
}
- {setting && setting.onload !== 'false' ? <Row className="chart-view" gutter={16}>
+ {setting ? <Row className="chart-view" gutter={16}>
{/* 瑙嗗浘缁� */}
{!config.expand ? <Tabs activeKey={chartId} onChange={this.changeChart}>
{config.charts.map(item => (
@@ -901,51 +1077,32 @@
BID={BID}
setting={setting}
actions={actions}
- MenuName={MenuName}
+ columns={columns}
dict={this.state.dict}
MenuID={this.props.MenuID}
selectedData={selectedData}
- logcolumns={this.state.logcolumns}
ContainerId={this.state.ContainerId}
- refreshdata={this.refreshbyaction}
- getexceloutparam={this.getexceloutparam}
/>
</div>
<div className="main-table-box">
- {this.props.menuType !== 'HS' ? <SettingComponent
- config={config}
- columns={columns}
- MenuName={MenuName}
- dict={this.state.dict}
- MenuID={this.props.MenuID}
- permAction={this.props.permAction}
- permRoles={this.props.permRoles}
- userConfig={this.state.userConfig}
- reloadview={this.reloadview}
- /> : null}
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && this.state.data && this.state.data.length > 0 ?
- <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
+ <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
<MainTable
tableId="mainTable"
- BID={BID}
pickup={pickup}
- config={config}
setting={setting}
columns={columns}
- MenuName={MenuName}
pageSize={pageSize}
dict={this.state.dict}
data={this.state.data}
total={this.state.total}
MenuID={this.props.MenuID}
loading={this.state.loading}
- refreshdata={this.refreshbytable}
- logcolumns={this.state.logcolumns}
statFValue={this.state.statFValue}
- handleTableId={this.handleTableId}
ContainerId={this.state.ContainerId}
- refreshbyaction={this.refreshbyaction}
+ refreshdata={this.refreshbytable}
+ handleTableId={this.handleTableId}
chgSelectData={this.changeSelectedData}
/>
</div>
@@ -958,15 +1115,12 @@
BID={BID}
plot={item}
config={config}
- MenuName={MenuName}
+ columns={columns}
tableId="mainTable"
data={this.state.data}
MenuID={this.props.MenuID}
loading={this.state.loading}
- logcolumns={this.state.logcolumns}
ContainerId={this.state.ContainerId}
- refreshdata={this.refreshbyaction}
- getexceloutparam={this.getexceloutparam}
handleTableId={this.handleTableId}
/>
</Col>
@@ -978,9 +1132,7 @@
BID={BID}
plot={item}
config={config}
- MenuName={MenuName}
data={this.state.data}
- getexceloutparam={this.getexceloutparam}
loading={this.state.loading}
/>
</Col>
@@ -988,62 +1140,33 @@
}
})}
</Row> : null }
- {setting && setting.onload !== 'false' &&
- config.tabgroups.map(group => (
- <Tabs activeKey={tabActive[group.uuid]} key={group.uuid} onChange={(key) => this.setState({tabActive: {...tabActive, [group.uuid]: key}})}>
- {group.sublist.map(_tab => {
- return (
- <TabPane tab={
- <span>
- {_tab.icon ? <Icon type={_tab.icon} /> : null}
- {_tab.label}
- </span>
- } key={_tab.uuid}>
- <SubTable
- Tab={_tab}
- MenuID={_tab.linkTab}
- mainSearch={_tab.searchPass === 'true' ? search : null}
- userConfig={userConfig ? userConfig[_tab.uuid] : null}
- SupMenuID={this.props.MenuID}
- refreshtabs={this.state.refreshtabs}
- ContainerId={this.state.ContainerId}
- BID={this.state.BIDs[_tab.supMenu] || ''}
- BData={this.state.BIDs[_tab.supMenu + 'data'] || ''}
- handleTableId={this.handleTableId}
- handleMainTable={(type) => this.handleMainTable(type, _tab)}
- />
- </TabPane>
- )
- })}
- </Tabs>)
- )
+ {setting && config.tabgroups.map(group => (
+ <Tabs key={group.uuid}>
+ {group.sublist.map(_tab => {
+ return (
+ <TabPane tab={
+ <span id={_tab.uuid}>
+ {_tab.icon ? <Icon type={_tab.icon} /> : null}
+ {_tab.label}
+ </span>
+ } key={_tab.uuid}>
+ <SubTable
+ Tab={_tab}
+ 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>
+ )
+ })}
+ </Tabs>))
}
- {options.sysType !== 'cloud' && menuType !== 'HS' ? <Button
- icon="copy"
- shape="circle"
- className="common-table-copy"
- onClick={this.handleviewconfig}
- /> : null}
- <Modal
- className="menu-tree-modal"
- title={'鑿滃崟缁撴瀯鏍�'}
- width={'650px'}
- maskClosable={false}
- visible={this.state.treevisible}
- onCancel={() => this.setState({treevisible: false})}
- footer={[
- <Button key="close" onClick={() => this.setState({treevisible: false})}>{this.state.dict['main.close']}</Button>
- ]}
- destroyOnClose
- >
- <div className="menu-header">
- <span>鑿滃崟鍚嶇О锛歿this.props.MenuName}</span>
- <span>鑿滃崟鍙傛暟锛歿<Paragraph copyable>{this.props.MenuNo}</Paragraph>}</span>
- </div>
- {this.state.treevisible ? <Tree defaultExpandAll showLine={true}>
- {this.getTreeNode(config.funcs)}
- </Tree> : null}
- </Modal>
+ {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts} permAction={this.props.permAction}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
@@ -1054,18 +1177,13 @@
return {
menuType: state.editLevel,
tabviews: state.tabviews,
- refreshTab: state.refreshTab,
permAction: state.permAction,
- permMenus: state.permMenus,
- permRoles: state.permRoles,
- dataManager: state.dataManager
+ permMenus: state.permMenus
}
}
-const mapDispatchToProps = (dispatch) => {
- return {
- refreshTabView: (refreshTab) => dispatch(refreshTabView(refreshTab))
- }
+const mapDispatchToProps = () => {
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
--
Gitblit v1.8.0