From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
index 6f957df..bd73720 100644
--- a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
@@ -3,11 +3,12 @@
* @param {object} card // 鍥捐〃瀵硅薄
*/
export function getBaseForm (card) {
+ let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
if (roleList) {
try {
roleList = JSON.parse(roleList)
- } catch {
+ } catch (e) {
roleList = []
}
} else {
@@ -58,7 +59,8 @@
initVal: card.blacklist || [],
multi: true,
required: false,
- options: roleList
+ options: roleList,
+ forbid: !!appType
}
]
}
@@ -69,6 +71,7 @@
* @param {Array} columns // 鏄剧ず鍒�
*/
export function getOptionForm (card, columns) {
+ let appType = sessionStorage.getItem('appType')
let xfields = columns.filter(item => /^Nvarchar/ig.test(item.datatype))
let yfields = columns.filter(item => /^(Int|Decimal)/ig.test(item.datatype))
@@ -153,6 +156,7 @@
initVal: card.interaction || [],
multi: true,
required: false,
+ forbid: appType === 'mob',
options: [
{ value: 'element-active', label: '鍏冪礌鑱氱劍' },
{ value: 'element-selected', label: '鍏冪礌閫変腑锛堝閫夛級' },
--
Gitblit v1.8.0