From f25d46a5cfdc9cab3981e50255a5e82f72eba686 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 五月 2020 14:13:31 +0800
Subject: [PATCH] 2020-05-22
---
src/templates/subtableconfig/index.jsx | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index 0b5dbf0..991316a 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -299,9 +299,9 @@
let _config = {...config, tabName: res.MenuName, tabNo: res.MenuNo, Remark: res.Remark}
// 鏈缃暟鎹簮鎴栦富閿椂锛屽惎鐢ㄧ姸鎬佷负false
- if (_config.setting.interType === 'inner' && !_config.setting.innerFunc && !_config.setting.dataresource) {
- _config.enabled = false
- } else if (!_config.setting.primaryKey) {
+ let result = this.verifyconfig(_config)
+
+ if (result !== true) {
_config.enabled = false
}
@@ -894,22 +894,42 @@
onEnabledChange = () => {
const { config } = this.state
- if (config.setting.interType === 'inner' && !config.setting.innerFunc && !config.setting.dataresource) {
+ let _enabled = !config.enabled
+ let result = this.verifyconfig(config)
+
+ if (_enabled && result !== true) {
notification.warning({
top: 92,
- message: '灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
+ message: result,
duration: 5
})
+ return
+ }
+
+ this.setState({
+ config: {...config, enabled: _enabled}
+ })
+ }
+
+ /**
+ * @description 鏍￠獙閰嶇疆淇℃伅鐨勫悎娉曟��
+ */
+ verifyconfig = (config) => {
+ let charterr = ''
+ config.charts.forEach(chart => {
+ if (!charterr && ['line', 'bar', 'pie'].includes(chart.chartType) && !chart.Xaxis) {
+ charterr = '鍥捐〃' + (chart.title ? '銆�' + chart.title + '銆�' : '') + '鍧愭爣杞存湭璁剧疆锛屼笉鍙惎鐢紒'
+ }
+ })
+
+ if (config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.default !== 'false' && !config.setting.dataresource) {
+ return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (!config.setting.primaryKey) {
- notification.warning({
- top: 92,
- message: '灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒',
- duration: 5
- })
+ return '鑿滃崟灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒'
+ } else if (charterr) {
+ return charterr
} else {
- this.setState({
- config: {...config, enabled: !config.enabled}
- })
+ return true
}
}
--
Gitblit v1.8.0