From 86c206c3c617de6f558697617fcf6665f2ba6c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Sat, 5 Nov 2022 21:16:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=A0=87=E5=B0=BA=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E8=87=AA=E9=80=82=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/ContentConfigurations/index.vue     |  4 +-
 .../ContentEdit/components/EditRule/index.vue | 48 ++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/views/chart/ContentConfigurations/index.vue b/src/views/chart/ContentConfigurations/index.vue
index 0f8a8609..110a3c2f 100644
--- a/src/views/chart/ContentConfigurations/index.vue
+++ b/src/views/chart/ContentConfigurations/index.vue
@@ -14,7 +14,7 @@
       @collapse="collapsedHandle"
       @expand="expandHandle"
     >
-      <content-box class="go-content-layers go-boderbox" :show-top="false" :depth="2">
+      <content-box class="go-content-configurations go-boderbox" :show-top="false" :depth="2">
         <!-- 页面配置 -->
         <n-tabs v-if="!selectTarget" class="tabs-box" size="small" type="segment">
           <n-tab-pane
@@ -160,7 +160,7 @@ const chartsTabList = [
 </script>
 
 <style lang="scss" scoped>
-@include go(content-layers) {
+@include go(content-configurations) {
   overflow: hidden;
   .tabs-box {
     padding: 10px;
diff --git a/src/views/chart/ContentEdit/components/EditRule/index.vue b/src/views/chart/ContentEdit/components/EditRule/index.vue
index e297582f..2e98460f 100644
--- a/src/views/chart/ContentEdit/components/EditRule/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRule/index.vue
@@ -12,14 +12,18 @@
 </template>
 
 <script setup lang="ts">
-import { ref, toRefs, computed, watch } from 'vue'
+import { ref, toRefs, computed, watch, nextTick, onBeforeUnmount } from 'vue'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
+import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore'
 
 const chartEditStore = useChartEditStore()
+const chartLayoutStore = useChartLayoutStore()
 const designStore = useDesignStore()
 
 const { width, height } = toRefs(chartEditStore.getEditCanvasConfig)
+const { scale, lockScale } = toRefs(chartEditStore.getEditCanvas)
+const { getLayers, getCharts, getDetails } = toRefs(chartLayoutStore)
 
 const configShow = ref(true)
 
@@ -49,25 +53,47 @@ const canvasBox = () => {
   }
 }
 
-const scale = computed(() => {
-  return chartEditStore.getEditCanvas.scale
-})
-
 // 颜色
 const themeColor = computed(() => {
   return designStore.getAppTheme
 })
 
 // 处理标尺重制大小
+const ruleChangeHandle = () => {
+  configShow.value = false
+  setTimeout(() => {
+    configShow.value = true
+  })
+}
+
+const ruleChangeHandleTimeOut = () => {
+  if (lockScale.value) {
+    setTimeout(() => {
+      ruleChangeHandle()
+    }, 500)
+  }
+}
+
 watch(
   () => scale.value,
-  () => {
-    configShow.value = false
-    setTimeout(() => {
-      configShow.value = true
-    })
-  }
+  () => ruleChangeHandle()
 )
+
+watch(
+  () => getLayers.value,
+  () => ruleChangeHandleTimeOut()
+)
+
+watch(
+  () => getCharts.value,
+  () => ruleChangeHandleTimeOut()
+)
+
+watch(
+  () => getDetails.value,
+  () => ruleChangeHandleTimeOut()
+)
+
 </script>
 
 <style>