From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx |   67 ++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx
index 4b70bf9..eb79052 100644
--- a/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx
@@ -1,3 +1,6 @@
+
+import MenuUtils from '@/utils/utils-custom.js'
+
 /**
  * @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟
  * @param {object} card       // 鍥捐〃瀵硅薄
@@ -107,6 +110,7 @@
       required: false,
       options: [
         {value: '', label: '鏃�'},
+        {value: 'switch', label: '鏁版嵁鍒囨崲'},
         {value: 'menu', label: '鑿滃崟'},
         {value: 'menus', label: '鑿滃崟缁�'}
       ],
@@ -115,7 +119,6 @@
         {field: 'menus', values: ['menus']},
         {field: 'menuType', values: ['menus']},
         {field: 'open', values: ['menu', 'menus']},
-        {field: 'joint', values: ['menu', 'menus']},
       ]
     },
     {
@@ -148,24 +151,13 @@
       forbid: appType !== 'pc'
     },
     {
-      type: 'radio',
-      field: 'joint',
-      label: '鍙傛暟鎷兼帴',
-      initval: card.joint || 'true',
-      required: false,
-      options: [
-        {value: 'true', label: '鏄�'},
-        {value: 'false', label: '鍚�'},
-      ],
-    },
-    {
       type: 'table',
       field: 'menus',
       label: '鑿滃崟缁�',
       initval: card.menus || [],
       required: true,
       span: 24,
-      actions: appType === 'pc' ? ['view'] : [],
+      actions: ['edit', 'del', 'add', 'move', 'view'],
       columns: [
         {
           title: '鏍囪瘑',
@@ -197,12 +189,15 @@
  * @param {object} card       // 鍥捐〃瀵硅薄
  * @param {Array}  columns    // 鏄剧ず鍒�
  */
-export function getOptionForm (card, columns) {
+export function getOptionForm (card, uuid) {
+  let menu = window.GLOB.customMenu
+  let modules = MenuUtils.getSupModules(menu.components, uuid, menu.interfaces)
+
   return [
     {
       type: 'select',
       field: 'subtype',
-      label: '绫诲瀷',
+      label: '鍥捐〃绫诲瀷',
       initval: card.subtype || 'xflow',
       required: true,
       options: [{
@@ -219,26 +214,26 @@
     },
     {
       type: 'radio',
-      field: 'export',
-      label: '涓嬭浇',
-      initval: card.export || 'png',
-      required: false,
+      field: 'function',
+      label: '鍔熻兘',
+      initval: card.function || 'show',
+      required: true,
       options: [
-        {value: 'none', label: '绂佺敤'},
-        {value: 'png', label: 'PNG鍥�'},
+        {value: 'edit', label: '娴佺▼缂栬緫'},
+        {value: 'show', label: '娴佺▼灞曠ず'},
       ],
+      controlFields: [
+        {field: 'empty', values: ['show']}
+      ]
     },
     {
-      type: 'radio',
-      field: 'empty',
-      label: '绌哄�奸殣钘�',
-      initval: card.empty || 'show',
-      tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+      type: 'cascader',
+      field: 'supModule',
+      label: '涓婄骇缁勪欢',
+      initval: card.supModule || [],
       required: false,
-      options: [
-        {value: 'show', label: '鍚�'},
-        {value: 'hidden', label: '鏄�'},
-      ],
+      options: modules,
+      allowClear: true
     },
     {
       type: 'radio',
@@ -259,6 +254,18 @@
       initval: card.backgroundColor || '',
       required: false,
       allowClear: true
+    },
+    {
+      type: 'radio',
+      field: 'empty',
+      label: '绌哄�奸殣钘�',
+      initval: card.empty || 'show',
+      tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+      required: false,
+      options: [
+        {value: 'show', label: '鍚�'},
+        {value: 'hidden', label: '鏄�'},
+      ],
     }
   ]
 }

--
Gitblit v1.8.0