From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/components/tabview/index.jsx | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index faf1a35..b9afa22 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -2,14 +2,13 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import {Tabs, Icon, Button, message, BackTop} from 'antd'
+import {Tabs, Icon, BackTop} from 'antd'
import moment from 'moment'
import 'moment/locale/zh-cn'
import { modifyTabview, toggleIsiframe } from '@/store/action'
import asyncComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
-import options from '@/store/options.js'
import mzhCN from '@/locales/zh-CN/main.js'
import menUS from '@/locales/en-US/main.js'
import MKEmitter from '@/utils/events.js'
@@ -47,7 +46,6 @@
tabviews: null, // 鏍囩闆�
iFrameHeight: 0,
dict: localStorage.getItem('lang') !== 'en-US' ? mzhCN : menUS,
- debug: sessionStorage.getItem('debug') === 'true'
}
handleTabview = (e, menu) => {
@@ -141,22 +139,10 @@
} 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} 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={service + view.LinkUrl}/>)
} else {
return (<NotFount key={view.MenuID} />)
}
- }
-
- copyMenuNo = (e) => {
- e.stopPropagation()
- let oInput = document.createElement('input')
- oInput.value = e.target.dataset.menuno || ''
- document.body.appendChild(oInput)
- oInput.select()
- document.execCommand('Copy')
- oInput.className = 'oInput'
- oInput.style.display = 'none'
- message.success(this.state.dict['main.copy.success'])
}
UNSAFE_componentWillMount () {
@@ -173,7 +159,7 @@
componentDidMount () {
let home = {
MenuID: 'home_page_id',
- MenuName: '棣栭〉',
+ MenuName: this.state.dict['main.homepage'],
selected: true,
type: 'Home'
}
@@ -224,8 +210,7 @@
}
render () {
- const { menuType } = this.props
- const { tabviews, activeId, debug } = this.state
+ const { tabviews, activeId } = this.state
return (
<section className={'flex-container content-box' + (this.props.collapse ? ' collapsed' : '')}>
@@ -237,9 +222,7 @@
<Tabs.TabPane
tab={
<span className="tab-control">
- {['CommonTable', 'FormTab', 'TreePage', 'CalendarPage', 'CustomPage', 'ManageTable', 'VerupTable'].includes(view.type) ?
- <Icon type="redo" onClick={(e) => {this.refreshTabview(e, view)}}/> : null
- }
+ <Icon type="redo" onClick={(e) => {this.refreshTabview(e, view)}}/>
<span className="tab-name" onClick={(e) => {this.changeTab(e, view)}}>
{view.MenuName}
</span>
@@ -251,15 +234,6 @@
key={view.MenuID}
>
{this.selectcomponent(view)}
- {debug && options.sysType !== 'cloud' && menuType !== 'HS' && !['CommonTable', 'TreePage', 'ManageTable', 'CalendarPage', 'Home'].includes(view.type) ?
- <Button
- icon="copy"
- shape="circle"
- className={'main-copy ' + (view.type === 'iframe' ? 'ifr-copy' : '')}
- data-menuno={view.MenuNo}
- onClick={this.copyMenuNo}
- /> : null
- }
<BackTop>
<div className="ant-back-top">
<div className="ant-back-top-content">
@@ -280,7 +254,6 @@
const mapStateToProps = (state) => {
return {
- menuType: state.editLevel,
tabviews: state.tabviews,
collapse: state.collapse,
isiframe: state.isiframe
--
Gitblit v1.8.0