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-G6/chartcompile/formconfig.jsx |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx
index 35b9d60..3c67d5d 100644
--- a/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx
@@ -5,6 +5,8 @@
 export function getBaseForm (card, columns) {
   let appType = sessionStorage.getItem('appType')
   let roleList = sessionStorage.getItem('sysRoles')
+  let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
+  let ispop = sessionStorage.getItem('editMenuType') === 'popview'
   if (roleList) {
     try {
       roleList = JSON.parse(roleList)
@@ -87,7 +89,19 @@
         {value: 'true', label: '鍚敤'},
         {value: 'false', label: '绂佺敤'},
       ],
-      forbid: !appType
+      forbid: !appType || ispop || isprint
+    },
+    {
+      type: 'radio',
+      field: 'cacheLocal',
+      label: '鏈湴缂撳瓨',
+      initval: card.cacheLocal || 'true',
+      required: false,
+      options: [
+        {value: 'true', label: '缁ф壙鑿滃崟'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: ispop || isprint
     },
     {
       type: 'multiselect',
@@ -96,17 +110,17 @@
       initval: card.blacklist || [],
       required: false,
       options: roleList,
-      forbid: !!appType
+      forbid: !!appType || isprint
     },
     {
       type: 'radio',
       field: 'click',
       label: '鐐瑰嚮浜嬩欢',
-      initval: card.click || '',
+      initval: card.click || 'switch',
       tooltip: '鐐瑰嚮鑺傜偣鏃惰Е鍙戠殑浜嬩欢銆�',
       required: false,
       options: [
-        {value: '', label: '鏁版嵁鍒囨崲'},
+        {value: 'switch', label: '鏁版嵁鍒囨崲'},
         {value: 'menu', label: '鑿滃崟'},
         {value: 'menus', label: '鑿滃崟缁�'}
       ],
@@ -115,7 +129,6 @@
         {field: 'menus', values: ['menus']},
         {field: 'menuType', values: ['menus']},
         {field: 'open', values: ['menu', 'menus']},
-        {field: 'joint', values: ['menu', 'menus']},
       ]
     },
     {
@@ -148,24 +161,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: '鏍囪瘑',
@@ -218,7 +220,7 @@
       controlFields: [
         {field: 'dirField', values: ['mindmap']},
         {field: 'nodeColor', values: ['mindmap']},
-        {field: 'collapsed', values: ['indentTree', 'kapmap']},
+        // {field: 'collapsed', values: ['indentTree', 'kapmap']},
       ]
     },
     {
@@ -236,7 +238,7 @@
         label: '涓婄骇缁勪欢'
       }, {
         value: 'line',
-        label: '琛�'
+        label: '鏁版嵁婧�'
       }],
       controlFields: [
         {field: 'rootLabel', values: ['fixed', 'supvalue']},
@@ -249,6 +251,7 @@
       field: 'rootValue',
       label: '鏍硅妭鐐瑰��',
       initval: card.rootValue || '',
+      tooltip: '鏍硅妭鐐逛娇鐢ㄤ笂绾х粍浠舵椂锛岃濉啓涓婄骇缁勪欢涓搴旂殑瀛楁銆�',
       required: true
     },
     {
@@ -256,6 +259,7 @@
       field: 'rootLabel',
       label: '鏍硅妭鐐规枃鏈�',
       initval: card.rootLabel || '',
+      tooltip: '鏍硅妭鐐逛娇鐢ㄤ笂绾х粍浠舵椂锛岃濉啓涓婄骇缁勪欢涓搴旂殑瀛楁銆�',
       required: true
     },
     {
@@ -316,7 +320,7 @@
       label: '鑺傜偣棰滆壊',
       initval: card.nodeColor || '#1890ff',
       tooltip: '鍙充晶鑺傜偣鐨勬爣璁伴鑹层��',
-      isHex: true,
+      colorType: 'hex',
       required: false
     },
     {
@@ -325,7 +329,7 @@
       label: '宸﹁妭鐐归鑹�',
       initval: card.leftColor || '#26C281',
       tooltip: '宸︿晶鑺傜偣鐨勬爣璁伴鑹层��',
-      isHex: true,
+      colorType: 'hex',
       required: false
     },
     {
@@ -345,7 +349,7 @@
       field: 'collapsed',
       label: '鑺傜偣鍚堝苟',
       initval: card.collapsed || 'false',
-      tooltip: '涓�绾ц妭鐐规槸鍚﹀悎骞躲��',
+      tooltip: '鍒濆鍖栨椂锛屼竴绾ц妭鐐规槸鍚﹀悎骞躲��',
       required: false,
       options: [
         {value: 'false', label: '鍚�'},

--
Gitblit v1.8.0