From 9c6795fd3c44e46cf3955fbfd8f8eeca23acb7a9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 十月 2022 00:31:51 +0800
Subject: [PATCH] 2022-10-08
---
src/components/tabview/index.jsx | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index ad4fec5..ffb0f08 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -7,7 +7,6 @@
import moment from 'moment'
import 'moment/locale/zh-cn'
-import { initActionPermission } from '@/store/action'
import asyncComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
import options from '@/store/options.js'
@@ -25,14 +24,6 @@
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const RoleManage = asyncComponent(() => import('@/tabviews/rolemanage'))
const FormTab = asyncComponent(() => import('@/tabviews/formtab'))
-
-let service = ''
-
-if (process.env.NODE_ENV === 'production') {
- service = document.location.origin + '/' + window.GLOB.service + 'zh-CN/'
-} else {
- service = window.GLOB.location + '/' + window.GLOB.service + 'zh-CN/'
-}
class TabViews extends Component {
static propTpyes = {
@@ -109,7 +100,7 @@
})
}
- this.props.initActionPermission(_permAction)
+ window.GLOB.mkActions = _permAction
}
resolve()
@@ -215,7 +206,7 @@
} 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 === 'iframe') {
- return (<Iframe key={view.MenuID} MenuID={view.MenuID} MenuNo={view.MenuNo} title={view.MenuName} MenuName={view.MenuName} url={service + view.LinkUrl}/>)
+ 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 {
return (<NotFount key={view.MenuID} />)
}
@@ -312,9 +303,7 @@
}
const mapDispatchToProps = (dispatch) => {
- return {
- initActionPermission: (permAction) => dispatch(initActionPermission(permAction))
- }
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(TabViews)
\ No newline at end of file
--
Gitblit v1.8.0