From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/formaction/formconfig.jsx | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index cb760da..1a4e306 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -127,10 +127,17 @@
fields.forEach(item => {
if (item.type !== 'text' && item.type !== 'number') return
- resets.push({
- value: item.field,
- text: item.label
- })
+ if (item.label !== item.field) {
+ resets.push({
+ value: item.field,
+ text: item.label + ' (' + item.field + ')'
+ })
+ } else {
+ resets.push({
+ value: item.field,
+ text: item.label
+ })
+ }
})
return [
@@ -506,6 +513,20 @@
},
{
type: 'radio',
+ key: 'returnValue',
+ label: '鏇存柊琛ㄥ崟',
+ initVal: card.returnValue || 'false',
+ tooltip: '涓庨噸缃〃鍗曢厤鍚堜娇鐢紝寮�鍚椂锛屽繀椤诲湪鑷畾涔夎剼鏈腑杩斿洖鏁版嵁锛岀敤浜庢浛鎹㈠瓧娈甸泦鍜屽～鍏呰〃鍗曘��',
+ options: [{
+ value: 'false',
+ text: '绂佺敤'
+ }, {
+ value: 'true',
+ text: '鍚敤'
+ }]
+ },
+ {
+ type: 'radio',
key: 'reload',
label: '涓婁竴椤�',
initVal: card.reload || 'false',
@@ -519,20 +540,20 @@
text: '鍒锋柊'
}]
},
- {
- type: 'radio',
- key: 'formCache',
- label: '琛ㄥ崟缂撳瓨',
- initVal: card.formCache || 'false',
- tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
- required: false,
- options: [{
- value: 'false',
- text: '涓嶆竻绌�'
- }, {
- value: 'clear',
- text: '娓呯┖'
- }]
- },
+ // {
+ // type: 'radio',
+ // key: 'formCache',
+ // label: '琛ㄥ崟缂撳瓨',
+ // initVal: card.formCache || 'false',
+ // tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
+ // required: false,
+ // options: [{
+ // value: 'false',
+ // text: '涓嶆竻绌�'
+ // }, {
+ // value: 'clear',
+ // text: '娓呯┖'
+ // }]
+ // },
]
}
--
Gitblit v1.8.0