From b8e1395f02c929eaa96b949cf6027ee2a43856a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 19:03:37 +0800
Subject: [PATCH] 2022-09-06
---
src/tabviews/subtable/index.jsx | 172 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 117 insertions(+), 55 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index b369753..bc460d3 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -46,7 +46,7 @@
searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
+ arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -133,8 +133,10 @@
config = updateSubTable(config)
// 鏉冮檺杩囨护
- if (this.props.menuType !== 'HS') {
- config.action = config.action.filter(item => permAction[item.uuid])
+ if (!window.GLOB.mkHS) {
+ config.action = config.action.filter(item => item.hidden !== 'true' && permAction[item.uuid])
+ } else {
+ config.action = config.action.filter(item => item.hidden !== 'true')
}
config.search = Utils.initSearchVal(config.search)
@@ -158,18 +160,21 @@
return col
})
- // 瑙嗗浘鏉冮檺
- config.charts = config.charts.filter(item => {
- if (item.Hide === 'true') return false
- if (!item.blacklist || item.blacklist.length === 0) return true
- return item.blacklist.filter(v => roleId.indexOf(v) > -1).length === 0
- })
-
- if (config.charts.length <= 1) {
- config.expand = true
+ let chartId = ''
+ if (config.charts) {
+ // 瑙嗗浘鏉冮檺
+ config.charts = config.charts.filter(item => {
+ if (item.Hide === 'true') return false
+ if (!item.blacklist || item.blacklist.length === 0) return true
+ return item.blacklist.filter(v => roleId.indexOf(v) > -1).length === 0
+ })
+
+ if (config.charts.length <= 1) {
+ config.expand = true
+ }
+
+ chartId = config.charts[0] ? config.charts[0].uuid : ''
}
-
- let chartId = config.charts[0] ? config.charts[0].uuid : ''
// 1銆佺瓫閫夊瓧娈甸泦锛�2銆佽繃婊ら殣钘忓垪鍙婂悎骞跺垪涓殑瀛楁uuid
config.columns.forEach(col => {
@@ -181,6 +186,15 @@
col.linkThdMenu = permMenus.filter(m => m.MenuID === menu_id)[0] || ''
} else {
col.linkThdMenu = ''
+ }
+
+ if (col.type === 'number') {
+ col.decimal = col.decimal || 0
+ col.round = Math.pow(10, col.decimal)
+
+ if (col.format === 'percent') {
+ col.decimal = col.decimal > 2 ? col.decimal - 2 : 0
+ }
}
col.nameField && _arrField.push(col.nameField) // 閾炬帴鍚嶅瓧娈�
@@ -246,6 +260,7 @@
}
}
if (item.position === 'toolbar') {
+ item.$toolbtn = true
_actions.push(item)
} else if (item.position === 'grid') {
_operations.push(item)
@@ -296,7 +311,6 @@
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') || ''
@@ -305,8 +319,7 @@
let regs = [
{ reg: /@userName@/ig, value: `'${userName}'` },
- { reg: /@fullName@/ig, value: `'${fullName}'` },
- { reg: /@login_city@/ig, value: `'${city}'` }
+ { reg: /@fullName@/ig, value: `'${fullName}'` }
]
regs.forEach(cell => {
@@ -319,6 +332,16 @@
config.setting.selected = 'false'
} else if (config.setting.selected === 'init' && config.setting.onload === 'false') {
config.setting.selected = 'false'
+ } else {
+ config.setting.orisel = true
+ }
+
+ if (config.setting.controlField) {
+ if (config.setting.controlVal) {
+ config.setting.controlVal = config.setting.controlVal.split(',')
+ } else {
+ config.setting.controlVal = ['']
+ }
}
this.setState({
@@ -357,7 +380,7 @@
}
}
- loadData = () => {
+ loadData = (id) => {
const { mainSearch } = this.props
const { setting, BID, search, loadCustomApi, hasReqFields } = this.state
@@ -406,17 +429,17 @@
this.loadOutResource(searches)
if (setting.execType === 'async') {
- this.loadmaindata()
+ this.loadmaindata(id)
}
} else {
- this.loadmaindata()
+ this.loadmaindata(id)
}
}
loadOutResource = (searches) => {
const { setting, BID } = this.state
- let param = UtilsDM.getPrevQueryParams(setting, searches, BID, this.props.menuType)
+ let param = UtilsDM.getPrevQueryParams(setting, searches, BID)
if (setting.execType === 'sync') {
this.setState({
@@ -530,15 +553,7 @@
`))
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)
- }
+ param = UtilsDM.getCallBackQueryParams(setting, sql, errSql, BID)
} else {
param.func = 's_ex_result_back'
param.s_ex_result = lines.map((item, index) => ({
@@ -549,7 +564,7 @@
Sort: index + 1
}))
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
@@ -583,7 +598,7 @@
/**
* @description 瀛愯〃鏁版嵁鍔犺浇
*/
- async loadmaindata () {
+ async loadmaindata (id) {
const { mainSearch } = this.props
const { setting, BID, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
@@ -597,7 +612,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
@@ -609,9 +624,9 @@
start = pageSize * (pageIndex - 1) + 1
}
- if (setting.selected !== 'false') {
+ if (setting.selected !== 'false' || (setting.orisel && id)) {
setTimeout(() => {
- MKEmitter.emit('mkTableCheckTopLine', this.props.MenuID)
+ MKEmitter.emit('mkTableCheckTopLine', this.props.MenuID, id)
}, 200)
if (setting.selected === 'init') {
this.setState({setting: {...setting, selected: 'false'}})
@@ -630,8 +645,15 @@
}
item.key = index
item.$$uuid = item[setting.primaryKey] || ''
+ item.$$key = '' + item.key + item.$$uuid
item.$$BID = BID || ''
item.$Index = start + index + ''
+
+ if (setting.controlField) {
+ if (setting.controlVal.includes(item[setting.controlField])) {
+ item.$disabled = true
+ }
+ }
return item
}),
@@ -670,7 +692,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -695,6 +717,7 @@
data = data.map(item => {
if (item.$$uuid === _data.$$uuid) {
_data.key = item.key
+ _data.$$key = '' + item.key + item.$$uuid
_data.$Index = item.$Index
return _data
} else {
@@ -738,7 +761,7 @@
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)
Api.genericInterface(param).then(res => {
if (res.status) {
@@ -811,24 +834,24 @@
/**
* @description 琛ㄦ牸鍒锋柊
*/
- reloadtable = (btn) => {
+ reloadtable = (btn, id = '') => {
if (!btn || btn.resetPageIndex !== 'false') {
MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
this.setState({
pageIndex: 1
}, () => {
- this.loadData()
+ this.loadData(id)
})
} else {
MKEmitter.emit('resetTable', this.props.Tab.uuid, 'false') // 鍒楄〃閲嶇疆
- this.loadData()
+ this.loadData(id)
}
}
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { Tab, mainSearch, MenuID } = this.props
const { arr_field, orderBy, search, setting} = this.state
@@ -839,7 +862,7 @@
searches = [...mainSearch, ...search]
}
- MKEmitter.emit('returnModuleParam', MenuID, btnId, {
+ callback({
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: searches,
@@ -876,7 +899,6 @@
const { MenuID } = this.props
if (menuId.indexOf(MenuID) === -1) return
- if (id === 'empty') return
if (!id) {
this.reloadtable()
@@ -899,19 +921,23 @@
const { Tab, SupMenuID } = this.props
const { BID } = this.state
- if (position === 'line' && lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn, id)
+ }
} else if (position === 'grid' || position === 'view') {
- this.reloadtable(btn)
+ this.reloadtable(btn, id)
} 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绾ф爣绛�
+ this.reloadtable(btn, id)
+ if (Tab.supMenu && BID) {
+ MKEmitter.emit('reloadData', Tab.supMenu, BID) // 涓昏〃閲嶇疆
+ } else if (!Tab.supMenu && Tab.level === 0 && BID) {
+ MKEmitter.emit('reloadData', SupMenuID, BID) // 鏍戝舰缁撴瀯锛�0绾ф爣绛�
}
} else if (position === 'equaltab') {
- this.reloadtable(btn)
+ this.reloadtable(btn, id)
if (Tab.equalTab && Tab.equalTab.length > 0) {
MKEmitter.emit('reloadData', Tab.equalTab.join(',')) // 鍚岀骇鏍囩閲嶇疆
}
@@ -974,9 +1000,9 @@
<div className="subtable" id={'subtable' + this.props.MenuID}>
{loadingview && <Spin />}
{searchlist && searchlist.length ?
- <SubSearch BID={BID} setting={setting} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ <SubSearch BID={BID} setting={setting} searchlist={searchlist} refreshdata={this.refreshbysearch}/> : null
}
- {config ? <Row className="chart-view" gutter={16}>
+ {config && config.charts ? <Row className="chart-view" gutter={16}>
{/* 瑙嗗浘缁� */}
{!config.expand ? <Tabs activeKey={chartId} onChange={this.changeChart}>
{config.charts.map(item => (
@@ -1060,6 +1086,43 @@
}
})}
</Row> : null }
+ {config && !config.charts ? <>
+ <div className="sub-action">
+ <SubAction
+ BID={BID}
+ BData={BData}
+ setting={setting}
+ actions={actions}
+ columns={columns}
+ Tab={this.props.Tab}
+ MenuID={this.props.MenuID}
+ selectedData={selectedData}
+ ContainerId={this.props.ContainerId}
+ />
+ </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="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
+ }
+ <SubTable
+ BData={BData}
+ tableId={this.props.Tab.uuid}
+ pickup={pickup}
+ setting={setting}
+ columns={columns}
+ pageSize={pageSize}
+ dict={this.state.dict}
+ data={this.state.data}
+ total={this.state.total}
+ MenuID={this.props.MenuID}
+ loading={this.state.loading}
+ statFValue={this.state.statFValue}
+ ContainerId={this.props.ContainerId}
+ refreshdata={this.refreshbytable}
+ chgSelectData={this.changeSelectedData}
+ />
+ </div>
+ </> : null }
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
@@ -1068,7 +1131,6 @@
const mapStateToProps = (state) => {
return {
- menuType: state.editLevel,
permAction: state.permAction,
permMenus: state.permMenus,
}
--
Gitblit v1.8.0