From ae6ce73e7abde1121a788f884e54ccd6cfad0460 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 11 八月 2020 13:59:29 +0800
Subject: [PATCH] 2020-08-11
---
src/components/tabview/index.jsx | 1
src/tabviews/treepage/index.jsx | 2
src/tabviews/verupmanage/actionList/index.jsx | 6 +
src/tabviews/zshare/settingcomponent/index.scss | 28 +++++++
src/tabviews/verupmanage/config.jsx | 6 -
src/tabviews/verupmanage/index.scss | 33 --------
src/tabviews/commontable/index.scss | 90 ++++++++++++++++------
src/tabviews/scriptmanage/index.scss | 43 ----------
src/tabviews/scriptmanage/index.jsx | 2
src/utils/asyncSpinComponent.jsx | 2
src/tabviews/commontable/index.jsx | 4
src/tabviews/treepage/index.scss | 20 ++++-
src/tabviews/verupmanage/index.jsx | 2
13 files changed, 123 insertions(+), 116 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index fcfca9d..15e2679 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -208,7 +208,6 @@
{tabviews.map(view => {
return (
<Tabs.TabPane
- className="test"
tab={
<span className="tab-control">
{['CommonTable', 'FormTab', 'TreePage'].includes(view.type) ?
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index ccabdc5..d1c16f6 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -1033,7 +1033,7 @@
const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, triggerBtn, userConfig, tabActive, chartId, search, selectedData } = this.state
return (
- <div className="commontable pick-control" id={this.state.ContainerId}>
+ <div className="commontable bg-gray" id={this.state.ContainerId}>
{loadingview && <Spin size="large" />}
{searchlist && searchlist.length > 0 ?
<MainSearch
@@ -1059,7 +1059,7 @@
return (
<Col span={item.width || 24} key={item.uuid}>
{config.charts.length > 1 && item.title ? <p className="chart-table chart-title">{item.title}</p> : null}
- <div style={{minHeight: '25px'}}>
+ <div className="commontable-main-action">
<MainAction
BID={BID}
setting={setting}
diff --git a/src/tabviews/commontable/index.scss b/src/tabviews/commontable/index.scss
index 9a643fe..a7ceb70 100644
--- a/src/tabviews/commontable/index.scss
+++ b/src/tabviews/commontable/index.scss
@@ -6,6 +6,12 @@
.box404 {
padding-top: 30px;
}
+ .commontable-main-action {
+ min-height: 25px;
+ .button-list {
+ padding-right: 110px;
+ }
+ }
.ant-modal-mask {
position: absolute;
}
@@ -139,11 +145,7 @@
}
}
}
-.commontable.pick-control {
- .button-list {
- padding-right: 110px;
- }
-}
+
.menu-tree-modal {
.ant-modal-body {
min-height: 300px;
@@ -163,31 +165,67 @@
}
}
}
-.common-table-custom-modal {
- .ant-modal {
- top: 50px;
- padding-bottom: 5px;
- .ant-modal-body {
- max-height: calc(100vh - 190px);
- min-height: 250px;
- overflow-y: auto;
- .ant-empty {
- margin: 15vh 8px;
+
+.commontable.bg-gray {
+ background: #f0f2f5;
+ >.top-search {
+ background: #ffffff;
+ padding: 10px 10px;
+ margin: 0 20px;
+ }
+ .chart-view {
+ margin-bottom: 20px;
+ .ant-col:last-child {
+ .line-chart-plot-box {
+ margin-bottom: 0px;
+ }
+ .card-row-box {
+ margin-bottom: 0px;
+ }
+ .normal-data-table {
+ margin-bottom: 0px;
}
}
- .ant-modal-body::-webkit-scrollbar {
- width: 7px;
+ >.ant-col {
+ min-height: 50px;
}
- .ant-modal-body::-webkit-scrollbar-thumb {
- border-radius: 5px;
- box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13);
- background: rgba(0, 0, 0, 0.13);
+ }
+ .line-chart-plot-box {
+ background: #ffffff;
+ padding: 10px;
+ margin-bottom: 20px;
+ }
+ .card-row-box {
+ min-height: 130px;
+ background: #ffffff;
+ padding-bottom: 10px;
+ margin-bottom: 20px;
+ }
+ .commontable-main-action {
+ padding: 0 10px;
+ background: #ffffff;
+ }
+ .normal-data-table {
+ padding: 0 10px 10px;
+ margin-bottom: 20px;
+ background: #ffffff;
+ }
+ .main-pickup {
+ right: 45px;
+ }
+ .custom-control {
+ right: 10px;
+ }
+ > .ant-tabs {
+ margin: 0px 20px 20px;
+ padding: 0px;
+ width: calc(100% - 40px);
+ background: #ffffff;
+ .top-search {
+ padding: 0 10px 10px;
}
- .ant-modal-body::-webkit-scrollbar-track {
- box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
- border-radius: 3px;
- border: 1px solid rgba(0, 0, 0, 0.07);
- background: rgba(0, 0, 0, 0);
+ .button-list.toolbar-button {
+ padding: 15px 10px 5px;
}
}
}
\ No newline at end of file
diff --git a/src/tabviews/scriptmanage/index.jsx b/src/tabviews/scriptmanage/index.jsx
index 59cf26f..bbdd033 100644
--- a/src/tabviews/scriptmanage/index.jsx
+++ b/src/tabviews/scriptmanage/index.jsx
@@ -307,7 +307,7 @@
const { dict, searchlist, config, setting, actions, columns, pickup, selectedData } = this.state
return (
- <div className="veruptable pick-control" id={this.state.ContainerId}>
+ <div className="script-manage-table" id={this.state.ContainerId}>
<TopSearch
dict={dict}
searchlist={searchlist}
diff --git a/src/tabviews/scriptmanage/index.scss b/src/tabviews/scriptmanage/index.scss
index d3ec298..7575443 100644
--- a/src/tabviews/scriptmanage/index.scss
+++ b/src/tabviews/scriptmanage/index.scss
@@ -1,4 +1,4 @@
-.veruptable {
+.script-manage-table {
position: relative;
min-height: calc(100vh - 94px);
padding-top: 16px;
@@ -56,6 +56,7 @@
}
.main-table-box {
position: relative;
+ padding: 0 20px;
.pickchange {
position: absolute;
right: 0px;
@@ -68,44 +69,4 @@
}
}
}
- > .ant-tabs {
- padding: 0px 20px;
- margin-bottom: 20px;
- .ant-tabs-tab:not(.ant-tabs-tab-active) {
- cursor: pointer;
- }
- }
- .common-table-copy {
- position: fixed;
- z-index: 2;
- bottom: 65px;
- right: 30px;
- width: 40px;
- height: 40px;
- }
}
-.commontable.pick-control {
- >.button-list {
- padding-right: 140px;
- }
-}
-
-.menu-tree-modal {
- .ant-modal-body {
- min-height: 300px;
- .menu-header {
- text-align: center;
- span {
- font-weight: 600;
- margin-right: 20px;
- }
- .ant-typography {
- font-weight: 600;
- display: inline-block;
- }
- }
- .ant-tree li .ant-tree-node-content-wrapper {
- cursor: default;
- }
- }
-}
\ No newline at end of file
diff --git a/src/tabviews/treepage/index.jsx b/src/tabviews/treepage/index.jsx
index 1d4b56f..9bbceba 100644
--- a/src/tabviews/treepage/index.jsx
+++ b/src/tabviews/treepage/index.jsx
@@ -858,7 +858,7 @@
{!treedata ? <Spin /> : null}
</Card>
</Col>
- <Col span={24 - setting.width} style={{paddingTop: 6}}>
+ <Col span={24 - setting.width}>
{tabgroups.map(group => (
<Tabs activeKey={tabActive[group.uuid]} key={group.uuid} onChange={(key) => this.setState({tabActive: {...tabActive, [group.uuid]: key}})}>
{group.sublist.map(_tab => {
diff --git a/src/tabviews/treepage/index.scss b/src/tabviews/treepage/index.scss
index 67889e8..e261ee4 100644
--- a/src/tabviews/treepage/index.scss
+++ b/src/tabviews/treepage/index.scss
@@ -24,6 +24,13 @@
left: calc(50% - 22px);
top: calc(50vh - 70px);
}
+ > .ant-row {
+ > .ant-col:last-child {
+ > .ant-tabs:first-child {
+ padding-top: 6px;
+ }
+ }
+ }
.tree-card {
min-height: calc(100vh - 125px);
box-shadow: 0px 0px 2px #dddddd;
@@ -116,9 +123,7 @@
}
}
- > .ant-tabs {
- padding: 0px 20px;
- margin-bottom: 20px;
+ .ant-tabs {
.ant-tabs-tab:not(.ant-tabs-tab-active) {
cursor: pointer;
}
@@ -134,7 +139,14 @@
width: 40px;
height: 40px;
}
-
+}
+.tree-page.bg-gray {
+ background: #f0f2f5;
+ .ant-tabs {
+ background: #ffffff;
+ padding: 0px 5px 5px;
+ margin-bottom: 20px;
+ }
}
.menu-tree-modal {
diff --git a/src/tabviews/verupmanage/actionList/index.jsx b/src/tabviews/verupmanage/actionList/index.jsx
index e8fb246..901e639 100644
--- a/src/tabviews/verupmanage/actionList/index.jsx
+++ b/src/tabviews/verupmanage/actionList/index.jsx
@@ -500,7 +500,11 @@
// 澶栭儴璇锋眰
_outParam = JSON.parse(JSON.stringify(res))
- if (btn.sysInterface === 'true' && options.cloudServiceApi) {
+ if (btn.outerFunc === 's_app_version_upt') { // 鏇存柊鐗堟湰鍙�
+ if (window.GLOB.mainSystemApi) {
+ res.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
res.rduri = btn.interface
diff --git a/src/tabviews/verupmanage/config.jsx b/src/tabviews/verupmanage/config.jsx
index 89c1876..269c5cf 100644
--- a/src/tabviews/verupmanage/config.jsx
+++ b/src/tabviews/verupmanage/config.jsx
@@ -35,10 +35,8 @@
]
}
},
- {OpenType:'prompt',Ot:'notRequired',sqlType:'custom',position:'toolbar',sql:'sVersion',execSuccess:'grid',label:'鏇存柊鐗堟湰',intertype:'inner',execError:'never',class:'primary',
- verify:{default:'false',uniques:[],scripts:[{position:'back',sql:'update sapp set app_version=app_version+0.01,modifyuserid=@userid@,modifydate=getdate() where id=@appkey@',uuid:'1592636597030trc047em39bdrpo9tgu'}],customverifys:[],voucher:{enabled:false},contrasts:[],invalid:'false',accountdate:'false',billcodes:[]},
- icon:'',innerFunc:'',uuid:'15926364942911efnal5pv6r92if2vr2'
- }
+ {OpenType:"prompt",Ot:"notRequired",callbackFunc:"",position:"toolbar",sysInterface:"true",execSuccess:"grid",label:"鏇存柊鐗堟湰",intertype:"outer",execError:"never",class:"primary",
+ icon:"",interface:"http://cloud.mk9h.cn/webapi/dostars",innerFunc:"",uuid:"15926364942911efnal5pv6r92if2vr2",outerFunc:"s_app_version_upt"}
],
columns:[
{label:'ID',field:'ID',type:'text',Align:'left',Hide:'true',IsSort:'true',Width:120,prefix:'',postfix:'',matchVal:'',color:'',fieldlength:50,uuid:'1581736658674f11dg01sqdneu8bbn2q'},
diff --git a/src/tabviews/verupmanage/index.jsx b/src/tabviews/verupmanage/index.jsx
index 6b56103..b9c081f 100644
--- a/src/tabviews/verupmanage/index.jsx
+++ b/src/tabviews/verupmanage/index.jsx
@@ -445,7 +445,7 @@
const { dict, searchlist, setting, actions, columns, pickup, config, selectedData } = this.state
return (
- <div className="veruptable pick-control" id={this.state.ContainerId}>
+ <div className="veruptable" id={this.state.ContainerId}>
<TopSearch
dict={dict}
searchlist={searchlist}
diff --git a/src/tabviews/verupmanage/index.scss b/src/tabviews/verupmanage/index.scss
index e9d1fae..1027137 100644
--- a/src/tabviews/verupmanage/index.scss
+++ b/src/tabviews/verupmanage/index.scss
@@ -76,37 +76,4 @@
cursor: pointer;
}
}
- .common-table-copy {
- position: fixed;
- z-index: 2;
- bottom: 65px;
- right: 30px;
- width: 40px;
- height: 40px;
- }
}
-.commontable.pick-control {
- >.button-list {
- padding-right: 140px;
- }
-}
-
-.menu-tree-modal {
- .ant-modal-body {
- min-height: 300px;
- .menu-header {
- text-align: center;
- span {
- font-weight: 600;
- margin-right: 20px;
- }
- .ant-typography {
- font-weight: 600;
- display: inline-block;
- }
- }
- .ant-tree li .ant-tree-node-content-wrapper {
- cursor: default;
- }
- }
-}
\ No newline at end of file
diff --git a/src/tabviews/zshare/settingcomponent/index.scss b/src/tabviews/zshare/settingcomponent/index.scss
index e69de29..14fb20f 100644
--- a/src/tabviews/zshare/settingcomponent/index.scss
+++ b/src/tabviews/zshare/settingcomponent/index.scss
@@ -0,0 +1,28 @@
+.common-table-custom-modal {
+ .ant-modal {
+ top: 50px;
+ padding-bottom: 5px;
+ .ant-modal-body {
+ max-height: calc(100vh - 190px);
+ min-height: 250px;
+ overflow-y: auto;
+ .ant-empty {
+ margin: 15vh 8px;
+ }
+ }
+ .ant-modal-body::-webkit-scrollbar {
+ width: 7px;
+ }
+ .ant-modal-body::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.13);
+ background: rgba(0, 0, 0, 0.13);
+ }
+ .ant-modal-body::-webkit-scrollbar-track {
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
+ border-radius: 3px;
+ border: 1px solid rgba(0, 0, 0, 0.07);
+ background: rgba(0, 0, 0, 0);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/utils/asyncSpinComponent.jsx b/src/utils/asyncSpinComponent.jsx
index 0754c07..8642bf8 100644
--- a/src/utils/asyncSpinComponent.jsx
+++ b/src/utils/asyncSpinComponent.jsx
@@ -26,7 +26,7 @@
return C ?
<C {...this.props} /> :
- <div className="async-spin" style={{textAlign: 'center', minHeight: 50, lineHeight: '50px'}}><Spin/></div>
+ <div className="async-spin" style={{textAlign: 'center', minHeight: 50, lineHeight: '50px', background: '#ffffff'}}><Spin/></div>
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0