From 17b91ca8eef3393544d828f031e500386659e422 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 13:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B89=E7=82=B9=E6=A0=A1=E6=AD=A37?=
 =?UTF-8?q?-9=E7=82=B9=E4=B8=BA=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FusionLocale.vue           | 26 +++++++++++++------
 .../FusionSettings/SurfaceCorrection.vue      |  9 ++++---
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index c845938..67fdb46 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -387,7 +387,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
-        if (auto_sync.value) left_right_auto_add(newVal - oldVal);
+        if (auto_sync.value) left_right_auto_add(newVal);
         save_set_cache();
       },
       { deep: true }
@@ -403,7 +403,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
-        if (auto_sync.value) left_right_auto_add(newVal - oldVal);
+        if (auto_sync.value) left_right_auto_add(newVal);
         save_set_cache();
       },
       { deep: true }
@@ -451,7 +451,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
-        if (auto_sync.value) left_right_auto_add(0);
+        if (auto_sync.value) left_right_auto_add(-1);
         save_set_cache();
       },
       { deep: true }
@@ -467,7 +467,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
-        if (auto_sync.value) left_right_auto_add(0);
+        if (auto_sync.value) left_right_auto_add(-1);
         save_set_cache();
       },
       { deep: true }
@@ -527,8 +527,13 @@ export default defineComponent({
           set_cache_tmp = tmp
         }
         if (ste_status.value == 0) {
-          set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
-          set_cache_tmp[1].isshow = array[2].isshow
+          //set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
+
+          if(difference==-1){
+            set_cache_tmp[1].isshow = array[2].isshow
+          }else{
+            set_cache_tmp[1].value = difference
+          }
           set?.SetBlendingOverlap(0, 1, 0, set_cache_tmp[1].isshow, Number(set_cache_tmp[1].value));
           set_cache.value[1] = JSON.stringify(set_cache_tmp);
         }
@@ -546,8 +551,13 @@ export default defineComponent({
           set_cache_tmp = tmp
         }
         if (ste_status.value == 0) {
-          set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
-          set_cache_tmp[2].isshow = array[1].isshow
+          //set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
+
+          if(difference==-1){
+            set_cache_tmp[2].isshow = array[1].isshow
+          }else{
+            set_cache_tmp[2].value = difference
+          }
           set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
           set_cache.value[0] = JSON.stringify(set_cache_tmp);
         }
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 7c4a83a..1037a5d 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -339,8 +339,9 @@ export default defineComponent({
       let y = Math.abs(
         Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y)
       );
+      if(data.top>ninepostion.value[6].y)y= Math.ceil((ninepostion.value[6].y-data.top ) * Proportion.value.y)
       nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      nine[6].y = y > config.height ? config.height : y;
       save_set_cache();
     };
     const moveHandler_8 = (data: any) => {
@@ -350,8 +351,9 @@ export default defineComponent({
       let y = Math.abs(
         Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y)
       );
+      if(data.top>ninepostion.value[7].y)y= Math.ceil((ninepostion.value[7].y-data.top ) * Proportion.value.y)
       nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      nine[7].y = y > config.height ? config.height : y ;
       save_set_cache();
     };
     const moveHandler_9 = (data: any) => {
@@ -361,8 +363,9 @@ export default defineComponent({
       let y = Math.abs(
         Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y)
       );
+      if(data.top>ninepostion.value[8].y)y= Math.ceil((ninepostion.value[8].y-data.top ) * Proportion.value.y)
       nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      nine[8].y = y > config.height ? config.height : y ;
       save_set_cache();
     };