From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms

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

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 3b176a2..9213a97 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { btnClasses } from '@/utils/option.js'
+import { btnClasses, modalClasses } from '@/utils/option.js'
 
 /**
  * @description 鑾峰彇鎸夐挳琛ㄥ崟閰嶇疆淇℃伅
@@ -187,6 +187,9 @@
     } else {
       appMenus = []
     }
+    // if (appType === 'mob') {
+    //   appMenus.push({value: 'sign', text: '绛惧悕锛堢郴缁熼〉锛�'})
+    // }
     appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
   } else {
     menulist = sessionStorage.getItem('fstMenuList')
@@ -211,12 +214,14 @@
       { 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' },
       { value: 'shareLink', text: '鍒嗕韩閾炬帴' },
       { value: 'openLocation', text: '鎵撳紑鍦板浘'},
+      { value: 'wxPublicAuth', text: '寰俊鍏紬鍙锋巿鏉�'},
       { value: 'logout', text: '閫�鍑�' },
       { value: 'goBack', text: '杩斿洖' },
     ]
@@ -325,7 +330,7 @@
   }
 
   let width = card.width || (card.width === 0 ? 0 : 12)
-  if (/x/.test(card.width)) {
+  if (card.width && /x/.test(card.width)) {
     width = +width.replace(/x/, '.5')
   }
 
@@ -357,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 = [
@@ -803,7 +818,7 @@
       key: 'execError',
       label: '澶辫触鍚�',
       initVal: card.execError || 'never',
-      tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳锛堝脊绐楁寜閽級涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻�傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級銆�' : '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂扮粍浠讹紱閫夋嫨鍒锋柊琛� / 缁勪欢鏃讹紝濡傛灉褰撳墠琛屾暟鎹笉瀛樺湪浼氬埛鏂扮粍浠躲�傛敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級銆�',
+      tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳锛堝脊绐楁寜閽級涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻�傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級锛汙open_target_menu@ 鍙墽琛屾墦寮�鑿滃崟銆�' : '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂扮粍浠讹紱閫夋嫨鍒锋柊琛� / 缁勪欢鏃讹紝濡傛灉褰撳墠琛屾暟鎹笉瀛樺湪浼氬埛鏂扮粍浠躲�傛敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級锛汙open_target_menu@ 鍙墽琛屾墦寮�鑿滃崟銆�',
       required: true,
       options: [{
         value: 'never',
@@ -837,6 +852,10 @@
       options: [{
         value: 'never',
         text: '涓嶅埛鏂�'
+      }, {
+        value: 'line',
+        text: '鍒锋柊琛�',
+        $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
       }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
@@ -1070,10 +1089,26 @@
       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',
       key: 'openmenu',
       label: '鎵撳紑鑿滃崟',
-      tooltip: '鎵ц鎴愬姛鍚庨渶瑕佹墦寮�鐨勮彍鍗曘��',
+      tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧け璐ユ椂杩斿洖@open_target_menu@锛夐渶瑕佹墦寮�鐨勮彍鍗曘��',
       initVal: card.openmenu || (!appType ? [] : ''),
       help: appType === 'mob' || appType === 'pc' ? '鍙繑鍥炰笂涓�椤点��' : null,
       extendName: 'MenuNo',
@@ -1409,21 +1444,6 @@
       initVal: card.reason || '',
       required: false
     },
-    // {
-    //   type: 'radio',
-    //   key: 'formCache',
-    //   label: '琛ㄥ崟缂撳瓨',
-    //   initVal: card.formCache || 'false',
-    //   tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
-    //   required: false,
-    //   options: [{
-    //     value: 'false',
-    //     text: '涓嶆竻绌�'
-    //   }, {
-    //     value: 'clear',
-    //     text: '娓呯┖'
-    //   }]
-    // },
     {
       type: 'radio',
       key: 'hidden',
@@ -1459,10 +1479,68 @@
       initVal: card.permission || 'true',
       required: false,
       options: [
-        {value: 'true', text: '缁ф壙鑿滃崟'},
+        {value: 'true', text: '缁ф壙缁勪欢'},
         {value: 'false', text: '绂佺敤'},
       ],
       forbid: viewType === 'popview'
+    },
+    {
+      type: 'radio',
+      key: 'extBtn',
+      label: '鎵╁睍鎸夐挳',
+      initVal: card.extBtn || 'false',
+      tooltip: '鐐瑰嚮鎵╁睍鎸夐挳鏃讹紝鍙橀噺 mk_submit_type 灏嗚璧嬪�笺��',
+      required: false,
+      options: [
+        {value: 'true', text: '鍚敤'},
+        {value: 'false', text: '绂佺敤'},
+      ],
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'text',
+      key: 'extValue',
+      label: '鎵╁睍鍊�',
+      initVal: card.extValue || '',
+      required: true,
+      readonly: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'text',
+      key: 'extLabel',
+      label: '鎵╁睍鍚嶇О',
+      initVal: card.extLabel || '',
+      required: true,
+      readonly: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'select',
+      key: 'extStyle',
+      label: '鎵╁睍鏍峰紡',
+      initVal: card.extStyle || '',
+      required: false,
+      options: modalClasses,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'text',
+      key: 'confLabel',
+      label: '纭畾鍚嶇О',
+      initVal: card.confLabel || '',
+      required: false,
+      readonly: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'select',
+      key: 'confStyle',
+      label: '纭畾鏍峰紡',
+      initVal: card.confStyle || '',
+      required: false,
+      options: modalClasses,
+      forbid: appType === 'mob'
     },
     {
       type: 'splitLine',
@@ -1572,6 +1650,14 @@
         value: 'single',
         text: '閫愭潯璇锋眰'
       }]
+    },
+    {
+      type: 'number',
+      key: 'execInterval',
+      label: '鎵ц闂撮殧',
+      initVal: card.execInterval || 0,
+      tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+      required: false
     },
     {
       type: 'radio',
@@ -1816,6 +1902,11 @@
         apps.push({value: item.appId, text: item.appName})
       }
     })
+  }
+
+  let width = card.width || (card.width === 0 ? 0 : 12)
+  if (card.width && /x/.test(card.width)) {
+    width = +width.replace(/x/, '.5')
   }
 
   let forms = [
@@ -2230,7 +2321,7 @@
       key: 'execError',
       label: '澶辫触鍚�',
       initVal: card.execError || 'never',
-      tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳锛堝脊绐楁寜閽級涓缃叧闂悗鍒锋柊鍝竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻�傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級銆�' : '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂扮粍浠讹紱閫夋嫨鍒锋柊琛� / 缁勪欢鏃讹紝濡傛灉褰撳墠琛屾暟鎹笉瀛樺湪浼氬埛鏂扮粍浠躲�傛敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級銆�',
+      tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳锛堝脊绐楁寜閽級涓缃叧闂悗鍒锋柊鍝竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻�傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級锛汙open_target_menu@ 鍙墽琛屾墦寮�鑿滃崟銆�' : '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂扮粍浠讹紱閫夋嫨鍒锋柊琛� / 缁勪欢鏃讹紝濡傛灉褰撳墠琛屾暟鎹笉瀛樺湪浼氬埛鏂扮粍浠躲�傛敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆傚闇�璇煶鎾姤璇蜂互@speak@寮�澶达紝鎾姤鍐呭鎴栨枃浠舵斁缃簬<<>>涓�傝繑鍥炰俊鎭紙@retmsg锛夌壒娈婃爣璇嗭細@close_tab@ 鎵ц锛堝叧闂爣绛�-绠＄悊绯荤粺锛夛紱@close_popup@ 鎵ц锛堝叧闂脊绐楋級锛汙goback@ 鎵ц锛堣繑鍥炰笂涓�椤�-瀛愬簲鐢級锛汙open_target_menu@ 鍙墽琛屾墦寮�鑿滃崟銆�',
       required: true,
       options: [{
         value: 'never',
@@ -2262,6 +2353,9 @@
       options: [{
         value: 'never',
         text: '涓嶅埛鏂�'
+      }, {
+        value: 'line',
+        text: '鍒锋柊琛�'
       }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
@@ -2339,18 +2433,18 @@
       tooltip: '鍒嗕韩鏃跺鐢ㄦ埛鐨勬彁绀轰俊鎭��',
       required: false
     },
-    // {
-    //   type: 'number',
-    //   key: 'width',
-    //   min: 1,
-    //   max: 24,
-    //   precision: 0,
-    //   label: '瀹藉害',
-    //   initVal: card.width || 12,
-    //   tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
-    //   forbid: card.eleType !== 'button',
-    //   required: true
-    // },
+    {
+      type: 'number',
+      key: 'width',
+      min: 0,
+      max: 24,
+      precision: 1,
+      label: '瀹藉害',
+      initVal: width,
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼�備负 0 鏃跺搴﹁嚜閫傚簲銆傚彲璁剧疆鍗婂垪鍗�.5銆�',
+      forbid: position !== 'line',
+      required: true
+    },
     {
       type: 'radio',
       key: 'show',
@@ -2429,10 +2523,26 @@
       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',
       key: 'openmenu',
       label: '鎵撳紑鑿滃崟',
-      tooltip: '鎵ц鎴愬姛鍚庨渶瑕佹墦寮�鐨勮彍鍗曘��',
+      tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧け璐ユ椂杩斿洖@open_target_menu@锛夐渶瑕佹墦寮�鐨勮彍鍗曘��',
       initVal: card.openmenu || [],
       extendName: 'MenuNo',
       required: false,
@@ -2664,21 +2774,6 @@
       initVal: card.reason || '',
       required: false
     },
-    // {
-    //   type: 'radio',
-    //   key: 'formCache',
-    //   label: '琛ㄥ崟缂撳瓨',
-    //   initVal: card.formCache || 'false',
-    //   tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
-    //   required: false,
-    //   options: [{
-    //     value: 'false',
-    //     text: '涓嶆竻绌�'
-    //   }, {
-    //     value: 'clear',
-    //     text: '娓呯┖'
-    //   }]
-    // },
     {
       type: 'radio',
       key: 'hidden',
@@ -2721,6 +2816,58 @@
     },
     {
       type: 'radio',
+      key: 'extBtn',
+      label: '鎵╁睍鎸夐挳',
+      initVal: card.extBtn || 'false',
+      tooltip: '鐐瑰嚮鎵╁睍鎸夐挳鏃讹紝鍙橀噺 mk_submit_type 灏嗚璧嬪�笺��',
+      required: false,
+      options: [
+        {value: 'true', text: '鍚敤'},
+        {value: 'false', text: '绂佺敤'},
+      ],
+    },
+    {
+      type: 'text',
+      key: 'extValue',
+      label: '鎵╁睍鍊�',
+      initVal: card.extValue || '',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'extLabel',
+      label: '鎵╁睍鍚嶇О',
+      initVal: card.extLabel || '',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'select',
+      key: 'extStyle',
+      label: '鎵╁睍鏍峰紡',
+      initVal: card.extStyle || '',
+      required: false,
+      options: modalClasses
+    },
+    {
+      type: 'text',
+      key: 'confLabel',
+      label: '纭畾鍚嶇О',
+      initVal: card.confLabel || '',
+      required: false,
+      readonly: false
+    },
+    {
+      type: 'select',
+      key: 'confStyle',
+      label: '纭畾鏍峰紡',
+      initVal: card.confStyle || '',
+      required: false,
+      options: modalClasses
+    },
+    {
+      type: 'radio',
       key: 'execType',
       label: '璇锋眰鏂瑰紡',
       initVal: card.execType || 'multi',
@@ -2735,6 +2882,14 @@
       }]
     },
     {
+      type: 'number',
+      key: 'execInterval',
+      label: '鎵ц闂撮殧',
+      initVal: card.execInterval || 0,
+      tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+      required: false
+    },
+    {
       type: 'radio',
       key: 'progress',
       label: '杩涘害鎻愮ず',

--
Gitblit v1.8.0