From e41a64966b7832baffe96c21d1ea77ef6adb2905 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十月 2021 18:31:55 +0800
Subject: [PATCH] 2021-10-14
---
src/tabviews/custom/index.jsx | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index b23c7a5..420caa2 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -30,6 +30,7 @@
const TableCard = asyncComponent(() => import('./components/card/table-card'))
const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const NormalTable = asyncComponent(() => import('./components/table/normal-table'))
+const EditTable = asyncComponent(() => import('./components/table/edit-table'))
const NormalGroup = asyncComponent(() => import('./components/group/normal-group'))
const BraftEditor = asyncComponent(() => import('./components/editor/braft-editor'))
const SandBox = asyncComponent(() => import('./components/code/sand-box'))
@@ -37,6 +38,7 @@
const Balcony = asyncComponent(() => import('./components/card/balcony'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
+const CustomChart = asyncComponent(() => import('./components/chart/custom-chart'))
class CustomPage extends Component {
static propTpyes = {
@@ -132,7 +134,8 @@
// 鏉冮檺杩囨护
let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
let balMap = new Map()
- config.components = this.filterComponent(config.components, roleId, permAction, permMenus, balMap)
+ let skip = config.permission === 'false' || this.props.menuType === 'HS'
+ config.components = this.filterComponent(config.components, roleId, permAction, permMenus, balMap, skip)
// 鑾峰彇涓绘悳绱㈡潯浠�
let mainSearch = []
@@ -445,7 +448,7 @@
})
}
- filterComponent = (components, roleId, permAction, permMenus, balMap) => {
+ filterComponent = (components, roleId, permAction, permMenus, balMap, skip) => {
return components.filter(item => {
if (item.style && item.style.boxShadow) {
@@ -476,7 +479,7 @@
})
item.subtabs = item.subtabs.map(tab => {
- tab.components = this.filterComponent(tab.components, roleId, permAction, permMenus, balMap)
+ tab.components = this.filterComponent(tab.components, roleId, permAction, permMenus, balMap, skip)
return tab
})
@@ -499,8 +502,8 @@
return false
}
- item.components = this.filterComponent(item.components, roleId, permAction, permMenus, balMap)
- } else if (['pie', 'bar', 'line', 'dashboard', 'scatter'].includes(item.type)) {
+ item.components = this.filterComponent(item.components, roleId, permAction, permMenus, balMap, skip)
+ } else if (['pie', 'bar', 'line', 'dashboard', 'scatter', 'chart'].includes(item.type)) {
if (
item.plot.blacklist && item.plot.blacklist.length > 0 &&
item.plot.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0
@@ -521,14 +524,18 @@
item.search = Utils.initSearchVal(item.search)
}
- if (item.type === 'table' && item.subtype === 'normaltable') {
+ if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
let statFields = []
let getCols = (cols) => {
return cols.filter(col => {
- if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- return false
- } else if (col.Hide === 'true') {
- return false
+ if (item.subtype !== 'editable') {
+ if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ return false
+ } else if (col.Hide === 'true') {
+ return false
+ }
+ } else if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ col.Hide = 'true'
}
if (col.type === 'number' && col.sum === 'true' && !statFields.includes(col.field)) {
statFields.push(col)
@@ -562,7 +569,6 @@
}
// 鏉冮檺杩囨护
- let isHS = this.props.menuType === 'HS'
let tabId = this.props.Tab ? this.props.Tab.uuid : '' // 寮圭獥鏍囩鎸夐挳Id
if (item.action && item.action.length > 0) {
item.action = item.action.filter(cell => {
@@ -570,6 +576,7 @@
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
+ cell.$MenuID = this.props.MenuID
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -582,7 +589,7 @@
cell.style = {...cell.style, ...cell.btnstyle}
}
- return isHS || permAction[cell.uuid]
+ return skip || permAction[cell.uuid]
})
}
@@ -604,6 +611,7 @@
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
+ cell.$MenuID = this.props.MenuID
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -618,7 +626,7 @@
cell.innerHeight = 'auto'
}
- return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
+ return cell.eleType !== 'button' || skip || permAction[cell.uuid]
})
card.backElements = card.backElements.filter(cell => {
if (cell.eleType === 'button') {
@@ -627,6 +635,7 @@
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
+ cell.$MenuID = this.props.MenuID
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -640,7 +649,7 @@
} else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height && _hasheight) {
cell.innerHeight = 'auto'
}
- return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
+ return cell.eleType !== 'button' || skip || permAction[cell.uuid]
})
})
} else if (item.type === 'balcony') {
@@ -654,6 +663,7 @@
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
+ cell.$MenuID = this.props.MenuID
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -664,7 +674,7 @@
cell.innerHeight = 'auto'
}
- return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
+ return cell.eleType !== 'button' || skip || permAction[cell.uuid]
})
} else if ((item.type === 'table' && item.subtype === 'tablecard') || item.type === 'carousel') {
item.subcards && item.subcards.forEach(card => {
@@ -676,13 +686,13 @@
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
+ cell.$MenuID = this.props.MenuID
cell.$tabId = tabId
cell.$view = 'CustomPage'
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
}
-
if (card.btnstyle) { // 鍏煎
card.style = card.style || {}
card.style = {...card.style, ...card.btnstyle}
@@ -690,10 +700,10 @@
} else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height && _hasheight) {
cell.innerHeight = 'auto'
}
- return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
+ return cell.eleType !== 'button' || skip || permAction[cell.uuid]
})
})
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
item.cols = item.cols.filter(col => {
if (col.type !== 'action') return true
col.elements = col.elements.filter(cell => {
@@ -702,6 +712,7 @@
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
+ cell.$MenuID = this.props.MenuID
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -714,10 +725,15 @@
cell.style = {...cell.style, ...cell.btnstyle}
}
- return isHS || permAction[cell.uuid]
+ return skip || permAction[cell.uuid]
})
return col.elements.length !== 0
})
+
+ if (item.subtype === 'editable') {
+ item.submit.logLabel = item.$menuname + '-鎻愪氦'
+ item.submit.$menuId = item.uuid
+ }
}
if (item.setting && item.setting.supModule) {
@@ -800,13 +816,13 @@
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
- tab.components = this.formatSetting(tab.components, [], [], inherit, regs, balMap)
+ tab.components = this.formatSetting(tab.components, null, null, inherit, regs, balMap)
tab = {...tab, ...inherit}
return tab
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, [], [], inherit, regs, balMap)
+ component.components = this.formatSetting(component.components, null, null, inherit, regs, balMap)
component = {...component, ...inherit}
return component
}
@@ -870,7 +886,7 @@
// floor 缁勪欢鐨勫眰绾�
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
- if (component.floor === 1 && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
+ if (params && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
let searchlist = []
if (component.search && component.search.length > 0) {
searchlist = Utils.initMainSearch(component.search)
@@ -888,7 +904,7 @@
component.setting.sync = 'false'
component.setting.onload = 'false'
} else {
- params.push(getStructDefaultParam(component, searchlist))
+ params.push(getStructDefaultParam(component, searchlist, params.length === 0))
}
} else if (component.floor === 1) {
component.setting.sync = 'false'
@@ -1099,6 +1115,12 @@
<NormalTable config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'table' && item.subtype === 'editable') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <EditTable config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
return (
<Col span={item.width} key={item.uuid}>
@@ -1123,6 +1145,12 @@
<SandBox config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'chart') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <CustomChart config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else {
return null
}
@@ -1137,7 +1165,7 @@
<div className={'custom-page-wrap ' + (loadingview || loading ? 'loading' : '')} id={this.state.ContainerId} style={config ? config.style : null}>
{(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
<Row>{this.getComponents()}</Row>
- {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <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>
--
Gitblit v1.8.0