From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 02 六月 2021 17:15:21 +0800 Subject: [PATCH] 2021-06-02 --- src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx index 8a248f0..107b8b7 100644 --- a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx +++ b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx @@ -1,18 +1,32 @@ // import zhCN from '@/locales/zh-CN/model.js' // import enUS from '@/locales/en-US/model.js' -// const Formdict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS +// const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS /** * @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟 * @param {object} card // 鍥捐〃瀵硅薄 - * @param {Array} MenuType // 鑿滃崟绫诲瀷 */ -export function getBaseForm (card, MenuType) { - let menulist = sessionStorage.getItem('fstMenuList') +export function getBaseForm (card) { + let isApp = sessionStorage.getItem('appType') === 'pc' + let menulist = null + + if (isApp) { + menulist = sessionStorage.getItem('appMenus') + } else { + menulist = sessionStorage.getItem('fstMenuList') + } + if (menulist) { try { menulist = JSON.parse(menulist) + if (isApp) { + menulist = menulist.map(item => { + item.value = item.MenuID + item.text = item.MenuName + return item + }) + } } catch { menulist = [] } @@ -75,7 +89,6 @@ initVal: card.blacklist || [], multi: true, required: false, - forbid: MenuType === 'billPrint', options: roleList }, { @@ -85,8 +98,30 @@ initVal: card.linkmenu || [], tooltip: '鍙屽嚮楗煎浘锛屼細鎵撳紑鍏宠仈鐨勮彍鍗曘��', required: false, - forbid: MenuType === 'billPrint', + forbid: isApp, options: menulist + }, + { + type: 'select', + key: 'linkmenu', + label: '鍏宠仈鑿滃崟', + initVal: card.linkmenu || '', + tooltip: '鍙屽嚮楗煎浘锛屼細鎵撳紑鍏宠仈鐨勮彍鍗曘��', + required: false, + forbid: !isApp, + options: menulist + }, + { + type: 'radio', + key: 'open', + label: '鎵撳紑鏂瑰紡', + initVal: card.open || 'blank', + required: false, + forbid: !isApp, + options: [ + { value: 'blank', text: '鏂扮獥鍙�' }, + { value: 'self', text: '褰撳墠绐楀彛' } + ] } ] } @@ -239,14 +274,7 @@ label: '鑹茬郴', initVal: card.color || 'rgba(0, 0, 0, 0.85)', tooltip: '鍧愭爣杞村強绀轰緥绛夋彁绀烘枃瀛椾娇鐢ㄧ殑棰滆壊銆�', - required: false, - options: [{ - value: 'black', - text: '榛戣壊' - }, { - value: 'white', - text: '鐧借壊' - }] + required: false } ] } -- Gitblit v1.8.0