From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/tabview/index.jsx | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index ffb0f08..ed050db 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -17,13 +17,13 @@
const Home = asyncComponent(() => import('@/tabviews/home'))
const CustomPage = asyncComponent(() => import('@/tabviews/custom'))
const CommonTable = asyncComponent(() => import('@/tabviews/commontable'))
-// const BaseTable = asyncComponent(() => import('@/tabviews/basetable'))
+const BaseTable = asyncComponent(() => import('@/tabviews/basetable'))
const CalendarPage = asyncComponent(() => import('@/tabviews/calendar'))
const TreePage = asyncComponent(() => import('@/tabviews/treepage'))
-const TabManage = asyncComponent(() => import('@/tabviews/tabmanage'))
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const RoleManage = asyncComponent(() => import('@/tabviews/rolemanage'))
const FormTab = asyncComponent(() => import('@/tabviews/formtab'))
+const TabManage = asyncComponent(() => import('@/tabviews/tabmanage'))
class TabViews extends Component {
static propTpyes = {
@@ -109,7 +109,7 @@
// 鑾峰彇涓昏彍鍗曞弬鏁�
let menudefer = new Promise(resolve => {
- Api.getAppVersion().then(() => {
+ Api.getAppVersion(menu.MenuID).then(() => {
resolve()
}, () => {
resolve()
@@ -185,26 +185,39 @@
})
}
+ changeTemp = (MenuID, Template) => {
+ let tabs = fromJS(this.state.tabviews).toJS()
+
+ this.setState({
+ tabviews: tabs.map(item => {
+ if (item.MenuID === MenuID) {
+ item.type = Template
+ }
+ return item
+ })
+ })
+ }
+
selectcomponent = (view) => {
// 鏍规嵁tab椤典腑鑿滃崟淇℃伅锛岄�夋嫨鎵�闇�鐨勭粍浠�
if (view.type === 'Home') {
return (<Home MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'CommonTable') {
- return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
- // } else if (view.type === 'BaseTable') {
- // return (<BaseTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
+ return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
+ } else if (view.type === 'BaseTable') {
+ return (<BaseTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
} else if (view.type === 'CustomPage') {
- return (<CustomPage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
+ return (<CustomPage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param} changeTemp={this.changeTemp}/>)
} else if (view.type === 'TreePage') {
return (<TreePage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
} else if (view.type === 'CalendarPage') {
return (<CalendarPage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
- } else if (view.type === 'TabManage') {
- return (<TabManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'RolePermission') {
return (<RoleManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'FormTab') {
return (<FormTab MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
+ } else if (view.type === 'TabManage') {
+ return (<TabManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
} else if (view.type === 'iframe') {
return (<Iframe key={view.MenuID} MenuID={view.MenuID} MenuNo={view.MenuNo} title={view.MenuName} MenuName={view.MenuName} url={window.GLOB.baseurl + 'zh-CN/' + view.LinkUrl}/>)
} else {
--
Gitblit v1.8.0