From bdfec77e57c90ad4750e08ee822818ce991b019f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 26 十一月 2023 14:11:58 +0800
Subject: [PATCH] 2023-11-26
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 5 --
src/menu/components/chart/antv-bar/index.jsx | 16 +++++--
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 13 ++++--
src/menu/components/card/cardcellcomponent/index.jsx | 4 +-
src/menu/datasource/verifycard/index.jsx | 26 ++++++++----
5 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index aeb7c5c..5460326 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -454,11 +454,11 @@
let style = {}
if (res.class === 'default') {
style.color = 'rgba(0, 0, 0, 0.65)'
- style.backgroundColor = '#fff'
+ style.backgroundColor = 'transparent'
style.borderColor = '#d9d9d9'
} else if (res.class.indexOf('border') > -1) {
style.color = color[cl]
- style.backgroundColor = '#fff'
+ style.backgroundColor = 'transparent'
style.borderColor = color[cl]
} else {
style.color = '#ffffff'
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index ff38788..f7a2dd7 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -152,11 +152,6 @@
let plot = fromJS(config.plot).toJS()
- if (plot.correction) {
- delete plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
- plot.barSize = 35
- }
-
if (plot.datatype !== 'statistics') {
if (plot.colors) {
plot.colors = plot.colors.map(item => {
diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index 7cca88e..717559d 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -87,8 +87,14 @@
this.updateComponent(_card, true)
} else {
+ let _card = fromJS(card).toJS()
+ if (_card.plot.correction) {
+ delete _card.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
+ _card.plot.barSize = 35
+ }
+
this.setState({
- card: fromJS(card).toJS()
+ card: _card
})
}
}
@@ -725,7 +731,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.barRadius) {
@@ -777,7 +783,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.barRadius) {
@@ -1125,7 +1131,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
@@ -1185,7 +1191,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index a3c262b..a8e84f7 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -661,16 +661,24 @@
let r = SettingUtils.getDebugSql(setting, _scripts, _columns, searches, config.type)
let _debugId = md5(r.sql)
-
+
if (r.custompage && setting.laypage === 'true' && _columns.findIndex(col => col.field === 'mk_total') === -1) {
- Modal.warning({
- title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄥ瓧娈甸泦涓坊鍔� mk_total銆俙,
- okText: '鐭ラ亾浜�',
- onOk: () => {
- reject()
- }
- })
- return
+ if (config.subtype !== 'basetable') {
+ Modal.warning({
+ title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄥ瓧娈甸泦涓坊鍔� mk_total銆俙,
+ okText: '鐭ラ亾浜�',
+ onOk: () => {
+ reject()
+ }
+ })
+ return
+ } else {
+ notification.warning({
+ top: 92,
+ message: '鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄦ樉绀哄垪涓坊鍔� mk_total銆�',
+ duration: 5
+ })
+ }
}
if (debugId === _debugId) {
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 369255d..bb1006e 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -100,6 +100,11 @@
_config.style.height = 'auto'
_config.style.minHeight = _config.plot.height + 30
+ if (_config.plot.correction) {
+ delete _config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
+ _config.plot.barSize = 35
+ }
+
if (!_config.plot.legend || _config.plot.legend === 'hidden') {
_config.plot.legend = false
}
@@ -1432,7 +1437,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.barRadius) {
@@ -1494,7 +1499,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.barRadius) {
@@ -1910,7 +1915,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
@@ -1996,7 +2001,7 @@
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
--
Gitblit v1.8.0