From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 16 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index 4126c3c..a703766 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -1,23 +1,41 @@
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} menulist // 鑿滃崟鍒楄〃-鐢ㄤ簬瀛楁閫忚
*/
-export function getColumnForm (card, menulist = [], fields = []) {
+export function getColumnForm (card, fields = []) {
+ let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
if (roleList) {
try {
roleList = JSON.parse(roleList)
- } catch {
+ } catch (e) {
roleList = []
}
} else {
roleList = []
+ }
+
+ let menulist = []
+
+ if (appType === 'pc') {
+ menulist = sessionStorage.getItem('appMenus')
+ } else if (!appType) {
+ menulist = sessionStorage.getItem('fstMenuList')
+ }
+
+ if (menulist) {
+ try {
+ menulist = JSON.parse(menulist)
+ } catch (e) {
+ menulist = []
+ }
+ } else {
+ menulist = []
}
let options = [{
@@ -41,6 +59,12 @@
}, {
value: 'colspan',
text: '鍚堝苟鍒�'
+ }, {
+ value: 'formula',
+ text: '鍏紡'
+ }, {
+ value: 'index',
+ text: '搴忓彿'
}]
if (!card.isSub) {
@@ -48,6 +72,10 @@
value: 'action',
text: '鎿嶄綔'
})
+ }
+
+ if (!card.linkurl && (!card.linkmenu || card.linkmenu.length === 0)) {
+ card.perspective = ''
}
return [
@@ -239,21 +267,32 @@
key: 'postfix',
label: Formdict['header.form.postfix'],
initVal: card.postfix || '',
- tooltipClass: 'middle',
required: false,
readonly: false
},
{
- type: 'radio',
+ type: 'select',
key: 'lenWidRadio',
label: '闀垮姣�',
initVal: card.lenWidRadio || '1:1',
required: true,
options: [
{ value: '1:1', text: '1:1' },
- { value: '3:2', text: '3:2' },
{ value: '4:3', text: '4:3' },
- { value: '16:9', text: '16:9' }
+ { value: '3:2', text: '3:2' },
+ { value: '16:9', text: '16:9' },
+ { value: '2:1', text: '2:1' },
+ { value: '3:1', text: '3:1' },
+ { value: '4:1', text: '4:1' },
+ { value: '5:1', text: '5:1' },
+ { value: '6:1', text: '6:1' },
+ { value: '7:1', text: '7:1' },
+ { value: '8:1', text: '8:1' },
+ { value: '9:1', text: '9:1' },
+ { value: '10:1', text: '10:1' },
+ { value: '3:4', text: '3:4' },
+ { value: '2:3', text: '2:3' },
+ { value: '9:16', text: '9:16' },
]
},
{
@@ -295,29 +334,77 @@
type: 'radio',
key: 'perspective',
label: '瀛楁閫忚',
- initVal: card.perspective || 'linkmenu',
+ initVal: card.perspective || '',
options: [{
+ value: '',
+ text: '鏃�'
+ }, {
value: 'linkmenu',
text: '鑿滃崟'
}, {
value: 'linkurl',
text: '閾炬帴'
- }]
+ }],
+ forbidden: appType === 'mob'
},
{
- type: 'cascader',
+ type: appType === 'pc' ? 'select' : 'cascader',
key: 'linkmenu',
label: Formdict['model.menu'],
- initVal: card.linkmenu || [],
- required: false,
- options: menulist
+ initVal: card.linkmenu || (appType === 'pc' ? '' : []),
+ required: true,
+ options: menulist,
+ forbidden: appType === 'mob'
},
{
- type: 'text',
+ type: 'textarea',
key: 'linkurl',
label: '閾炬帴鍦板潃',
initVal: card.linkurl || '',
- required: false
+ required: true,
+ forbidden: appType === 'mob'
+ },
+ {
+ type: 'multiselect',
+ key: 'linkfields',
+ label: '鍏宠仈瀛楁',
+ initVal: card.linkfields || [],
+ required: false,
+ options: fields,
+ forbidden: appType === 'mob'
+ },
+ {
+ type: 'radio',
+ key: 'open',
+ label: '鎵撳紑鏂瑰紡',
+ initVal: card.open || 'blank',
+ required: false,
+ forbid: appType !== 'pc',
+ options: [
+ { value: 'blank', text: '鏂扮獥鍙�' },
+ { value: 'self', text: '褰撳墠绐楀彛' }
+ ]
+ },
+ {
+ type: 'radio',
+ key: 'eval',
+ label: '瑙ｆ瀽',
+ initVal: card.eval || 'true',
+ tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+ required: false,
+ options: [
+ { value: 'true', text: '鏄�' },
+ { value: 'false', text: '鍚�' }
+ ]
+ },
+ {
+ type: 'textarea',
+ key: 'formula',
+ label: '鍏紡',
+ initVal: card.formula || '',
+ tooltip: '鎵ц鏃朵細浣跨敤鏌ヨ鍒扮殑鏁版嵁鏇挎崲鐩稿簲鐨勫瓧娈碉紝灞曠ず鑾峰緱鐨勭粨鏋溿�傚彲浣跨敤JS鐨勪竴浜涜娉曪紝濡傦細涓夊厓琛ㄨ揪寮� @field1@ > @field2@ ? 0 : 1锛汳ath瀵硅薄锛屽彇缁濆鍊� Math.abs(@field@)銆佸洓鑸嶄簲鍏� Math.round(@field@)绛�',
+ placeholder: '渚嬪锛欯price@ * @number@',
+ required: true
},
{
type: 'multiselect',
--
Gitblit v1.8.0