From be22457344d6d3fc079de2a4f0a1e06e4c0f85c3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 06 七月 2022 22:55:14 +0800
Subject: [PATCH] 2022-07-06
---
src/templates/zshare/formconfig.jsx | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index ceac80c..083043a 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -13,6 +13,17 @@
export function getTreeSettingForm (setting, usefulFields = [], MenuID) {
let str = '^(' + usefulFields.join('|') + ')'
let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
+ let rules = [{
+ max: formRule.func.max,
+ message: formRule.func.maxMessage
+ }]
+
+ if (usefulFields.length > 0) {
+ rules.push({
+ pattern: _patten,
+ message: formRule.func.innerMessage
+ })
+ }
return [
{
@@ -103,19 +114,11 @@
key: 'innerFunc',
label: Formdict['header.form.innerFunc'],
initVal: setting.innerFunc || '',
- tooltip: '寮�澶村彲鐢ㄥ瓧绗︼細' + usefulFields.join(', '),
+ tooltip: usefulFields.length ? '寮�澶村彲鐢ㄥ瓧绗︼細' + usefulFields.join(', ') : '',
placement: 'bottomLeft',
required: false,
readonly: false,
- rules: [
- {
- pattern: _patten,
- message: formRule.func.innerMessage
- }, {
- max: formRule.func.max,
- message: formRule.func.maxMessage
- }
- ]
+ rules: rules
},
{
type: 'datasource',
@@ -875,6 +878,7 @@
*/
export function getActionForm (card, config, usefulFields, type, menulist = [], printTemps = [], tabs = []) {
let columns = (config.columns || []).filter(col => col.field)
+ usefulFields = []
let opentypes = [
{
@@ -971,6 +975,9 @@
}, {
value: 'megvii',
text: '鏃疯闈㈡澘鏈�'
+ }, {
+ value: 'filezip',
+ text: '鏂囦欢鍘嬬缉鍖�'
}]
},
{ // 鏃疯闈㈡澘鏈烘帴鍙� 寰呮墿灞�
@@ -1050,9 +1057,18 @@
key: 'innerFunc',
label: Formdict['header.form.innerFunc'],
initVal: card.innerFunc || '',
- tooltip: `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬨�俙,
+ tooltip: usefulFields.length ? `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬨�俙 : '',
fields: usefulFields,
required: card.intertype === 'inner',
+ readonly: false
+ },
+ {
+ type: 'text',
+ key: 'urlkey',
+ label: '鍦板潃瀛楁',
+ initVal: card.urlkey || '',
+ tooltip: '鍥剧墖锛堟枃浠讹級閾炬帴鐨勫瓧娈靛悕銆�',
+ required: false,
readonly: false
},
{
@@ -1462,7 +1478,7 @@
key: 'preFunc',
label: '鍓嶇疆鍑芥暟',
initVal: card.preFunc || '',
- tooltip: `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般�俙,
+ tooltip: usefulFields.length ? `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般�俙 : '',
fields: usefulFields,
required: false,
readonly: false
--
Gitblit v1.8.0