From 99134da2a0c8eee1f6f2ef96651f50dd26eae8c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 十一月 2022 17:52:36 +0800
Subject: [PATCH] 2022-11-15
---
public/options.json | 10 +++++-----
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 6 +++++-
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 6 +++++-
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 6 +++++-
src/tabviews/custom/components/chart/antv-pie/index.jsx | 6 +++++-
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/public/options.json b/public/options.json
index ff6de49..ea0061e 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,12 +1,12 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "css_wx_app",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"WXminiAppID": "",
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 151e4e6..2e1943a 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -110,7 +110,11 @@
_config.plot.height = Utils.getHeight(_config.plot.height)
_config.style.height = 'auto'
- _config.style.minHeight = _config.plot.height
+ _config.style.minHeight = _config.plot.height + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
let transfield = {}
_config.columns.forEach(col => {
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index 2be8a1b..25aae9e 100644
--- a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
@@ -109,7 +109,11 @@
_config.plot.height = Utils.getHeight(_config.plot.height)
_config.style.height = 'auto'
- _config.style.minHeight = _config.plot.height
+ _config.style.minHeight = _config.plot.height + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
this.setState({
config: _config,
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index f00c137..8662310 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -66,7 +66,11 @@
_config.plot.height = Utils.getHeight(_config.plot.height)
_config.style.height = 'auto'
- _config.style.minHeight = _config.plot.height
+ _config.style.minHeight = _config.plot.height + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
let decimal = 0
_config.columns.forEach(col => {
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index 5f1d09c..644a98f 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -66,7 +66,11 @@
_config.plot.height = Utils.getHeight(_config.plot.height)
_config.style.height = 'auto'
- _config.style.minHeight = _config.plot.height
+ _config.style.minHeight = _config.plot.height + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
this.setState({
config: _config,
--
Gitblit v1.8.0