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-scatter/chartcompile/formconfig.jsx | 151 +++++++++++++++++++++-----------------------------
1 files changed, 64 insertions(+), 87 deletions(-)
diff --git a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
index 79b4f14..66afe79 100644
--- a/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-scatter/chartcompile/formconfig.jsx
@@ -5,6 +5,8 @@
export function getBaseForm (card) {
let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
+ let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
+ let ispop = sessionStorage.getItem('editMenuType') === 'popview'
if (roleList) {
try {
roleList = JSON.parse(roleList)
@@ -18,24 +20,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,
@@ -43,36 +45,46 @@
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: 'radio',
- key: 'permission',
+ field: 'permission',
label: '鏉冮檺楠岃瘉',
- initVal: card.permission || 'false',
+ initval: card.permission || 'false',
required: false,
options: [
- {value: 'true', text: '鍚敤'},
- {value: 'false', text: '绂佺敤'},
+ {value: 'true', label: '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
],
- forbid: !appType
+ forbid: !appType || ispop || isprint
},
{
- type: 'select',
- key: 'blacklist',
+ 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 || [],
- multi: true,
+ initval: card.blacklist || [],
required: false,
options: roleList,
- forbid: !!appType
+ forbid: !!appType || isprint
}
]
}
@@ -83,132 +95,97 @@
* @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))
return [
{
type: 'select',
- key: 'gender',
+ field: 'gender',
label: '绫诲瀷',
- initVal: card.gender || '',
+ initval: card.gender || '',
required: true,
options: xfields
},
{
type: 'select',
- key: 'Xaxis',
+ field: 'Xaxis',
label: 'X-杞�',
- initVal: card.Xaxis || '',
+ initval: card.Xaxis || '',
required: true,
options: columns
},
{
type: 'select',
- key: 'Yaxis',
+ field: 'Yaxis',
label: 'Y-杞�',
- initVal: card.Yaxis || '',
+ initval: card.Yaxis || '',
required: true,
options: yfields
},
{
type: 'radio',
- key: 'shape',
+ field: 'shape',
label: '褰㈢姸',
- initVal: card.shape || 'circle',
+ initval: card.shape || 'circle',
required: false,
options: [{
value: 'circle',
- text: 'circle'
+ label: '鍦嗗舰'
}, {
value: 'square',
- text: 'square'
+ label: '鏂瑰舰'
}]
},
{
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: '闅愯棌'
- }]
- }, {
- type: 'radio',
- key: 'download',
- label: '瀵煎嚭鍥剧墖',
- initVal: card.download || 'forbid',
- required: false,
- forbid: appType === 'mob',
- options: [{
- value: 'forbid',
- text: '绂佺敤'
- }, {
- value: 'enable',
- text: '鍚敤'
+ label: '闅愯棌'
}]
},
{
type: 'radio',
- key: 'empty',
+ field: 'empty',
label: '绌哄�奸殣钘�',
- initVal: card.empty || 'show',
+ initval: card.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
options: [
- {value: 'show', text: '鍚�'},
- {value: 'hidden', text: '鏄�'},
+ {value: 'show', label: '鍚�'},
+ {value: 'hidden', label: '鏄�'},
],
},
{
type: 'text',
- key: 'Xunit',
+ field: 'Xunit',
label: 'X杞村崟浣�',
- initVal: card.Xunit || '',
+ initval: card.Xunit || '',
required: false
},
{
type: 'text',
- key: 'Yunit',
+ field: 'Yunit',
label: 'Y杞村崟浣�',
- initVal: card.Yunit || '',
+ initval: card.Yunit || '',
required: false
},
{
type: 'color',
- key: 'color',
- label: '鑹茬郴',
- initVal: card.color || 'rgba(0, 0, 0, 0.65)',
- tooltip: '鍧愭爣杞存彁绀烘枃瀛楀強绀轰緥鐨勯鑹层��',
+ field: 'lineColor',
+ label: '鍧愭爣杞撮鑹�',
+ initval: card.lineColor || '',
+ tooltip: '鍧愭爣杞寸嚎鐨勯鑹层��',
+ allowClear: true,
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