From eed5279d84fd59bc32f060a31b4006590cee4320 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 一月 2024 17:01:59 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
index f8eaadf..bf6ed7b 100644
--- a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
@@ -96,7 +96,7 @@
* @param {Array} columns // 鏄剧ず鍒�
*/
export function getOptionForm (card, columns) {
- let appType = sessionStorage.getItem('appType')
+ // 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))
@@ -152,20 +152,20 @@
value: 'false',
text: '闅愯棌'
}]
- }, {
- type: 'radio',
- key: 'download',
- label: '瀵煎嚭鍥剧墖',
- initVal: card.download || 'forbid',
- required: false,
- forbid: appType === 'mob',
- options: [{
- value: 'forbid',
- text: '绂佺敤'
- }, {
- value: 'enable',
- text: '鍚敤'
- }]
+ // }, {
+ // type: 'radio',
+ // key: 'download',
+ // label: '瀵煎嚭鍥剧墖',
+ // initVal: card.download || 'forbid',
+ // required: false,
+ // forbid: appType === 'mob',
+ // options: [{
+ // value: 'forbid',
+ // text: '绂佺敤'
+ // }, {
+ // value: 'enable',
+ // text: '鍚敤'
+ // }]
},
{
type: 'radio',
@@ -200,28 +200,29 @@
initVal: card.color || 'rgba(0, 0, 0, 0.65)',
tooltip: '鍧愭爣杞存彁绀烘枃瀛楀強绀轰緥鐨勯鑹层��',
required: false
- }, {
- type: 'select',
- key: 'interaction',
- label: '浜や簰鏁堟灉',
- initVal: card.interaction || [],
- multi: true,
- required: false,
- forbid: appType === 'mob',
- options: [
- { value: 'element-active', label: '鍏冪礌鑱氱劍' },
- { value: 'element-selected', label: '鍏冪礌閫変腑锛堝閫夛級' },
- { value: 'element-single-selected', label: '鍏冪礌閫変腑锛堝崟閫夛級' },
- // { value: 'active-region', label: '鑳屾櫙妗�' },
- { value: 'view-zoom', label: '瑙嗗浘缂╂斁' },
- { value: 'element-highlight', label: '鍏冪礌楂樹寒' },
- { value: 'element-highlight-by-color', label: '鍚岃壊鍏冪礌楂樹寒' },
- { value: 'element-highlight-by-x', label: '鍚孹杞村厓绱犻珮浜�' },
- { value: 'legend-filter', label: '鍥句緥杩囨护' },
- { value: 'legend-active', label: '鍥句緥鑱氱劍' },
- { value: 'legend-highlight', label: '鍥句緥楂樹寒' },
- { value: 'brush', label: '閫夋杩囨护' },
- ]
}
+ // , {
+ // type: 'select',
+ // key: 'interaction',
+ // label: '浜や簰鏁堟灉',
+ // initVal: card.interaction || [],
+ // multi: true,
+ // required: false,
+ // forbid: appType === 'mob',
+ // options: [
+ // { value: 'element-active', label: '鍏冪礌鑱氱劍' },
+ // { value: 'element-selected', label: '鍏冪礌閫変腑锛堝閫夛級' },
+ // { value: 'element-single-selected', label: '鍏冪礌閫変腑锛堝崟閫夛級' },
+ // // { value: 'active-region', label: '鑳屾櫙妗�' },
+ // { value: 'view-zoom', label: '瑙嗗浘缂╂斁' },
+ // { value: 'element-highlight', label: '鍏冪礌楂樹寒' },
+ // { value: 'element-highlight-by-color', label: '鍚岃壊鍏冪礌楂樹寒' },
+ // { value: 'element-highlight-by-x', label: '鍚孹杞村厓绱犻珮浜�' },
+ // { value: 'legend-filter', label: '鍥句緥杩囨护' },
+ // { value: 'legend-active', label: '鍥句緥鑱氱劍' },
+ // { value: 'legend-highlight', label: '鍥句緥楂樹寒' },
+ // { value: 'brush', label: '閫夋杩囨护' },
+ // ]
+ // }
]
}
--
Gitblit v1.8.0