From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/form/formaction/formconfig.jsx |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index f6800ae..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 [
@@ -467,6 +474,15 @@
       options: modules
     },
     {
+      type: 'number',
+      key: 'syncDelay',
+      label: '鍒锋柊寤惰繜',
+      initVal: card.syncDelay,
+      tooltip: '鍚屾鍒锋柊缁勪欢鐨勫欢杩熸椂闂达紝鍗曚綅姣銆�',
+      // placeholder: '鍗曚綅姣',
+      required: false
+    },
+    {
       type: 'cascader',
       key: 'anchors',
       label: '璺宠浆閿氱偣',
@@ -497,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',
@@ -510,5 +540,20 @@
         text: '鍒锋柊'
       }]
     },
+    // {
+    //   type: 'radio',
+    //   key: 'formCache',
+    //   label: '琛ㄥ崟缂撳瓨',
+    //   initVal: card.formCache || 'false',
+    //   tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
+    //   required: false,
+    //   options: [{
+    //     value: 'false',
+    //     text: '涓嶆竻绌�'
+    //   }, {
+    //     value: 'clear',
+    //     text: '娓呯┖'
+    //   }]
+    // },
   ]
 }

--
Gitblit v1.8.0