From 50e83416b0ff2b2447a3993eb40bd86b85daf8cf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2020 14:59:02 +0800
Subject: [PATCH] 2020-02-14
---
src/components/tabview/index.jsx | 9 ++
src/components/tabview/index.scss | 4 +
src/tabviews/rolemanage/index.scss | 4 -
src/tabviews/commontable/index.scss | 4 -
src/tabviews/formtab/index.scss | 4 -
src/tabviews/formtab/index.jsx | 9 --
src/tabviews/subtable/index.scss | 4 -
src/tabviews/datamanage/index.jsx | 10 ---
src/tabviews/rolemanage/index.jsx | 60 +------------------
src/tabviews/datamanage/index.scss | 4 -
src/tabviews/commontable/index.jsx | 9 --
src/tabviews/subtabtable/index.scss | 4 -
12 files changed, 19 insertions(+), 106 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index bfe7e6e..eeefeef 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import {Tabs, Icon, Button, ConfigProvider, message} from 'antd'
+import {Tabs, Icon, Button, ConfigProvider, message, BackTop} from 'antd'
import {modifyTabview, toggleIsiframe} from '@/store/action'
// import asyncComponent from '@/utils/asyncComponent'
import asyncComponent from '@/utils/asyncLoadComponent'
@@ -206,6 +206,13 @@
>
{this.selectcomponent(view)}
<Button className={'main-copy ' + (view.type === 'iframe' ? 'ifr-copy' : '')} icon="copy" data-menuno={view.MenuNo} onClick={this.copyMenuNo} shape="circle" />
+ <BackTop>
+ <div className="ant-back-top">
+ <div className="ant-back-top-content">
+ <div className="ant-back-top-icon"></div>
+ </div>
+ </div>
+ </BackTop>
</Tabs.TabPane>
)
})}
diff --git a/src/components/tabview/index.scss b/src/components/tabview/index.scss
index e51ffb7..afc15ea 100644
--- a/src/components/tabview/index.scss
+++ b/src/components/tabview/index.scss
@@ -62,6 +62,10 @@
.main-copy.ifr-copy:hover {
opacity: 1;
}
+ .ant-back-top {
+ bottom: 20px;
+ right: 30px;
+ }
}
.content-box.collapsed {
max-width: calc(100% - 80px);
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 05afd1b..067bbe5 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { BackTop, notification, Spin, Tabs, Icon, Switch, Modal, Button} from 'antd'
+import { notification, Spin, Tabs, Icon, Switch, Modal, Button} from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -882,13 +882,6 @@
refreshSupView={this.reloadtable}
/>}
</Modal>
- <BackTop>
- <div className="ant-back-top">
- <div className="ant-back-top-content">
- <div className="ant-back-top-icon"></div>
- </div>
- </div>
- </BackTop>
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div> : null}
{view === 'formtab' ? <FormTab MenuID={this.state.tabBtn.uuid} param={this.state.tabParam}/> : null}
diff --git a/src/tabviews/commontable/index.scss b/src/tabviews/commontable/index.scss
index 8e15cd8..f5b97e9 100644
--- a/src/tabviews/commontable/index.scss
+++ b/src/tabviews/commontable/index.scss
@@ -75,10 +75,6 @@
padding-right: 140px;
}
}
-.ant-back-top {
- bottom: 20px;
- right: 30px;
-}
.popview-modal {
.ant-modal-body {
min-height: 300px;
diff --git a/src/tabviews/datamanage/index.jsx b/src/tabviews/datamanage/index.jsx
index 804face..c745ea1 100644
--- a/src/tabviews/datamanage/index.jsx
+++ b/src/tabviews/datamanage/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import {connect} from 'react-redux'
-import { BackTop, notification, Button } from 'antd'
+import { notification, Button } from 'antd'
import MutilForm from '@/components/mutilform'
import {refreshTabView} from '@/store/action'
import Api from '@/api'
@@ -339,14 +339,6 @@
</div>
</div>)
}
- {/* 杩斿洖椤堕儴 */}
- <BackTop>
- <div className="ant-back-top">
- <div className="ant-back-top-content">
- <div className="ant-back-top-icon"></div>
- </div>
- </div>
- </BackTop>
</div>
)
}
diff --git a/src/tabviews/datamanage/index.scss b/src/tabviews/datamanage/index.scss
index 2ad8d27..e4a05f2 100644
--- a/src/tabviews/datamanage/index.scss
+++ b/src/tabviews/datamanage/index.scss
@@ -25,7 +25,3 @@
padding-top: 15px;
}
}
-.ant-back-top {
- bottom: 20px;
- right: 30px;
-}
\ No newline at end of file
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index 15a81fc..77d9dab 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { BackTop, notification, Spin, Tabs, Icon} from 'antd'
+import { notification, Spin, Tabs, Icon} from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -445,13 +445,6 @@
)
})
}
- <BackTop>
- <div className="ant-back-top">
- <div className="ant-back-top-content">
- <div className="ant-back-top-icon"></div>
- </div>
- </div>
- </BackTop>
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
diff --git a/src/tabviews/formtab/index.scss b/src/tabviews/formtab/index.scss
index 1a33f49..317f3dd 100644
--- a/src/tabviews/formtab/index.scss
+++ b/src/tabviews/formtab/index.scss
@@ -164,10 +164,6 @@
padding-right: 140px;
}
}
-.ant-back-top {
- bottom: 20px;
- right: 30px;
-}
.popview-modal {
.ant-modal-body {
min-height: 300px;
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index e5fdeac..6f1619b 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -1,9 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { BackTop, Card, Col, Row, Icon } from 'antd'
-import Api from '@/api'
-// import Loading from '@/components/loading'
+import { Card, Col, Row, Icon } from 'antd'
+// import Api from '@/api'
import zhCN from '@/locales/zh-CN/role.js'
import enUS from '@/locales/en-US/role.js'
import './index.scss'
@@ -15,54 +14,11 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- searchlist: null,
- actions: null,
- columns: null,
- select: null,
- data: null,
- total: 0,
- loading: true,
- param: {
- pageIndex: 1,
- pageSize: 10,
- orderColumn: '',
- orderType: '',
- search: ''
- },
- fixed: {}
- }
-
- async loadconfig () {
- let param = {
- func: 'sPC_Get_TreePage',
- MenuNo: this.props.MenuNo
- }
- let result = await Api.commonInterface(param)
- if (result.status) {
-
- }
- }
-
- async loadmaindata (pageIndex = 1, pageSize = 10, orderColumn = '', orderType = '', search = '') {
- // 鑾峰彇鍒楄〃鏁版嵁
- // let result = await Api.getMainTableData(this.props.MenuNo, pageIndex, pageSize, orderColumn, orderType, search)
- // if (result.status) {
- // this.setState({
- // data: result.data.map((item, index) => {
- // item.key = index
- // item.rows = item.mkrows
- // return item
- // }),
- // total: result.total,
- // loading: false
- // })
- // }
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
}
UNSAFE_componentWillMount () {
- // 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
- this.loadconfig()
+
}
shouldComponentUpdate (nextProps, nextState) {
@@ -72,7 +28,6 @@
render() {
return (
<div className="rolemanage">
- {/* {!this.state.searchlist && <Loading />} */}
<Row gutter={16}>
<Col span={6}>
<Card
@@ -87,13 +42,6 @@
</Card>
</Col>
</Row>
- <BackTop>
- <div className="ant-back-top">
- <div className="ant-back-top-content">
- <div className="ant-back-top-icon"></div>
- </div>
- </div>
- </BackTop>
</div>
)
}
diff --git a/src/tabviews/rolemanage/index.scss b/src/tabviews/rolemanage/index.scss
index 7deb261..30e6bcd 100644
--- a/src/tabviews/rolemanage/index.scss
+++ b/src/tabviews/rolemanage/index.scss
@@ -7,8 +7,4 @@
.role-title {
color: #36c6d3;
}
-}
-.ant-back-top {
- bottom: 20px;
- right: 30px;
}
\ No newline at end of file
diff --git a/src/tabviews/subtable/index.scss b/src/tabviews/subtable/index.scss
index f5fe1be..74096d3 100644
--- a/src/tabviews/subtable/index.scss
+++ b/src/tabviews/subtable/index.scss
@@ -30,10 +30,6 @@
top: 100px;
}
}
-.ant-back-top {
- bottom: 20px;
- right: 30px;
-}
.popview-modal {
.ant-modal-body {
min-height: 300px;
diff --git a/src/tabviews/subtabtable/index.scss b/src/tabviews/subtabtable/index.scss
index 890b283..4334c75 100644
--- a/src/tabviews/subtabtable/index.scss
+++ b/src/tabviews/subtabtable/index.scss
@@ -30,7 +30,3 @@
top: 100px;
}
}
-.ant-back-top {
- bottom: 20px;
- right: 30px;
-}
\ No newline at end of file
--
Gitblit v1.8.0