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 | 500 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 351 insertions(+), 149 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 72654e5..a4658c6 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -8,8 +8,9 @@
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 MKEmitter from '@/utils/events.js'
@@ -64,6 +65,8 @@
statFields: [], // 鍚堣瀛楁
statFValue: [], // 鍚堣鍊�
absFields: [], // 缁濆鍊煎瓧娈�
+ loadCustomApi: true, // 鍔犺浇澶栭儴璧勬簮
+ hasReqFields: false
}
/**
@@ -81,10 +84,13 @@
if (result.status) {
let config = ''
let shortcuts = []
- let _curUserConfig = ''
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 = ''
@@ -94,31 +100,37 @@
if (result.LongParamUser && this.props.menuType !== 'HS') {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
- userConfig = []
+ if (userConfig && !userConfig.version) {
+ Object.keys(userConfig).forEach(key => {
+ let component = userConfig[key]
- // if (window.GLOB.UserCacheMap.has(_param)) {
- // return Promise.resolve(window.GLOB.UserCacheMap.get(_param))
- // } else {
- // param = this.encryptParam(param)
- // return new Promise(resolve => {
- // axios({
- // url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
- // data: param
- // }).then(res => {
- // if (res.status) {
- // window.GLOB.UserCacheMap.set(_param, res)
- // }
- // resolve(res)
- // })
- // })
- // }
- _curUserConfig = userConfig[this.props.MenuID]
+ 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')
}
}
- console.log(config)
- console.log(shortcuts)
// 椤甸潰閰嶇疆瑙ｆ瀽閿欒鏃舵彁绀�
if (!config) {
@@ -140,7 +152,7 @@
}
// 鐗堟湰鍏煎
- config = UtilsUpdate.updateCommonTable(config)
+ config = updateCommonTable(config)
// 鏉冮檺杩囨护
if (this.props.menuType !== 'HS') {
@@ -165,22 +177,17 @@
}
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
- if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- item.Hide = 'true'
+ if (item.required) {
+ hasReqFields = true
}
return item
@@ -202,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 => {
@@ -217,10 +225,7 @@
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'
}
@@ -233,28 +238,36 @@
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
}
- }
- if (_curUserConfig) {
- config.action = config.action.map(item => {
- 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 userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
- return cell
- })
- }
- }
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
- return item
+ 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.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 _arrField = [] // 瀛楁闆�
@@ -270,6 +283,22 @@
config.action.forEach(item => {
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)
@@ -282,6 +311,13 @@
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') {
@@ -300,13 +336,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
@@ -336,16 +365,6 @@
_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
- })
-
this.setState({
loadingview: false,
absFields,
@@ -358,12 +377,12 @@
actions: _actions,
columns: _columns,
arr_field: _arrField.join(','),
- BID: param && param.BID ? param.BID : '',
- 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()
})
@@ -403,13 +422,13 @@
if (!preKey || !keyCode) return
- let _shortcut = preKey + keyCode
+ let _shortcut = `${preKey}+${keyCode}`
shortcuts.some(item => {
- if (item.shortcut === _shortcut) {
+ if (item.$shortcut === _shortcut) {
MKEmitter.emit('triggerBtnId', item.uuid)
- let element = item.parentId ? document.getElementById(item.parentId) : '' // 鏍囩鍒囨崲
+ let element = item.parentId && item.parentId !== this.props.MenuID ? document.getElementById(item.parentId) : '' // 鏍囩鍒囨崲
if (element && element.click) {
element.click()
}
@@ -421,12 +440,8 @@
}
}
- /**
- * @description 涓昏〃鏁版嵁鍔犺浇
- */
- async loadmaindata () {
- const { setting, arr_field, BIDs, search, orderBy, BID, pageIndex, pageSize, absFields } = 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: [],
@@ -437,17 +452,212 @@
}
})
- 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
@@ -456,12 +666,16 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.MenuName || ''
- }
-
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) {
@@ -476,6 +690,7 @@
item.key = index
item.$$uuid = item[setting.primaryKey] || ''
item.$$BID = BID || ''
+ item.$Index = start + index + ''
return item
}),
@@ -508,15 +723,12 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.MenuName || ''
- }
-
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 => {
@@ -526,26 +738,33 @@
_data[field] = Math.abs(_data[field])
})
}
+ _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.$$uuid = _data[setting.primaryKey] || ''
- _data.$$BID = BID || ''
-
+ _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 {
@@ -566,19 +785,10 @@
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)
-
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = this.props.MenuName || ''
- }
Api.genericInterface(param).then(res => {
if (res.status) {
@@ -626,8 +836,7 @@
search: searches,
setting: {...setting, onload: 'true'}
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
} else {
MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
@@ -635,8 +844,7 @@
pageIndex: 1,
search: searches
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
}
}
@@ -658,7 +866,7 @@
pageSize: pagination.pageSize,
orderBy: (sorter.field && sorter.order) ? `${sorter.field} ${sorter.order}` : ''
}, () => {
- this.loadmaindata()
+ this.loadData()
})
}
@@ -671,13 +879,11 @@
this.setState({
pageIndex: 1
}, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
})
} else {
MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable', 'false') // 鍒楄〃閲嶇疆
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
}
}
@@ -686,7 +892,7 @@
*/
reloadview = () => {
this.setState({ loadingview: true, viewlost: false, config: {}, setting: null,
- data: null, total: 0, loading: false, pageIndex: 1,
+ data: null, total: 0, loading: false, pageIndex: 1, shortcuts: null,
pageSize: 10, orderBy: '', search: '', BIDs: {}, pickup: false
}, () => {
this.loadconfig()
@@ -696,13 +902,13 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = (menuId, btnId) => {
+ queryModuleParam = (menuId, btnId) => {
const { MenuName, MenuID } = this.props
const { arr_field, orderBy, search, setting} = this.state
if (MenuID !== menuId) return
- MKEmitter.emit('execExcelout', MenuID, btnId, {
+ MKEmitter.emit('returnModuleParam', MenuID, btnId, {
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: search,
@@ -767,12 +973,16 @@
}
}
- reloadMenuView = (menuId) => {
+ reloadMenuView = (menuId, position) => {
const { MenuID } = this.props
if (MenuID !== menuId) return
- this.reloadview()
+ if (position === 'table') {
+ this.reloadtable()
+ } else {
+ this.reloadview()
+ }
}
resetActiveMenu = (menuId) => {
@@ -803,19 +1013,11 @@
}
UNSAFE_componentWillReceiveProps(nextProps) {
- 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)
}
}
@@ -827,7 +1029,7 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
- MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -842,19 +1044,19 @@
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
- MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
const { menuType } = this.props
- const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData } = this.state
+ 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" />}
+ {loadingview ? <Spin size="large" /> : null}
{searchlist && searchlist.length ?
- <MainSearch BID={BID} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ <MainSearch BID={BID} searchlist={searchlist} setting={setting} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
}
{setting ? <Row className="chart-view" gutter={16}>
{/* 瑙嗗浘缁� */}
@@ -884,7 +1086,7 @@
</div>
<div className="main-table-box">
{(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"
@@ -964,7 +1166,7 @@
</Tabs>))
}
{menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
- {menuType !== 'HS' ? <SettingComponent config={config} dict={this.state.dict} MenuID={this.props.MenuID} permAction={this.props.permAction}/> : 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>
)
--
Gitblit v1.8.0