From 83592b5c2dcbfd0a91d36dfa89f1a6cbe95ab1d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 十月 2022 15:22:01 +0800
Subject: [PATCH] 2022-10-27
---
src/tabviews/basetable/index.jsx | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index e856616..a82ed69 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -16,7 +16,7 @@
const AntvTabs = asyncComponent(() => import('@/tabviews/custom/components/tabs/antv-tabs'))
const MkBaseTable = asyncComponent(() => import('@/tabviews/custom/components/table/base-table'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
-const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
+const TableNodes = asyncComponent(() => import('@/tabviews/zshare/tablenodes'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
class BasePage extends Component {
@@ -327,18 +327,16 @@
item.statFields = Array.from(new Set(statFields))
// 鏉冮檺杩囨护
- let tabId = this.props.Tab ? this.props.Tab.uuid : '' // 寮圭獥鏍囩鎸夐挳Id
if (item.action && item.action.length > 0) {
item.action = item.action.filter(cell => {
- if (item.hidden === 'true') return false
+ if (cell.hidden === 'true') return false
cell.logLabel = item.$menuname + '-' + cell.label
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 = 'BasePage'
+ cell.$view = 'popview'
cell.$toolbtn = true
if (cell.syncComponentId === item.setting.supModule) {
@@ -364,8 +362,7 @@
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'BasePage'
+ cell.$view = 'popview'
if (cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
@@ -580,7 +577,7 @@
{(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
<Row className="component-wrap">{this.getComponents()}</Row>
{config && window.GLOB.breakpoint ? <DebugTable /> : null}
- {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <TableNodes config={config} /> : null}
{!window.GLOB.mkHS && config ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts || []}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
--
Gitblit v1.8.0