From 32b8ffb3d9cdf49be768a5ddedec2a58d5893503 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 八月 2022 13:58:19 +0800
Subject: [PATCH] 2022-08-28
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 dc56d65..8ff4f0d 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -152,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,13 +226,16 @@
initVal: card.format || 'none',
options: [{
value: 'none',
- text: Formdict['model.empty']
+ text: '鏃�'
}, {
value: 'thdSeparator',
- text: Formdict['header.form.thdSeparator']
+ text: '鍗冨垎浣�'
}, {
value: 'percent',
text: '鐧惧垎姣�'
+ }, {
+ value: 'abs',
+ text: '缁濆鍊�'
}],
required: false
},
@@ -244,7 +246,10 @@
initVal: card.textFormat || 'none',
options: [{
value: 'none',
- text: Formdict['model.empty']
+ text: '鏃�'
+ }, {
+ value: 'encryption',
+ text: '鍔犲瘑'
}, {
value: 'YYYY-MM-DD',
text: 'YYYY-MM-DD'
@@ -402,7 +407,7 @@
key: 'formula',
label: '鍏紡',
initVal: card.formula || '',
- tooltip: '鎵ц鏃朵細浣跨敤鏌ヨ鍒扮殑鏁版嵁鏇挎崲鐩稿簲鐨勫瓧娈碉紝灞曠ず鑾峰緱鐨勭粨鏋溿�傚彲浣跨敤JS鐨勪竴浜涜娉曪紝濡傦細涓夊厓琛ㄨ揪寮� @field1@ > @field2@ ? 0 : 1锛汳ath瀵硅薄锛屽彇缁濆鍊� Math.abs(@field@)銆佸洓鑸嶄簲鍏� Math.round(@field@)绛�',
+ tooltip: '鎵ц鏃朵細浣跨敤鏌ヨ鍒扮殑鏁版嵁鏇挎崲鐩稿簲鐨勫瓧娈碉紝灞曠ず鑾峰緱鐨勭粨鏋滐紝鍦ㄤ笉浣跨敤瑙ｆ瀽鏃舵崲琛岀鎴栫┖鏍间細鏇挎崲涓洪〉闈㈠厓绱犮�傚彲浣跨敤JS鐨勪竴浜涜娉曪紝濡傦細涓夊厓琛ㄨ揪寮� @field1@ > @field2@ ? 0 : 1锛汳ath瀵硅薄锛屽彇缁濆鍊� Math.abs(@field@)銆佸洓鑸嶄簲鍏� Math.round(@field@)绛�',
placeholder: '渚嬪锛欯price@ * @number@',
required: true
},
@@ -412,7 +417,8 @@
label: Formdict['header.form.blacklist'],
initVal: card.blacklist || [],
required: false,
- options: roleList
+ options: roleList,
+ forbidden: appType === 'mob'
}
]
}
--
Gitblit v1.8.0