From a8d8d2fdb83f21e76f90cb13ea91ad6e9bf98a9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 三月 2025 10:53:52 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/share/actioncomponent/formconfig.jsx |   68 +++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+), 1 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index c9f2c24..9213a97 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -214,7 +214,8 @@
       { value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
       { value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
       { value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
-      { value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+      { value: 'reAuth', text: '鍒囨崲鎺堟潈鐮� / 灏忕▼搴忔竻绌虹紦瀛�' },
+      { value: 'reSystem', text: '鍒囨崲绯荤粺' },
       { value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
       { value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
       { value: 'expPdf', text: '瀵煎嚭PDF' },
@@ -361,6 +362,16 @@
     if (typeof(card.openmenu) !== 'string') {
       card.openmenu = ''
     }
+  }
+
+  if (card.syncComponents && card.syncComponents[0] && Array.isArray(card.syncComponents[0])) {
+    card.syncComponents = card.syncComponents.map((item, i) => {
+      return {
+        syncComId: item,
+        label: '',
+        uuid: 'fixed' + i
+      }
+    })
   }
 
   let forms = [
@@ -842,6 +853,10 @@
         value: 'never',
         text: '涓嶅埛鏂�'
       }, {
+        value: 'line',
+        text: '鍒锋柊琛�',
+        $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
+      }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
       }, {
@@ -1072,6 +1087,22 @@
       required: false,
       forbid: isApp || viewType === 'popview',
       options: menulist
+    },
+    {
+      type: 'radio',
+      key: 'urlPar',
+      label: 'URL鍙橀噺',
+      initVal: card.urlPar || 'false',
+      tooltip: '鍒锋柊鑿滃崟鏃舵槸鍚︽竻闄RL鍙橀噺銆�',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '娓呯┖'
+      }, {
+        value: 'false',
+        text: '涓嶆竻绌�'
+      }],
+      forbid: isApp || viewType === 'popview',
     },
     {
       type: !appType ? 'cascader' : 'select',
@@ -1619,6 +1650,14 @@
         value: 'single',
         text: '閫愭潯璇锋眰'
       }]
+    },
+    {
+      type: 'number',
+      key: 'execInterval',
+      label: '鎵ц闂撮殧',
+      initVal: card.execInterval || 0,
+      tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+      required: false
     },
     {
       type: 'radio',
@@ -2315,6 +2354,9 @@
         value: 'never',
         text: '涓嶅埛鏂�'
       }, {
+        value: 'line',
+        text: '鍒锋柊琛�'
+      }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
       }, {
@@ -2479,6 +2521,22 @@
       required: false,
       forbid: viewType === 'popview',
       options: menulist
+    },
+    {
+      type: 'radio',
+      key: 'urlPar',
+      label: 'URL鍙橀噺',
+      initVal: card.urlPar || 'false',
+      tooltip: '鍒锋柊鑿滃崟鏃舵槸鍚︽竻闄RL鍙橀噺銆�',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '娓呯┖'
+      }, {
+        value: 'false',
+        text: '涓嶆竻绌�'
+      }],
+      forbid: viewType === 'popview',
     },
     {
       type: 'cascader',
@@ -2824,6 +2882,14 @@
       }]
     },
     {
+      type: 'number',
+      key: 'execInterval',
+      label: '鎵ц闂撮殧',
+      initVal: card.execInterval || 0,
+      tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+      required: false
+    },
+    {
       type: 'radio',
       key: 'progress',
       label: '杩涘害鎻愮ず',

--
Gitblit v1.8.0