From 6e106eb13ce404d9955d6c9045d21050d3e08294 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 20 十一月 2020 11:19:36 +0800
Subject: [PATCH] 2020-11-20
---
src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx | 60 +++++++-----------------------------------------------------
1 files changed, 7 insertions(+), 53 deletions(-)
diff --git a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
index 5379e71..ccb8b2b 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
@@ -8,48 +8,11 @@
* @param {object} card // 鍥捐〃瀵硅薄
* @param {Array} columns // 鏄剧ず鍒�
*/
-export function getPieChartOptionForm (card, columns, sysRoles = [], MenuType) {
+export function getOptionForm (card, columns) {
let xfields = columns.filter(item => /^Nvarchar/ig.test(item.datatype))
let yfields = columns.filter(item => /^(Int|Decimal)/ig.test(item.datatype))
- let _sysRoles = sysRoles.map(item => ({...item, field: item.value, label: item.text}))
return [
- {
- type: 'text',
- key: 'title',
- label: '鏍囬',
- initVal: card.title,
- required: false
- },
- {
- type: 'text',
- key: 'name',
- label: '缁勪欢鍚嶇О',
- initVal: card.name,
- tooltip: '鐢ㄤ簬缁勪欢闂寸殑鍖哄垎銆�',
- required: true
- },
- {
- type: 'number',
- key: 'width',
- label: '瀹藉害',
- initVal: card.width,
- tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
- min: 1,
- max: 24,
- decimal: 0,
- required: true
- },
- {
- type: 'number',
- key: 'height',
- label: '楂樺害',
- initVal: card.height,
- min: 100,
- max: 1000,
- decimal: 0,
- required: true
- },
{
type: 'radio',
key: 'shape',
@@ -126,7 +89,7 @@
{
type: 'radio',
key: 'tooltip',
- label: '鎻愮ず淇℃伅',
+ label: '鎮诞鎻愮ず',
initVal: card.tooltip || 'true',
required: false,
options: [{
@@ -140,21 +103,21 @@
{
type: 'radio',
key: 'show',
- label: '鏄剧ず鍊�',
+ label: '鏍煎紡鍖�',
initVal: card.show || 'value',
required: false,
options: [{
+ value: 'value',
+ text: '鏃�'
+ }, {
value: 'percent',
text: '鐧惧垎姣�'
- }, {
- value: 'value',
- text: '鏁板��'
}]
},
{
type: 'radio',
key: 'label',
- label: '鏍囨敞',
+ label: '鏍囨敞鍊�',
initVal: card.label || 'false',
required: false,
options: [{
@@ -197,15 +160,6 @@
value: 'white',
text: '鐧借壊'
}]
- }, {
- type: 'select',
- key: 'blacklist',
- label: '榛戝悕鍗�',
- initVal: card.blacklist || [],
- multi: true,
- required: false,
- forbid: MenuType === 'billPrint',
- options: _sysRoles
}
]
}
--
Gitblit v1.8.0