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 | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 2aa32ce..a703766 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -13,7 +13,7 @@
if (roleList) {
try {
roleList = JSON.parse(roleList)
- } catch {
+ } catch (e) {
roleList = []
}
} else {
@@ -31,7 +31,7 @@
if (menulist) {
try {
menulist = JSON.parse(menulist)
- } catch {
+ } catch (e) {
menulist = []
}
} else {
@@ -59,6 +59,9 @@
}, {
value: 'colspan',
text: '鍚堝苟鍒�'
+ }, {
+ value: 'formula',
+ text: '鍏紡'
}, {
value: 'index',
text: '搴忓彿'
@@ -264,12 +267,11 @@
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',
@@ -384,6 +386,27 @@
]
},
{
+ 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',
key: 'blacklist',
label: Formdict['header.form.blacklist'],
--
Gitblit v1.8.0