From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx | 135 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 112 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
index 107b8b7..fbdeeee 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
@@ -1,14 +1,10 @@
-// import zhCN from '@/locales/zh-CN/model.js'
-// import enUS from '@/locales/en-US/model.js'
-
-// const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
-
/**
* @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟
* @param {object} card // 鍥捐〃瀵硅薄
*/
export function getBaseForm (card) {
- let isApp = sessionStorage.getItem('appType') === 'pc'
+ let appType = sessionStorage.getItem('appType')
+ let isApp = appType === 'pc' || appType === 'mob'
let menulist = null
if (isApp) {
@@ -27,7 +23,7 @@
return item
})
}
- } catch {
+ } catch (e) {
menulist = []
}
} else {
@@ -38,7 +34,7 @@
if (roleList) {
try {
roleList = JSON.parse(roleList)
- } catch {
+ } catch (e) {
roleList = []
}
} else {
@@ -83,15 +79,6 @@
required: true
},
{
- type: 'select',
- key: 'blacklist',
- label: '榛戝悕鍗�',
- initVal: card.blacklist || [],
- multi: true,
- required: false,
- options: roleList
- },
- {
type: 'cascader',
key: 'linkmenu',
label: '鍏宠仈鑿滃崟',
@@ -122,6 +109,28 @@
{ value: 'blank', text: '鏂扮獥鍙�' },
{ value: 'self', text: '褰撳墠绐楀彛' }
]
+ },
+ {
+ type: 'radio',
+ key: 'permission',
+ label: '鏉冮檺楠岃瘉',
+ initVal: card.permission || 'false',
+ required: false,
+ options: [
+ {value: 'true', text: '鍚敤'},
+ {value: 'false', text: '绂佺敤'},
+ ],
+ forbid: !appType
+ },
+ {
+ type: 'select',
+ key: 'blacklist',
+ label: '榛戝悕鍗�',
+ initVal: card.blacklist || [],
+ multi: true,
+ required: false,
+ options: roleList,
+ forbid: !!appType
}
]
}
@@ -131,6 +140,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))
@@ -144,13 +154,14 @@
options: [
{ value: 'pie', text: '楗煎浘' },
{ value: 'ring', text: '鐜浘' },
+ { value: 'nest', text: '宓屽' },
{ value: 'nightingale', text: '鍗椾竵鏍煎皵鍥�' }
]
},
{
type: 'select',
key: 'Xaxis',
- label: 'X-杞�',
+ label: '鍚嶇О',
initVal: card.Xaxis || '',
required: true,
options: xfields
@@ -158,10 +169,20 @@
{
type: 'select',
key: 'Yaxis',
- label: 'Y-杞�',
+ label: '鍊�',
initVal: card.Yaxis || '',
required: true,
options: yfields
+ },
+ {
+ type: 'select',
+ key: 'type',
+ label: '绫诲瀷',
+ initVal: card.type || '',
+ tooltip: '鍐呯幆鐨勫垎绫诲瓧娈点��',
+ required: true,
+ options: xfields,
+ hidden: card.shape !== 'nest',
},
{
type: 'select',
@@ -183,7 +204,8 @@
{ field: 'left-top', label: '宸︿笂' },
{ field: 'left-bottom', label: '宸︿笅' },
{ field: 'hidden', label: '闅愯棌' }
- ]
+ ],
+ hidden: card.shape === 'nest',
},
{
type: 'number',
@@ -239,7 +261,7 @@
{
type: 'radio',
key: 'label',
- label: '鏍囨敞鍊�',
+ label: '鏍囨敞',
initVal: card.label || 'false',
required: false,
options: [{
@@ -250,8 +272,11 @@
text: '鍐呬晶'
}, {
value: 'outer',
- text: '澶栦晶'
- }]
+ text: '铚樿洓'
+ }, {
+ value: 'normal',
+ text: '甯歌'
+ }],
}, {
type: 'radio',
key: 'repeat',
@@ -269,12 +294,76 @@
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: 'empty',
+ label: '绌哄�奸殣钘�',
+ initVal: card.empty || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+ required: false,
+ options: [
+ {value: 'show', text: '鍚�'},
+ {value: 'hidden', text: '鏄�'},
+ ],
+ }, {
+ type: 'number',
+ key: 'splitLine',
+ label: '鍒嗛殧绾�',
+ initVal: card.splitLine || '',
+ tooltip: '鍒嗛殧绾跨殑瀹藉害銆�',
+ min: 0,
+ max: 20,
+ decimal: 0,
+ required: false
+ }, {
+ type: 'color',
+ key: 'splitColor',
+ label: '鍒嗛殧鑹�',
+ initVal: card.splitColor || '#ffffff',
+ tooltip: '鍒嗛殧绾跨殑棰滆壊锛屽瓨鍦ㄥ垎闅旂嚎鏃舵湁鏁堛��',
+ required: false
+ }, {
type: 'color',
key: 'color',
label: '鑹茬郴',
initVal: card.color || 'rgba(0, 0, 0, 0.85)',
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: '閫夋杩囨护' },
+ ]
}
]
}
--
Gitblit v1.8.0