From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/assets/css/viewstyle.scss | 2 +-
src/tabviews/custom/components/share/tabtransfer/index.jsx | 2 +-
src/menu/components/chart/antv-scatter/index.scss | 4 ----
src/tabviews/custom/components/group/normal-group/index.jsx | 2 +-
src/menu/components/chart/antv-pie/index.scss | 4 ----
public/options.json | 12 ++++++------
src/menu/components/chart/antv-bar/index.scss | 4 ----
src/tabviews/custom/components/share/normalheader/index.scss | 3 +++
src/tabviews/custom/components/card/cardcellList/index.scss | 2 +-
src/menu/components/chart/antv-dashboard/index.scss | 4 ----
src/tabviews/custom/components/card/data-card/index.scss | 6 +++---
src/tabviews/custom/components/table/normal-table/index.scss | 4 ++--
src/tabviews/custom/components/card/data-card/index.jsx | 4 ++--
13 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/public/options.json b/public/options.json
index 7ca016a..f6bbbcb 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,16 +1,16 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "20200603163557423A7A4FF7915AC4F2D90DE",
+ "appkey": "202006011452123805E10CF76EC964C4C9C42",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
- "externalDatabase": "false",
+ "externalDatabase": "",
"lineColor": "",
"filter": "false",
"defaultApp": "",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "E1A8FE",
- "host": "http://qingqiumarket.cn",
- "service": "mkwms/"
+ "licenseKey": "",
+ "host": "http://demo.mk9h.cn",
+ "service": "qm_owt/"
}
\ No newline at end of file
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index b07f0d8..b6f62f5 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -186,7 +186,7 @@
}
}
.custom-data-card-box, .custom-prop-card-box {
- .data-zoom.radio .card-row-list > .ant-col:not(.active):not(.selected):hover > .card-item-box, .data-zoom.checkbox .card-row-list > .ant-col:not(.active):not(.selected):hover > .card-item-box {
+ .data-zoom.radio .card-row-list > .ant-col:not(.active):not(.selected):not(.extend-card):hover > .card-item-box, .data-zoom.checkbox .card-row-list > .ant-col:not(.active):not(.selected):not(.extend-card):hover > .card-item-box {
border-color: $color4 !important;
box-shadow: 0 0 4px $color4 !important;
}
diff --git a/src/menu/components/chart/antv-bar/index.scss b/src/menu/components/chart/antv-bar/index.scss
index b55ec7a..19c0e63 100644
--- a/src/menu/components/chart/antv-bar/index.scss
+++ b/src/menu/components/chart/antv-bar/index.scss
@@ -12,12 +12,8 @@
margin: 0px;
padding: 15px 10px 10px;
letter-spacing: 0px;
- // height: 100%;
flex: 1;
}
- // .normal-header + .canvas {
- // height: calc(100% - 45px);
- // }
.chart-header {
position: relative;
diff --git a/src/menu/components/chart/antv-dashboard/index.scss b/src/menu/components/chart/antv-dashboard/index.scss
index f56897e..7ea886d 100644
--- a/src/menu/components/chart/antv-dashboard/index.scss
+++ b/src/menu/components/chart/antv-dashboard/index.scss
@@ -12,12 +12,8 @@
margin: 0px;
padding: 15px;
letter-spacing: 0px;
- // height: 100%;
flex: 1;
}
- // .normal-header + .canvas {
- // height: calc(100% - 45px);
- // }
>.anticon-tool {
position: absolute;
diff --git a/src/menu/components/chart/antv-pie/index.scss b/src/menu/components/chart/antv-pie/index.scss
index 2de1b1e..987cccc 100644
--- a/src/menu/components/chart/antv-pie/index.scss
+++ b/src/menu/components/chart/antv-pie/index.scss
@@ -12,12 +12,8 @@
margin: 0px;
padding: 15px;
letter-spacing: 0px;
- // height: 100%;
flex: 1;
}
- // .normal-header + .canvas {
- // height: calc(100% - 45px);
- // }
>.anticon-tool {
position: absolute;
diff --git a/src/menu/components/chart/antv-scatter/index.scss b/src/menu/components/chart/antv-scatter/index.scss
index f5f3597..cc4cd88 100644
--- a/src/menu/components/chart/antv-scatter/index.scss
+++ b/src/menu/components/chart/antv-scatter/index.scss
@@ -12,12 +12,8 @@
margin: 0px;
padding: 15px 10px 10px;
letter-spacing: 0px;
- // height: 100%;
flex: 1;
}
- // .normal-header + .canvas {
- // height: calc(100% - 45px);
- // }
.chart-header {
position: relative;
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index 4cadef8..a890f89 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -63,7 +63,7 @@
width: 100%;
max-width: 100%;
height: auto;
- min-height: 32px;
+ min-height: 28px;
}
}
.ant-mk-slider {
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 23383a8..943a158 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -660,7 +660,7 @@
<Row className="card-row-list">
{offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null}
{precards.map((item, index) => (
- <Col key={'pre' + index} className={item.setting.$click} span={item.setting.width || 6}>
+ <Col key={'pre' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
<CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
</Col>
))}
@@ -670,7 +670,7 @@
</Col>
))}
{nextcards.map((item, index) => (
- <Col key={'next' + index} className={item.setting.$click} span={item.setting.width || 6}>
+ <Col key={'next' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
<CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
</Col>
))}
diff --git a/src/tabviews/custom/components/card/data-card/index.scss b/src/tabviews/custom/components/card/data-card/index.scss
index 7648cb1..9f7e363 100644
--- a/src/tabviews/custom/components/card/data-card/index.scss
+++ b/src/tabviews/custom/components/card/data-card/index.scss
@@ -7,7 +7,7 @@
>.button-list.toolbar-button {
padding: 0;
- line-height: 55px;
+ line-height: 45px;
button {
margin-right: 0px;
margin-bottom: 0px;
@@ -22,7 +22,7 @@
}
.data-zoom.radio, .data-zoom.checkbox {
.card-row-list {
- >.ant-col:not(.active):not(.selected):hover {
+ >.ant-col:not(.active):not(.selected):not(.extend-card):hover {
>.card-item-box {
border-color: #69c0ff!important;
box-shadow: 0 0 4px #69c0ff!important;
@@ -32,7 +32,7 @@
}
.data-zoom.true {
.card-row-list {
- >.ant-col:hover {
+ >.ant-col:not(.extend-card):hover {
>.card-item-box {
z-index: 1;
transform: scale(1.05);
diff --git a/src/tabviews/custom/components/group/normal-group/index.jsx b/src/tabviews/custom/components/group/normal-group/index.jsx
index 05c8ba6..9fde7b5 100644
--- a/src/tabviews/custom/components/group/normal-group/index.jsx
+++ b/src/tabviews/custom/components/group/normal-group/index.jsx
@@ -102,7 +102,7 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
loadmaindata = (params) => {
- let param = getStructuredParams(params, this.props.config)
+ let param = getStructuredParams(params, this.props.config, this.props.BID || '')
Api.getLocalConfig(param).then(result => {
if (result.status) {
diff --git a/src/tabviews/custom/components/share/normalheader/index.scss b/src/tabviews/custom/components/share/normalheader/index.scss
index 3939c9a..94dba47 100644
--- a/src/tabviews/custom/components/share/normalheader/index.scss
+++ b/src/tabviews/custom/components/share/normalheader/index.scss
@@ -34,6 +34,9 @@
.ant-select-selection {
height: 28px;
}
+ .ant-input-search-button {
+ height: 28px;
+ }
}
}
}
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 0fad518..cf7fe9d 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -118,7 +118,7 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
loadmaindata = (params) => {
- let param = getStructuredParams(params, this.props.config)
+ let param = getStructuredParams(params, this.props.config, this.props.BID || '')
Api.getLocalConfig(param).then(result => {
if (result.status) {
diff --git a/src/tabviews/custom/components/table/normal-table/index.scss b/src/tabviews/custom/components/table/normal-table/index.scss
index 2e28b4f..e3d3aed 100644
--- a/src/tabviews/custom/components/table/normal-table/index.scss
+++ b/src/tabviews/custom/components/table/normal-table/index.scss
@@ -9,7 +9,7 @@
}
>.button-list.toolbar-button {
padding: 0;
- line-height: 55px;
+ line-height: 45px;
padding-right: 60px;
button {
margin-right: 0px;
@@ -80,7 +80,7 @@
padding: 0;
>.button-list.toolbar-button {
padding: 0;
- line-height: 55px;
+ line-height: 45px;
padding-right: 60px;
button {
margin-right: 0px;
--
Gitblit v1.8.0