From 783ab4e467c95e26f7f031151507bd7ad8333a63 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 九月 2023 17:34:47 +0800
Subject: [PATCH] 2023-09-08
---
src/tabviews/custom/index.jsx | 133 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 111 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 195ad72..6d63982 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -44,6 +44,7 @@
const Iframe = asyncComponent(() => import('./components/iframe'))
const Calendar = asyncComponent(() => import('./components/calendar'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
+const FlowFloat = asyncComponent(() => import('@/tabviews/zshare/flowFloat'))
const TableNodes = asyncComponent(() => import('@/tabviews/zshare/tablenodes'))
const MkInterfaces = asyncComponent(() => import('@/tabviews/custom/components/interfaces'))
@@ -62,7 +63,6 @@
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
- userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
shortcuts: null, // 蹇嵎閿�
@@ -133,8 +133,51 @@
return
}
+ if (config.process === 'true') {
+ let unset = true
+ if (result.works_flow_code && result.works_long_param) {
+ try { // 娴佺▼淇℃伅瑙ｆ瀽
+ let flowConfig = JSON.parse(window.decodeURIComponent(window.atob(result.works_long_param)))
+ flowConfig.flow_code = result.works_flow_code
+ flowConfig.flow_name = result.works_flow_name
+ config.flow_code = result.works_flow_code
+ config.flow_name = result.works_flow_name
+ unset = false
+
+ window.GLOB.UserCacheMap.set('flow' + MenuID, flowConfig)
+ } catch (e) {
+ unset = true
+ console.warn('Parse Failure')
+ }
+ }
+
+ if (unset) {
+ config.interfaces = []
+ this.setState({
+ config: config,
+ viewlost: true,
+ loadingview: false,
+ lostmsg: '鎶辨瓑锛屾偍璁块棶鐨勯〉闈㈡湭璁剧疆宸ヤ綔娴侊紝璇疯仈绯荤鐞嗗憳銆�'
+ })
+ return
+ }
+ } else if (result.works_flow_code) {
+ Api.getSystemConfig({
+ func: 's_works_flow_param_sso_menu_upt_v6',
+ upt_type: 'del',
+ works_flow_code: '',
+ works_flow_name: '',
+ long_param: '',
+ flow_id: '',
+ menuid: config.MenuID,
+ menuname: config.MenuName,
+ username: sessionStorage.getItem('User_Name') || '',
+ fullName: sessionStorage.getItem('Full_Name') || ''
+ })
+ }
+
// HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
- if (result.LongParamUser && !window.GLOB.mkHS) {
+ if (result.LongParamUser) {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
if (userConfig) {
@@ -194,7 +237,7 @@
let initInters = []
config.interfaces = this.formatInterSetting(config.interfaces, regs, MenuID, initInters)
- config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, skip, param, MenuID, config.interfaces, config.$cache, config.$time, config.MenuName, MenuID, MenuID)
+ config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, skip, param, MenuID, config.interfaces, config.$cache, config.$time, config.MenuName, MenuID, MenuID, config.process === 'true')
let params = []
let BID = param.$BID || ''
@@ -325,14 +368,32 @@
}
}
- filterComponent = (components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, searchId, syncId) => {
+ filterComponent = (components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, searchId, syncId, process) => {
return components.filter(item => {
item.$pageId = pageId
- item.$cache = cache
- item.$time = time
item.$searchId = searchId
item.$syncId = syncId
+ if (process) {
+ item.$process = process
+ item.$flowId = 'flow' + this.props.MenuID
+ }
+
+ if (cache) {
+ item.$cache = cache
+ item.$time = time
+
+ if (item.wrap && item.wrap.cacheLocal === 'false') {
+ item.$cache = false
+ } else if (item.plot && item.plot.cacheLocal === 'false') {
+ item.$cache = false
+ }
+
+ if (!item.$cache && item.setting && item.setting.sync === 'true') {
+ item.setting.sync = 'false'
+ }
+ }
+
if (item.style && item.style.boxShadow) {
delete item.style.hShadow
delete item.style.vShadow
@@ -432,7 +493,7 @@
_searchId = tab.uuid
}
- tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, _searchId, tab.uuid)
+ tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, _searchId, tab.uuid, process)
if (_searchId === tab.uuid) {
tab.components.forEach(cell => {
@@ -456,7 +517,7 @@
return false
}
- item.components = this.filterComponent(item.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, searchId, syncId)
+ item.components = this.filterComponent(item.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, searchId, syncId, process)
return true
} else if (['pie', 'bar', 'line', 'dashboard', 'scatter', 'chart', 'antvG6', 'antvX6'].includes(item.type)) {
@@ -530,7 +591,6 @@
}
if (item.type === 'table') {
- let statFields = []
let getCols = (cols) => {
return cols.filter(col => {
if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
@@ -542,9 +602,6 @@
}
if (col.type === 'number') {
- if (col.sum === 'true' && !statFields.includes(col.field)) {
- statFields.push(col)
- }
if (typeof(col.decimal) === 'number') {
col.round = Math.pow(10, col.decimal)
if (col.format === 'percent') {
@@ -585,7 +642,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.pop()
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
@@ -595,7 +652,6 @@
}
item.cols = getCols(item.cols)
- item.statFields = statFields
if (item.subtype === 'editable') {
item.submit.logLabel = item.$menuname + '-鎻愪氦'
@@ -713,6 +769,11 @@
group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
}
+ if (item.$process) {
+ group.subButton.$process = true
+ group.subButton.$flowId = 'flow' + this.props.MenuID
+ }
+
if (item.$cache && item.$time) {
group.$cache = item.$cache
group.$time = item.$time
@@ -806,6 +867,11 @@
cell.$MenuID = this.props.MenuID
cell.$view = 'popview'
+ if (item.$process) {
+ cell.$process = true
+ cell.$flowId = 'flow' + this.props.MenuID
+ }
+
if (cell.btnstyle) { // 鍏煎
cell.style = cell.style || {}
cell.style = {...cell.style, ...cell.btnstyle}
@@ -868,6 +934,11 @@
resetElement = (cell) => {
cell.style = cell.style || {}
+
+ if (cell.style.display === 'inline-block') {
+ cell.style.verticalAlign = 'top'
+ }
+
if (['text', 'number', 'formula'].includes(cell.eleType)) {
if (!cell.height) {
cell.innerHeight = 'auto'
@@ -1017,6 +1088,10 @@
component.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
component.setting.custompage = /@pageSize@|@orderBy@/i.test(component.setting.dataresource + component.setting.customScript)
+
+ if (!component.setting.execute || component.setting.custompage) {
+ component.forbidLine = true
+ }
if (component.setting.sync === 'true') {
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
@@ -1556,15 +1631,29 @@
render() {
const { loadingview, viewlost, config, loading, shortcuts, BID } = this.state
+ if (!config || viewlost) {
+ return (
+ <div className="custom-page-wrap">
+ {loadingview ? <Spin className="view-spin" size="large" /> : null}
+ {viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
+ <div className="user-tools">
+ {config && config.process === 'true' ? <FlowFloat init={true} config={config}/> : null}
+ </div>
+ </div>
+ )
+ }
+
return (
- <div className={`custom-page-wrap ${config && config.minWidth ? 'mk-scroll' : ''} ${loadingview || loading ? 'loading' : ''} ${config && config.mask === 'false' ? 'mk-no-mask' : ''}`} id={this.state.ContainerId} style={config ? config.style : null}>
- {(loadingview || (loading && !config.$cache)) ? <Spin className="view-spin" size="large" /> : null}
- <Row id={config ? 'menu' + config.uuid : ''} style={config && config.minWidth ? {minWidth: config.minWidth} : null} className="component-wrap">{this.getComponents()}</Row>
- {config && config.interfaces.length > 0 ? <MkInterfaces BID={BID} interfaces={config.interfaces}/> : null}
- {config && window.GLOB.breakpoint ? <DebugTable /> : null}
- {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <TableNodes config={config} /> : null}
- {!window.GLOB.mkHS && config ? <SettingComponent config={config} shortcuts={shortcuts || []}/> : null}
- {viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
+ <div className={`custom-page-wrap ${config.minWidth ? 'mk-scroll' : ''} ${loading ? 'loading' : ''} ${config.mask === 'false' ? 'mk-no-mask' : ''}`} id={this.state.ContainerId} style={config.style}>
+ {loading && !config.$cache ? <Spin className="view-spin" size="large" /> : null}
+ <Row id={'menu' + config.uuid} style={{minWidth: config.minWidth || 'unset'}} className="component-wrap">{this.getComponents()}</Row>
+ {config.interfaces.length > 0 ? <MkInterfaces BID={BID} interfaces={config.interfaces}/> : null}
+ {window.GLOB.breakpoint ? <DebugTable /> : null}
+ <div className="user-tools">
+ {config.process === 'true' ? <FlowFloat config={config}/> : null}
+ <SettingComponent config={config} shortcuts={shortcuts || []}/>
+ <TableNodes config={config} />
+ </div>
</div>
)
}
--
Gitblit v1.8.0