From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx | 188 ++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 49 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
index e88e500..784141f 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
@@ -7,7 +7,7 @@
* @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟
* @param {object} card // 鍥捐〃瀵硅薄
*/
-export function getBaseForm (card) {
+export function getBaseForm (card, columns = []) {
let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
if (roleList) {
@@ -18,6 +18,32 @@
}
} else {
roleList = []
+ }
+
+ let menulist = []
+
+ if (appType === 'pc') {
+ menulist = sessionStorage.getItem('appMenus')
+ if (menulist) {
+ try {
+ menulist = JSON.parse(menulist)
+ } catch (e) {
+ menulist = []
+ }
+ } else {
+ menulist = []
+ }
+ } else if (appType === '') {
+ menulist = sessionStorage.getItem('fstMenuList')
+ if (menulist) {
+ try {
+ menulist = JSON.parse(menulist)
+ } catch (e) {
+ menulist = []
+ }
+ } else {
+ menulist = []
+ }
}
return [
@@ -79,38 +105,100 @@
options: roleList,
forbid: !!appType
},
- // {
- // type: 'cascader',
- // key: 'linkmenu',
- // label: '鍏宠仈鑿滃崟',
- // initVal: card.linkmenu || [],
- // tooltip: '鍦ㄤ娇鐢ㄦ煴褰㈠浘涓旀湭鍚敤鑷畾涔夎缃椂鏈夋晥銆�',
- // required: false,
- // forbid: appType === 'pc' || appType === 'mob',
- // options: menulist
- // },
- // {
- // type: 'select',
- // key: 'linkmenu',
- // label: '鍏宠仈鑿滃崟',
- // initVal: card.linkmenu || '',
- // tooltip: '鍙屽嚮鏌辩姸鍥撅紝浼氭墦寮�鍏宠仈鐨勮彍鍗曘��',
- // required: false,
- // forbid: appType !== 'pc',
- // options: menulist
- // },
- // {
- // type: 'radio',
- // key: 'open',
- // label: '鎵撳紑鏂瑰紡',
- // initVal: card.open || 'blank',
- // required: false,
- // forbid: appType !== 'pc',
- // options: [
- // { value: 'blank', text: '鏂扮獥鍙�' },
- // { value: 'self', text: '褰撳墠绐楀彛' }
- // ]
- // }
+ {
+ type: 'radio',
+ key: 'click',
+ label: '鐐瑰嚮浜嬩欢',
+ initVal: card.click || '',
+ tooltip: '褰撶粦瀹氱偣鍑讳簨浠舵椂锛屾煴褰㈠浘鐨勫垏鎹㈠姛鑳藉皢澶辨晥銆�',
+ required: false,
+ forbid: appType === 'mob' || card.chartType !== 'bar',
+ options: [
+ {value: '', label: '鏃�'},
+ {value: 'menu', label: '鑿滃崟'},
+ {value: 'menus', label: '鑿滃崟缁�'}
+ ]
+ },
+ {
+ type: appType === '' ? 'cascader' : 'select',
+ key: 'menu',
+ label: '鍏宠仈鑿滃崟',
+ initVal: card.menu || (appType === '' ? [] : ''),
+ tooltip: '鍦ㄤ娇鐢ㄦ煴褰㈠浘涓旀湭鍚敤鑷畾涔夎缃椂鏈夋晥銆�',
+ required: true,
+ forbid: appType === 'mob' || card.chartType !== 'bar',
+ hidden: card.click !== 'menu',
+ options: menulist
+ },
+ {
+ type: 'select',
+ key: 'menuType',
+ label: '鑿滃崟绫诲瀷',
+ initVal: card.menuType || '',
+ required: true,
+ forbid: appType === 'mob' || card.chartType !== 'bar',
+ hidden: card.click !== 'menus',
+ options: columns,
+ },
+ {
+ type: 'radio',
+ key: 'open',
+ label: '鎵撳紑鏂瑰紡',
+ initVal: card.open || 'blank',
+ required: false,
+ options: [
+ {value: 'blank', label: '鏂扮獥鍙�'},
+ {value: 'self', label: '褰撳墠绐楀彛'},
+ ],
+ forbid: appType !== 'pc' || card.chartType !== 'bar',
+ hidden: card.click !== 'menu' && card.click !== 'menus'
+ },
+ {
+ type: 'radio',
+ key: 'joint',
+ label: '鍙傛暟鎷兼帴',
+ initVal: card.joint || 'true',
+ required: false,
+ options: [
+ {value: 'true', label: '鏄�'},
+ {value: 'false', label: '鍚�'},
+ ],
+ forbid: appType === 'mob' || card.chartType !== 'bar',
+ hidden: card.click !== 'menu' && card.click !== 'menus'
+ },
+ {
+ type: 'table',
+ key: 'menus',
+ label: '鑿滃崟缁�',
+ initVal: card.menus || [],
+ required: true,
+ span: 24,
+ actions: ['view'],
+ forbid: appType === 'mob' || card.chartType !== 'bar',
+ hidden: card.click !== 'menus',
+ columns: [
+ {
+ title: '鏍囪瘑',
+ dataIndex: 'sign',
+ inputType: 'input',
+ editable: true,
+ unique: true,
+ required: false,
+ width: '35%'
+ },
+ {
+ title: '鑿滃崟',
+ dataIndex: 'menu',
+ inputType: !appType ? 'cascader' : 'select',
+ editable: true,
+ required: true,
+ extends: !appType ? 'Menu' : [{key: 'label', value: 'label'}],
+ width: '35%',
+ render: (text, record) => record.label,
+ options: menulist
+ }
+ ]
+ }
]
}
@@ -125,23 +213,23 @@
if (card.chartType === 'line') {
shapes = [
- { field: 'smooth', label: 'smooth' },
- { field: 'line', label: 'line' },
- { field: 'dot', label: 'dot' },
- { field: 'dash', label: 'dash' },
- { field: 'hv', label: 'hv' },
- { field: 'vh', label: 'vh' },
- { field: 'hvh', label: 'hvh' },
- { field: 'vhv', label: 'vhv' }
+ { field: 'smooth', label: 'smooth锛堝钩婊戠嚎锛�' },
+ { field: 'line', label: 'line锛堢洿绾匡級' },
+ { field: 'dot', label: 'dot锛堢偣鐘剁嚎锛�' },
+ { field: 'dash', label: 'dash锛堣櫄绾匡級' },
+ { field: 'hv', label: 'hv锛堟按骞�-鍨傜洿绾匡級' },
+ { field: 'vh', label: 'vh锛堝瀭鐩�-姘村钩绾匡級' },
+ { field: 'hvh', label: 'hvh锛堟按骞�-鍨傜洿-姘村钩绾匡級' },
+ { field: 'vhv', label: 'vhv锛堝瀭鐩�-姘村钩-鍨傜洿绾匡級' }
]
} else if (card.chartType === 'bar') {
shapes = [
- { field: 'rect', label: 'rect' },
- { field: 'hollow-rect', label: 'hollow-rect' },
- { field: 'line', label: 'line' },
- { field: 'tick', label: 'tick' },
- { field: 'funnel', label: 'funnel' },
- { field: 'pyramid', label: 'pyramid' }
+ { field: 'rect', label: 'rect锛堢煩褰級' },
+ { field: 'hollow-rect', label: 'hollow-rect锛堢┖蹇冪煩褰級' },
+ { field: 'line', label: 'line锛堢嚎鏉★級' },
+ { field: 'tick', label: 'tick锛堟尝鍔級' },
+ // { field: 'funnel', label: 'funnel' },
+ { field: 'pyramid', label: 'pyramid锛堣閿ワ級' }
]
}
@@ -288,6 +376,7 @@
key: 'show',
label: '鏄剧ず',
initVal: card.show || 'value',
+ tooltip: '褰撲娇鐢ㄨ嚜瀹氫箟璁剧疆鏃讹紝鍙湪鏄剧ず锛堝��/%锛夊鍗曠嫭璁剧疆鏄剧ず绫诲瀷銆傛敞锛氳嚜瀹氫箟涓虹┖鏃朵娇鐢ㄦ澶勮缃��',
required: false,
options: [{
value: 'value',
@@ -299,14 +388,15 @@
}, {
type: labelOptions.length > 20 ? 'select' : 'radio',
key: 'label',
- label: '鏍囩',
+ label: '鏍囨敞',
initVal: card.label || 'false',
+ tooltip: '鍥惧舰鑺傜偣澶勭殑鏁板�笺��',
required: false,
options: labelOptions
}, {
type: 'radio',
key: 'labelColor',
- label: '鏍囩棰滆壊',
+ label: '鏍囨敞棰滆壊',
initVal: card.labelColor || 'system',
tooltip: '浣跨敤绯荤粺鑹叉椂锛屼娇鐢ㄨ壊绯婚�夐」璁剧疆鐨勭郴缁熼鑹诧紝浣跨敤鑷畾涔変负棰滆壊璁剧疆涓畾涔夌殑鍥惧舰棰滆壊銆�',
required: false,
--
Gitblit v1.8.0