From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

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

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 1eb4f59..ae79d94 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -391,16 +391,19 @@
     {
       type: 'radio',
       key: 'sysInterface',
-      label: '绯荤粺鎺ュ彛',
+      label: '绯荤粺绫诲瀷',
       initVal: card.sysInterface || 'false',
-      tooltip: '鍗曠偣鐧诲綍绯荤粺',
+      tooltip: '涓氬姟绯荤粺鎸囧悓涓�sso涓嬬殑鍏朵粬涓氬姟绯荤粺锛屽閮ㄧ郴缁熸寚涓嶅悓sso涓嬬殑鍏朵粬涓氬姟绯荤粺銆�',
       required: true,
       options: [{
-        value: 'true',
-        text: '鏄�'
-      }, {
         value: 'false',
-        text: '鍚�'
+        text: '涓氬姟'
+      }, {
+        value: 'true',
+        text: '鍗曠偣'
+      }, {
+        value: 'external',
+        text: '澶栭儴'
       }]
     },
     {
@@ -423,6 +426,21 @@
       key: 'proInterface',
       label: '姝ｅ紡鍦板潃',
       initVal: card.proInterface || '',
+      tooltip: '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�',
+      required: false
+    },
+    {
+      type: 'keyinterface',
+      key: 'exInterface',
+      label: '娴嬭瘯鍦板潃',
+      initVal: card.exInterface || '',
+      required: true
+    },
+    {
+      type: 'keyinterface',
+      key: 'exProInterface',
+      label: '姝ｅ紡鍦板潃',
+      initVal: card.exProInterface || '',
       tooltip: '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�',
       required: false
     },
@@ -687,10 +705,20 @@
       required: true
     },
     {
+      type: 'cascader',
+      key: 'syncComponent',
+      label: '鍒锋柊缁勪欢',
+      initVal: card.syncComponent || [],
+      tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
+      required: false,
+      options: modules
+    },
+    {
       type: 'radio',
       key: 'pagination',
       label: '鍒嗛〉',
       initVal: card.pagination || 'false',
+      tooltip: '瀵煎嚭鏁版嵁閲忚緝澶ф椂锛�1000+锛夛紝鍙缃垎椤佃姹傛暟鎹��',
       required: false,
       options: [{
         value: 'true',
@@ -715,15 +743,6 @@
         text: '闈炲繀濉�'
       }],
       forbid: appType === 'mob'
-    },
-    {
-      type: 'cascader',
-      key: 'syncComponent',
-      label: '鍒锋柊缁勪欢',
-      initVal: card.syncComponent || [],
-      tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
-      required: false,
-      options: modules
     },
     {
       type: 'cascader',
@@ -914,7 +933,10 @@
       initVal: card.controlField || '',
       required: true,
       allowClear: true,
-      options: columns
+      options: columns.map(item => ({
+        value: item.field,
+        text: `${item.label}锛�${item.field}锛塦
+      }))
     },
     {
       type: 'text',
@@ -1269,16 +1291,19 @@
     {
       type: 'radio',
       key: 'sysInterface',
-      label: '绯荤粺鎺ュ彛',
+      label: '绯荤粺绫诲瀷',
       initVal: card.sysInterface || 'false',
-      tooltip: '鍗曠偣鐧诲綍绯荤粺',
+      tooltip: '涓氬姟绯荤粺鎸囧悓涓�sso涓嬬殑鍏朵粬涓氬姟绯荤粺锛屽閮ㄧ郴缁熸寚涓嶅悓sso涓嬬殑鍏朵粬涓氬姟绯荤粺銆�',
       required: true,
       options: [{
-        value: 'true',
-        text: '鏄�'
-      }, {
         value: 'false',
-        text: '鍚�'
+        text: '涓氬姟'
+      }, {
+        value: 'true',
+        text: '鍗曠偣'
+      }, {
+        value: 'external',
+        text: '澶栭儴'
       }]
     },
     {
@@ -1301,6 +1326,21 @@
       key: 'proInterface',
       label: '姝ｅ紡鍦板潃',
       initVal: card.proInterface || '',
+      tooltip: '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�',
+      required: false
+    },
+    {
+      type: 'keyinterface',
+      key: 'exInterface',
+      label: '娴嬭瘯鍦板潃',
+      initVal: card.exInterface || '',
+      required: true
+    },
+    {
+      type: 'keyinterface',
+      key: 'exProInterface',
+      label: '姝ｅ紡鍦板潃',
+      initVal: card.exProInterface || '',
       tooltip: '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�',
       required: false
     },
@@ -1464,6 +1504,23 @@
       required: true
     },
     {
+      type: 'radio',
+      key: 'show',
+      label: '鏄剧ず涓�',
+      initVal: card.show || 'button',
+      required: true,
+      options: [{
+        value: 'icon',
+        text: '鍥炬爣'
+      }, {
+        value: 'button',
+        text: '鍥炬爣+鏂囧瓧'
+      }, {
+        value: 'link',
+        text: '鏂囧瓧+鍥炬爣'
+      }]
+    },
+    {
       type: 'icon',
       key: 'icon',
       label: '鍥炬爣',
@@ -1501,10 +1558,20 @@
       required: true
     },
     {
+      type: 'cascader',
+      key: 'syncComponent',
+      label: '鍒锋柊缁勪欢',
+      initVal: card.syncComponent || [],
+      tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
+      required: false,
+      options: modules
+    },
+    {
       type: 'radio',
       key: 'pagination',
       label: '鍒嗛〉',
       initVal: card.pagination || 'false',
+      tooltip: '瀵煎嚭鏁版嵁閲忚緝澶ф椂锛�1000+锛夛紝鍙缃垎椤佃姹傛暟鎹��',
       required: false,
       options: [{
         value: 'true',
@@ -1527,15 +1594,6 @@
         value: 'false',
         text: '闈炲繀濉�'
       }]
-    },
-    {
-      type: 'cascader',
-      key: 'syncComponent',
-      label: '鍒锋柊缁勪欢',
-      initVal: card.syncComponent || [],
-      tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
-      required: false,
-      options: modules
     },
     {
       type: 'cascader',
@@ -1663,7 +1721,10 @@
       initVal: card.controlField || '',
       required: true,
       allowClear: true,
-      options: columns
+      options: columns.map(item => ({
+        value: item.field,
+        text: `${item.label}锛�${item.field}锛塦
+      }))
     },
     {
       type: 'text',

--
Gitblit v1.8.0