From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/components/tabview/index.jsx | 107 +++++++++++++++++++----------------------------------
1 files changed, 38 insertions(+), 69 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index 689faa5..06635eb 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -1,6 +1,4 @@
import React, {Component} from 'react'
-import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
import { fromJS } from 'immutable'
import {Tabs, BackTop, notification} from 'antd'
import { RedoOutlined, CloseOutlined } from '@ant-design/icons'
@@ -8,8 +6,7 @@
import 'moment/locale/zh-cn'
import asyncComponent from '@/utils/asyncLoadComponent'
-// import NotFount from '@/components/404'
-import options from '@/store/options.js'
+import NotFount from '@/components/404'
import MKEmitter from '@/utils/events.js'
import Api from '@/api'
import './index.scss'
@@ -21,18 +18,43 @@
const TreePage = asyncComponent(() => import('@/tabviews/treepage'))
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const RoleManage = asyncComponent(() => import('@/tabviews/rolemanage'))
-const FormTab = asyncComponent(() => import('@/tabviews/formtab'))
-const Calendar = asyncComponent(() => import('@/tabviews/calendar'))
+
+moment.locale('zh-cn')
class TabViews extends Component {
- static propTpyes = {
- collapse: PropTypes.bool
- }
-
state = {
activeId: '',
- tabviews: null, // 鏍囩闆�
+ tabviews: [],
iFrameHeight: 0,
+ }
+
+ UNSAFE_componentWillMount () {
+ if (!window.GLOB.mkHS) {
+ this.setState({
+ activeId: 'home_page_id',
+ tabviews: [{
+ MenuID: 'home_page_id',
+ MenuName: '棣栭〉',
+ type: 'Home'
+ }]
+ })
+ }
+ }
+
+ componentDidMount () {
+ MKEmitter.addListener('modifyTabs', this.modifyTabs)
+ MKEmitter.addListener('closeTabView', this.closeTabView)
+ }
+
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
+ */
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('modifyTabs', this.modifyTabs)
+ MKEmitter.removeListener('closeTabView', this.closeTabView)
}
// 鍏抽棴tab椤碉紝閲嶆柊閫夋嫨鏄剧ず椤�
@@ -75,7 +97,7 @@
e.stopPropagation()
window.GLOB.CacheMap = new Map()
- if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ if (window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
let roledefer = new Promise(resolve => {
Api.getSystemConfig({
func: 's_Get_TrdMenu_Role',
@@ -206,63 +228,20 @@
return (<TreePage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} param={view.param}/>)
} else if (view.type === 'RolePermission') {
return (<RoleManage MenuID={view.MenuID}/>)
- } else if (view.type === 'FormTab') {
- return (<FormTab MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} param={view.param}/>)
} else if (view.type === 'iframe') {
return (<Iframe MenuID={view.MenuID} title={view.MenuName} url={view.src}/>)
} else {
- return (<Calendar MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} param={view.param}/>)
- // return (<NotFount />)
+ return (<NotFount />)
}
- }
-
- UNSAFE_componentWillMount () {
- if (!sessionStorage.getItem('lang') || sessionStorage.getItem('lang') === 'zh-CN') {
- moment.locale('zh-cn')
- } else {
- moment.locale('en')
- }
-
- if (sessionStorage.getItem('isEditState') !== 'true') {
- this.setState({
- activeId: 'home_page_id',
- tabviews: [{
- MenuID: 'home_page_id',
- MenuName: '棣栭〉',
- type: 'Home'
- }]
- })
- } else {
- this.setState({
- activeId: '',
- tabviews: []
- })
- }
- }
-
- componentDidMount () {
- MKEmitter.addListener('modifyTabs', this.modifyTabs)
- MKEmitter.addListener('closeTabView', this.closeTabView)
- }
-
- /**
- * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
- */
- componentWillUnmount () {
- this.setState = () => {
- return
- }
- MKEmitter.removeListener('modifyTabs', this.modifyTabs)
- MKEmitter.removeListener('closeTabView', this.closeTabView)
}
render () {
const { tabviews, activeId } = this.state
return (
- <section className={'mk-tabview-wrap' + (this.props.collapse ? ' collapsed' : '')}>
+ <section id="mk-tabgroup-wrap" className="mk-tabview-wrap">
<div className="content-header">
- {tabviews && tabviews.length > 0 &&
+ {tabviews.length > 0 &&
<Tabs activeKey={activeId}>
{tabviews.map(view => {
return (
@@ -299,14 +278,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- collapse: state.collapse,
- }
-}
-
-const mapDispatchToProps = (dispatch) => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TabViews)
\ No newline at end of file
+export default TabViews
\ No newline at end of file
--
Gitblit v1.8.0