From be107069b14c8d23b9d1aa50391897324dfa9f35 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 九月 2023 21:57:27 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/basetable/index.jsx | 92 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 4f0028e..e6b4a31 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -13,6 +13,7 @@
// 閫氱敤缁勪欢
const AntvTabs = asyncComponent(() => import('@/tabviews/custom/components/tabs/antv-tabs'))
const MkBaseTable = asyncComponent(() => import('@/tabviews/custom/components/table/base-table'))
+const FlowFloat = asyncComponent(() => import('@/tabviews/zshare/flowFloat'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
const TableNodes = asyncComponent(() => import('@/tabviews/zshare/tablenodes'))
const AutoMatic = asyncComponent(() => import('@/tabviews/zshare/automatic'))
@@ -35,7 +36,6 @@
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
- loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
shortcuts: null, // 蹇嵎閿�
autoMatic: null
@@ -102,8 +102,50 @@
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) {
+ 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) {
@@ -148,7 +190,7 @@
})
}
- config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, skip, param, MenuID, config.MenuName)
+ config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, skip, param, MenuID, config.MenuName, config.process === 'true')
let autoMatic = null
if (config.autoMatic && config.autoMatic.enable === 'true') {
@@ -263,10 +305,15 @@
}
}
- filterComponent = (components, roleId, permAction, skip, urlparam, pageId, MenuName) => {
+ filterComponent = (components, roleId, permAction, skip, urlparam, pageId, MenuName, process) => {
return components.filter(item => {
item.$pageId = pageId
item.$searchId = pageId
+
+ if (process) {
+ item.$process = process
+ item.$flowId = 'flow' + this.props.MenuID
+ }
item.$menuname = (MenuName || '') + '-' + (item.name || '涓昏〃')
@@ -287,7 +334,7 @@
if (tab.permission !== 'true') { // 鏉冮檺鏈紑鍚笉鍋氭潈闄愭帶鍒�
skip = true
}
- tab.components = this.filterComponent(tab.components, roleId, permAction, skip, urlparam, pageId, MenuName)
+ tab.components = this.filterComponent(tab.components, roleId, permAction, skip, urlparam, pageId, MenuName, process)
return tab
})
@@ -410,6 +457,11 @@
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
cell.$view = 'popview'
+
+ if (item.$process) {
+ cell.$process = true
+ cell.$flowId = 'flow' + this.props.MenuID
+ }
if (cell.controlField) {
if (/,/ig.test(cell.controlVal)) {
@@ -640,7 +692,6 @@
loadingview: true, // 椤甸潰鍔犺浇涓�
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
- loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
shortcuts: null,
}, () => {
this.loadconfig()
@@ -670,17 +721,30 @@
}
render() {
- const { loadingview, viewlost, config, loading, shortcuts, autoMatic } = this.state
+ const { loadingview, viewlost, config, shortcuts, autoMatic } = this.state
+
+ if (!config || viewlost) {
+ return (
+ <div className="custom-table-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-table-wrap ' + (loadingview || loading ? 'loading' : '')} id={this.state.ContainerId} style={config ? config.style : null}>
- {(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
+ <div className="custom-table-wrap" id={this.state.ContainerId} style={config.style}>
<Row className="component-wrap">{this.getComponents()}</Row>
- {config && window.GLOB.breakpoint ? <DebugTable /> : null}
- {!window.GLOB.mkHS && config && autoMatic ? <AutoMatic autoMatic={autoMatic} tabId={config.MenuID} config={config.components[0]} /> : 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}
+ {window.GLOB.breakpoint ? <DebugTable /> : null}
+ <div className="user-tools">
+ {autoMatic ? <AutoMatic autoMatic={autoMatic} tabId={config.MenuID} config={config.components[0]} /> : null}
+ {config.process === 'true' ? <FlowFloat config={config}/> : null}
+ <SettingComponent config={config} shortcuts={shortcuts || []}/>
+ <TableNodes config={config} />
+ </div>
</div>
)
}
--
Gitblit v1.8.0