From 09f20b41239bbedec0f377fa1e6f555651bb615f Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 2 Feb 2023 16:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/Debugging.vue | 63 ++++++++++++---------
 src/components/FusionSettingsDialog.vue     | 17 ------
 2 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/src/components/FusionSettings/Debugging.vue b/src/components/FusionSettings/Debugging.vue
index 3f9777b..ad7014d 100644
--- a/src/components/FusionSettings/Debugging.vue
+++ b/src/components/FusionSettings/Debugging.vue
@@ -1,22 +1,31 @@
 <template>
   <div>
     <q-list dense bordered separator>
-      <q-item clickable v-ripple  v-for="(item, index) in data">
-        <q-item-section >
-          <DebuggingItem :name="Object.keys(item)[0]" :value="Object.values(item)[0]">
+      <q-item clickable v-ripple v-for="(item, index) in data">
+        <q-item-section>
+          <DebuggingItem
+            :name="Object.keys(item)[0]"
+            :value="Object.values(item)[0]"
+          >
           </DebuggingItem>
         </q-item-section>
       </q-item>
-      <q-item clickable v-ripple  v-for="(item, index) in btn">
-        <q-item-section >
-            <div><q-btn color="white" text-color="black" @click="send_btn(Object.keys(item)[0])" :label="$t(btn_name(Object.keys(item)[0]))" /></div>
+      <q-item clickable v-ripple v-for="(item, index) in btn">
+        <q-item-section>
+          <div>
+            <q-btn
+              color="white"
+              text-color="black"
+              @click="send_btn(Object.keys(item)[0])"
+              :label="$t(btn_name(Object.keys(item)[0]))"
+            />
+          </div>
         </q-item-section>
       </q-item>
     </q-list>
   </div>
 </template>
 
-
 <script lang="ts">
 import {
   defineComponent,
@@ -38,7 +47,7 @@ export default defineComponent({
   name: "Debugging",
   components: {
     vue3ResizeDrag,
-    DebuggingItem
+    DebuggingItem,
   },
   setup() {
     let set = GlobalData.getInstance().getCurrentClient();
@@ -46,37 +55,37 @@ export default defineComponent({
     let $t = useI18n();
     const data = computed(() => {
       let array = [];
-      let tmp = JSON.parse($store.state.fusion_configuration).options
+      let tmp = JSON.parse($store.state.fusion_configuration).options;
       for (let key in tmp) {
-        if (key.indexOf("@") != -1&&key.indexOf("@btn") == -1) {
-          array.push({ [key]: tmp[key] })
+        if (key.indexOf("@") != -1 && key.indexOf("@btn") == -1) {
+          array.push({ [key]: tmp[key] });
         }
       }
-      return array
-    })
+      return array;
+    });
     const btn = computed(() => {
       let array = [];
-      let tmp = JSON.parse($store.state.fusion_configuration).options
+      let tmp = JSON.parse($store.state.fusion_configuration).options;
       for (let key in tmp) {
         if (key.indexOf("@btn") != -1) {
-          array.push({ [key]: tmp[key] })
+          array.push({ [key]: tmp[key] });
         }
       }
-      return array
-    })
+      return array;
+    });
 
-    const btn_name=(name:string):string=>{
-      return name.split("@")[2]
-    }
-    const send_btn=(name:string)=>{
-      set?.SetBlendingOption(name,"1");
-    }
+    const btn_name = (name: string): string => {
+      return name.split("@")[2];
+    };
+    const send_btn = (name: string) => {
+      set?.SetBlendingOption(name, "1");
+    };
     return {
       btn_name,
       send_btn,
       data,
-      btn
-    }
-  }
-})
+      btn,
+    };
+  },
+});
 </script>
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5232926..e187f58 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -230,9 +230,6 @@ export default defineComponent({
     const select_configuration = ref(false)
     const del_dialog = ref(false)
     const select_configuration_name = ref("")
-    // const send_hide_desktop = () => {
-    //   set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
-    // };
     const send_disable_blending_params = () => {
       set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
     };
@@ -246,8 +243,6 @@ export default defineComponent({
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    // const hide_desktop_value_id = ref("debug@show_mask");
-    // const hide_desktop_value = ref(false);
     const disable_blending_params_id = ref("1");
     const disable_blending_params = ref(false);
     const show_blending_grids_id = ref("blending_grids_show");
@@ -333,7 +328,6 @@ export default defineComponent({
         set?.GetBlendingConfig("").then((res) => {
           let tmp = JSON.parse(res ? res.config : "");
           let local_options = [
-            // [hide_desktop_value_id, hide_desktop_value],
             [disable_blending_params_id, disable_blending_params],
             [show_blending_grids_id, show_blending_grids]
           ];
@@ -359,7 +353,6 @@ export default defineComponent({
       ''
     ]
     const apply_the_selected_configuration = () => {
-      //这里根据选择的配置 应用
       set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
         EnableBlending.value = tmp.enable;
@@ -397,14 +390,6 @@ export default defineComponent({
       set?.SaveBlendingConfig(save_cover_name.value);
       clear();
       save_cover_name.value = save_name.value = ''
-      // set?.GetBlendingConfig("").then((res) => {
-      //   let tmp = JSON.parse(res ? res.config : "");
-      //   EnableBlending.value = tmp.enable;
-      //   $store.commit("setEnablefusion", tmp.enable);
-      //   config.value.col = tmp.col;
-      //   config.value.row = tmp.row;
-      //   $store.commit("setfusion_configuration", res?.config);
-      // });
       $store.commit("setSelectedProjector", "0/0");
     }
 
@@ -429,8 +414,6 @@ export default defineComponent({
       del_scenes,
       filterFn,
       setModel,
-      // send_hide_desktop,
-      // hide_desktop_value,
       send_disable_blending_params,
       disable_blending_params,
       send_show_blending_grids,