From 72194d09bc2eb9ab0b60bd000d98dc94c99ce82d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 06 十二月 2019 17:51:29 +0800
Subject: [PATCH] 2019-12-06
---
src/tabviews/datamanage/index.jsx | 1 +
src/tabviews/datamanage/index.scss | 3 +++
src/tabviews/datamanage/table/index.jsx | 18 ++++++++----------
src/components/sidemenu/editthdmenu/index.jsx | 11 +++++++++++
4 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/components/sidemenu/editthdmenu/index.jsx b/src/components/sidemenu/editthdmenu/index.jsx
index b94b6f9..c54c7ac 100644
--- a/src/components/sidemenu/editthdmenu/index.jsx
+++ b/src/components/sidemenu/editthdmenu/index.jsx
@@ -52,6 +52,7 @@
usedTemplates: null,
menuConfig: '',
tempSearchKey: '',
+ loading: false,
baseTemplates: [{
title: '鍩虹琛ㄦ牸',
type: 'CommonTable',
@@ -105,6 +106,11 @@
func: 'sPC_Get_LongParam',
MenuID: _menu.MenuID
}
+
+ this.setState({
+ loading: true
+ })
+
Api.getSystemConfig(param).then(res => {
if (res.status) {
let _LongParam = res.LongParam && window.decodeURIComponent(window.atob(res.LongParam))
@@ -127,6 +133,7 @@
this.setState({
type: 'edit',
editMenu: _menu,
+ loading: false,
tabview: _Template.length > 0 ? _menu.PageParam.Template : 'template'
})
if (_Template.length === 0) {
@@ -137,6 +144,9 @@
})
}
} else {
+ this.setState({
+ loading: false
+ })
notification.warning({
top: 92,
message: res.message,
@@ -506,6 +516,7 @@
{!this.state.thawmenulist && <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" />}
{this.state.thawmenulist && <TransferForm ref="trawmenu" dict={this.state.dict} menulist={this.state.thawmenulist}/>}
</Modal>
+ {this.state.loading && <Spin style={{position: 'fixed', left: 'calc(50vw - 22px)', top: 'calc(50vh - 70px)'}} size="large" />}
</div>
)
}
diff --git a/src/tabviews/datamanage/index.jsx b/src/tabviews/datamanage/index.jsx
index 49bdb4b..220bc2a 100644
--- a/src/tabviews/datamanage/index.jsx
+++ b/src/tabviews/datamanage/index.jsx
@@ -309,6 +309,7 @@
MenuNo={this.props.MenuNo}
refreshdata={this.refreshbytable}
columns={this.state.columns}
+ actions={this.state.actions}
data={this.state.data}
selectable={this.state.selectable}
total={this.state.total}
diff --git a/src/tabviews/datamanage/index.scss b/src/tabviews/datamanage/index.scss
index a07394f..d51b566 100644
--- a/src/tabviews/datamanage/index.scss
+++ b/src/tabviews/datamanage/index.scss
@@ -21,6 +21,9 @@
}
}
}
+ .datamanage-search + .datamanage-table {
+ padding-top: 15px;
+ }
}
.ant-back-top {
bottom: 30px;
diff --git a/src/tabviews/datamanage/table/index.jsx b/src/tabviews/datamanage/table/index.jsx
index b49715f..823c18a 100644
--- a/src/tabviews/datamanage/table/index.jsx
+++ b/src/tabviews/datamanage/table/index.jsx
@@ -11,10 +11,8 @@
selectable: PropTypes.bool,
dict: PropTypes.object, // 瀛楀吀椤�
columns: PropTypes.array, // 琛ㄦ牸鍒�
- data: PropTypes.oneOfType([
- PropTypes.object,
- PropTypes.array
- ])
+ actions: PropTypes.any,
+ data: PropTypes.any
}
state = {
@@ -24,11 +22,7 @@
pageSize: 10,
columns: this.props.columns.map(item => {
let _width = parseInt(item.Width) || 50
- // if (/ID$/.test(item.FieldName) || item.FieldName.includes('PassWord')) {
- // _width = _width * 3
- // } else if (item.FieldName.includes('Date')) {
- // _width = _width * 2
- // }
+
return {
align: item.Align,
dataIndex: item.FieldName,
@@ -116,9 +110,13 @@
onChange: this.onSelectChange
}
}
+ let offset = 48
+ if (this.props.actions && this.props.actions.length > 0) {
+ offset = 105
+ }
return (
<div className="datamanage-table">
- {this.state.fixed && <Affix offsetTop={105} className="fix-header">
+ {this.state.fixed && <Affix offsetTop={offset} className="fix-header">
<Table
bordered={true}
rowSelection={rowSelection}
--
Gitblit v1.8.0