From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx | 307 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 212 insertions(+), 95 deletions(-)
diff --git a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
index d32684c..06a5266 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
@@ -1,18 +1,31 @@
-// 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 menulist = sessionStorage.getItem('fstMenuList')
+ let appType = sessionStorage.getItem('appType')
+ let isApp = appType === 'pc' || appType === 'mob'
+ let menulist = null
+ let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
+ let ispop = sessionStorage.getItem('editMenuType') === 'popview'
+
+ if (isApp) {
+ menulist = sessionStorage.getItem('appMenus')
+ } else {
+ menulist = sessionStorage.getItem('fstMenuList')
+ }
+
if (menulist) {
try {
menulist = JSON.parse(menulist)
- } catch {
+ if (isApp) {
+ menulist = menulist.map(item => {
+ item.value = item.MenuID
+ item.text = item.MenuName
+ return item
+ })
+ }
+ } catch (e) {
menulist = []
}
} else {
@@ -23,7 +36,7 @@
if (roleList) {
try {
roleList = JSON.parse(roleList)
- } catch {
+ } catch (e) {
roleList = []
}
} else {
@@ -33,24 +46,24 @@
return [
{
type: 'text',
- key: 'title',
+ field: 'title',
label: '鏍囬',
- initVal: card.title,
+ initval: card.title,
required: false
},
{
type: 'text',
- key: 'name',
+ field: 'name',
label: '缁勪欢鍚嶇О',
- initVal: card.name,
+ initval: card.name,
tooltip: '鐢ㄤ簬缁勪欢闂寸殑鍖哄垎銆�',
required: true
},
{
type: 'number',
- key: 'width',
+ field: 'width',
label: '瀹藉害',
- initVal: card.width,
+ initval: card.width,
tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
min: 1,
max: 24,
@@ -58,32 +71,71 @@
required: true
},
{
- type: 'number',
- key: 'height',
- label: '楂樺害',
- initVal: card.height,
- min: 100,
- max: 1000,
- decimal: 0,
- required: true
+ type: 'styleInput',
+ field: 'height',
+ label: '鍥捐〃楂樺害',
+ initval: card.height,
+ tooltip: '鍥捐〃缁樺浘鍖哄煙鐨勯珮搴︼紝涓嶅寘鎷爣棰樺強鍐呭杈硅窛銆�',
+ required: true,
+ options: ['px', 'vh', 'vw']
},
{
- type: 'select',
- key: 'blacklist',
- label: '榛戝悕鍗�',
- initVal: card.blacklist || [],
- multi: true,
- required: false,
- options: roleList
- },
- {
- type: 'cascader',
- key: 'linkmenu',
+ type: isApp ? 'select' : 'cascader',
+ field: 'linkmenu',
label: '鍏宠仈鑿滃崟',
- initVal: card.linkmenu || [],
- tooltip: '鍙屽嚮楗煎浘锛屼細鎵撳紑鍏宠仈鐨勮彍鍗曘��',
+ initval: card.linkmenu || (isApp ? '' : []),
+ tooltip: '鐐瑰嚮楗煎浘锛屼細鎵撳紑鍏宠仈鐨勮彍鍗曘��',
required: false,
- options: menulist
+ forbid: appType === 'mob',
+ options: menulist,
+ controlFields: [
+ {field: 'open', notNull: true },
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'open',
+ label: '鎵撳紑鏂瑰紡',
+ initval: card.open || 'blank',
+ required: false,
+ forbid: appType !== 'pc',
+ options: [
+ { value: 'blank', label: '鏂扮獥鍙�' },
+ { value: 'self', label: '褰撳墠绐楀彛' }
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'permission',
+ label: '鏉冮檺楠岃瘉',
+ initval: card.permission || 'false',
+ required: false,
+ options: [
+ {value: 'true', label: '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
+ ],
+ forbid: !appType || ispop || isprint
+ },
+ {
+ type: 'radio',
+ field: 'cacheLocal',
+ label: '鏈湴缂撳瓨',
+ initval: card.cacheLocal || 'true',
+ required: false,
+ options: [
+ {value: 'true', label: '缁ф壙鑿滃崟'},
+ {value: 'false', label: '绂佺敤'},
+ ],
+ forbid: ispop || isprint
+ },
+ {
+ type: 'multiselect',
+ field: 'blacklist',
+ label: '榛戝悕鍗�',
+ initval: card.blacklist || [],
+ required: false,
+ options: roleList,
+ forbid: !!appType || isprint
}
]
}
@@ -93,43 +145,61 @@
* @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))
return [
{
type: 'radio',
- key: 'shape',
+ field: 'shape',
label: '褰㈢姸',
- initVal: card.shape || 'pie',
+ initval: card.shape || 'pie',
required: false,
options: [
- { value: 'pie', text: '楗煎浘' },
- { value: 'ring', text: '鐜浘' },
- { value: 'nightingale', text: '鍗椾竵鏍煎皵鍥�' }
+ { value: 'pie', label: '楗煎浘' },
+ { value: 'ring', label: '鐜浘' },
+ { value: 'nest', label: '宓屽' }
+ ],
+ controlFields: [
+ {field: 'type', values: ['nest']},
+ {field: 'legend', values: ['pie', 'ring']},
+ {field: 'show', values: ['pie', 'ring']},
+ {field: 'splitLine', values: ['pie', 'ring']},
+ {field: 'splitColor', values: ['pie', 'ring']},
+ {field: 'innerRadius', values: ['nest', 'ring']},
]
},
{
type: 'select',
- key: 'Xaxis',
- label: 'X-杞�',
- initVal: card.Xaxis || '',
+ field: 'Xaxis',
+ label: '鍚嶇О',
+ initval: card.Xaxis || '',
required: true,
options: xfields
},
{
type: 'select',
- key: 'Yaxis',
- label: 'Y-杞�',
- initVal: card.Yaxis || '',
+ field: 'Yaxis',
+ label: '鍊�',
+ initval: card.Yaxis || '',
required: true,
options: yfields
},
{
type: 'select',
- key: 'legend',
+ field: 'type',
+ label: '绫诲瀷',
+ initval: card.type || '',
+ tooltip: '鍐呯幆鐨勫垎绫诲瓧娈点��',
+ required: true,
+ options: xfields,
+ },
+ {
+ type: 'select',
+ field: 'legend',
label: '鍥句緥浣嶇疆',
- initVal: card.legend || 'bottom',
+ initval: card.legend || 'bottom',
required: false,
options: [
{ field: 'bottom', label: '涓�' },
@@ -145,13 +215,13 @@
{ field: 'left-top', label: '宸︿笂' },
{ field: 'left-bottom', label: '宸︿笅' },
{ field: 'hidden', label: '闅愯棌' }
- ]
+ ],
},
{
type: 'number',
- key: 'radius',
+ field: 'radius',
label: '澶栫幆',
- initVal: card.radius || 75,
+ initval: card.radius || 75,
tooltip: '鍥惧舰鎵�鍗犲尯鍩熺殑鐧惧垎鐜囥��',
min: 30,
max: 100,
@@ -160,90 +230,137 @@
},
{
type: 'number',
- key: 'innerRadius',
+ field: 'innerRadius',
label: '鍐呯幆',
- initVal: card.innerRadius || 0,
+ initval: card.innerRadius || 0,
tooltip: '鍐呴儴绌虹櫧鍖哄煙鍗犲浘褰㈢殑鐧惧垎鐜囥��',
min: 0,
max: 90,
decimal: 0,
- hidden: !card.shape || card.shape === 'pie',
required: true
},
{
type: 'radio',
- key: 'tooltip',
+ field: 'tooltip',
label: '鎮诞鎻愮ず',
- initVal: card.tooltip || 'true',
+ initval: card.tooltip || 'true',
required: false,
options: [{
value: 'true',
- text: '鏄剧ず'
+ label: '鏄剧ず'
}, {
value: 'false',
- text: '闅愯棌'
+ label: '闅愯棌'
}]
},
{
type: 'radio',
- key: 'show',
+ field: 'show',
label: '鏍煎紡鍖�',
- initVal: card.show || 'value',
+ initval: card.show || 'value',
required: false,
options: [{
value: 'value',
- text: '鏃�'
+ label: '鏃�'
}, {
value: 'percent',
- text: '鐧惧垎姣�'
+ label: '鐧惧垎姣�'
}]
},
{
type: 'radio',
- key: 'label',
- label: '鏍囨敞鍊�',
- initVal: card.label || 'false',
+ field: 'label',
+ label: '鏍囨敞',
+ initval: card.label || 'false',
required: false,
options: [{
value: 'false',
- text: '闅愯棌'
+ label: '闅愯棌'
}, {
value: 'inner',
- text: '鍐呬晶'
+ label: '鍐呬晶'
+ }, {
+ value: 'normal',
+ label: '澶栦晶'
}, {
value: 'outer',
- text: '澶栦晶'
- }]
+ label: '铚樿洓'
+ }],
+ // }, {
+ // type: 'radio',
+ // field: 'download',
+ // label: '瀵煎嚭鍥剧墖',
+ // initval: card.download || 'forbid',
+ // required: false,
+ // forbid: appType === 'mob',
+ // options: [{
+ // value: 'forbid',
+ // label: '绂佺敤'
+ // }, {
+ // value: 'enable',
+ // label: '鍚敤'
+ // }]
}, {
type: 'radio',
- key: 'repeat',
- label: '閲嶅鏁版嵁',
- initVal: card.repeat || 'unrepeat',
+ field: 'empty',
+ label: '绌哄�奸殣钘�',
+ initval: card.empty || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- options: [{
- value: 'unrepeat',
- text: '鍘婚噸'
- }, {
- value: 'average',
- text: '骞冲潎'
- }, {
- value: 'cumsum',
- text: '绱姞'
- }]
+ options: [
+ {value: 'show', label: '鍚�'},
+ {value: 'hidden', label: '鏄�'},
+ ],
+ }, {
+ type: 'number',
+ field: 'splitLine',
+ label: '鍒嗛殧绾�',
+ initval: card.splitLine || '',
+ tooltip: '鍒嗛殧绾跨殑瀹藉害銆�',
+ min: 0,
+ max: 20,
+ decimal: 0,
+ required: false,
+ controlFields: [
+ {field: 'splitColor', notNull: true}
+ ]
}, {
type: 'color',
- key: 'color',
- label: '鑹茬郴',
- initVal: card.color || 'rgba(0, 0, 0, 0.85)',
- tooltip: '鍧愭爣杞村強绀轰緥绛夋彁绀烘枃瀛椾娇鐢ㄧ殑棰滆壊銆�',
- required: false,
- options: [{
- value: 'black',
- text: '榛戣壊'
- }, {
- value: 'white',
- text: '鐧借壊'
- }]
+ field: 'splitColor',
+ label: '鍒嗛殧鑹�',
+ initval: card.splitColor || '#ffffff',
+ tooltip: '鍒嗛殧绾跨殑棰滆壊銆�',
+ allowClear: true,
+ required: false
+ // }, {
+ // type: 'color',
+ // field: 'color',
+ // label: '鑹茬郴',
+ // initval: card.color || 'rgba(0, 0, 0, 0.85)',
+ // tooltip: '绀轰緥绛夋彁绀烘枃瀛椾娇鐢ㄧ殑棰滆壊銆�',
+ // required: false
+ // } , {
+ // type: 'select',
+ // field: '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