From 8b6949f0874e46a86de7e4c3309a1f116935ea6f Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Tue, 14 Feb 2023 09:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8B=BE=E9=80=89=E8=9E=8D=E5=90=88=EF=BC=8C?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=AE=BE=E7=BD=AE=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SystemSettingDialog.vue | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue
index dffb4b1..025bde4 100644
--- a/src/components/SystemSettingDialog.vue
+++ b/src/components/SystemSettingDialog.vue
@@ -61,10 +61,10 @@
           />
           <q-tab
             v-if="
-              $store.state.advanced_debug ||
+              $store.state.advanced_debug&&!$store.state.custom_defines.function_fusion ||
               /*!$store.state.custom_defines.is_custom_isv */ (!$store.state
                 .custom_defines.function_output_board &&
-                $store.state.isLedPlayer())
+                $store.state.isLedPlayer()) &&!$store.state.custom_defines.function_fusion
             "
             name="graphics"
             no-caps
@@ -76,6 +76,18 @@
             "
             :disable="loading"
           />
+          <q-tab
+          v-if="$store.state.custom_defines.function_fusion &&
+                $store.state.isLedPlayer()"
+            name="graphics"
+            no-caps
+            icon="img:new_icon/graphics_setting.png"
+            :label="
+               $t('output setting')
+            "
+            :disable="loading"
+          />
+
           <q-tab
             name="timing_task"
             no-caps
@@ -96,6 +108,7 @@
             :label="$t('output board setting')"
             :disable="loading"
           />
+
           <q-tab
             name="other"
             no-caps
@@ -415,7 +428,7 @@
                       </q-item-section>
                     </q-item>
                     <q-item
-                      v-if="!$store.state.custom_defines.function_output_board"
+                      v-if="!$store.state.custom_defines.function_output_board ||$store.state.custom_defines.function_fusion"
                     >
                       <q-item-section avatar class="width_5_2_2"
                         >{{ $t("output type") }}:</q-item-section
@@ -461,6 +474,7 @@
                     <q-item
                       v-if="
                         !$store.state.custom_defines.function_output_board &&
+                        device_resolution_type.toUpperCase() == 'EDID'||$store.state.custom_defines.function_fusion&&
                         device_resolution_type.toUpperCase() == 'EDID'
                       "
                     >
@@ -479,6 +493,7 @@
                     <q-item
                       v-if="
                         !$store.state.custom_defines.function_output_board &&
+                        device_resolution_type.toUpperCase() == 'CVT'||$store.state.custom_defines.function_fusion&&
                         device_resolution_type.toUpperCase() == 'CVT'
                       "
                     >
@@ -497,6 +512,7 @@
                     <q-item
                       v-if="
                         !$store.state.custom_defines.function_output_board &&
+                        device_resolution_type.toUpperCase() == 'CUSTOM'||$store.state.custom_defines.function_fusion&&
                         device_resolution_type.toUpperCase() == 'CUSTOM'
                       "
                     >
@@ -811,7 +827,7 @@
             class="_panel"
             v-if="
               $store.state.custom_defines.function_output_board ||
-              $store.state.advanced_debug
+              $store.state.advanced_debug ||$store.state.custom_defines.function_fusion
             "
           >
             <q-card class="fit">