From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 e2b4ae1..0c76b5f 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -60,6 +60,9 @@
value: 'colspan',
text: '鍚堝苟鍒�'
}, {
+ value: 'formula',
+ text: '鍏紡'
+ }, {
value: 'index',
text: '搴忓彿'
}]
@@ -149,9 +152,8 @@
type: 'radio',
key: 'IsSort',
label: Formdict['model.sort'],
- initVal: card.IsSort || 'true',
+ initVal: card.IsSort || (card.isSub ? 'false' : 'true'),
required: true,
- forbidden: card.isSub,
options: [{
value: 'true',
text: Formdict['model.true']
@@ -227,10 +229,13 @@
text: Formdict['model.empty']
}, {
value: 'thdSeparator',
- text: Formdict['header.form.thdSeparator']
+ text: '鍗冨垎浣�'
}, {
value: 'percent',
text: '鐧惧垎姣�'
+ }, {
+ value: 'abs',
+ text: '缁濆鍊�'
}],
required: false
},
@@ -316,8 +321,8 @@
{
type: 'radio',
key: 'scale',
- label: Formdict['header.form.clickscale'],
- initVal: card.scale || 'false',
+ label: '鐐瑰嚮缂╂斁',
+ initVal: card.scale || 'true',
required: false,
options: [{
value: 'true',
@@ -383,12 +388,34 @@
]
},
{
+ 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'],
initVal: card.blacklist || [],
required: false,
- options: roleList
+ options: roleList,
+ forbidden: appType === 'mob'
}
]
}
--
Gitblit v1.8.0