From fbb2367693bce65d920943e0df3cf043ae2a371b Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 13 Nov 2023 13:42:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E8=A7=86=E5=9B=BE=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E7=9A=84=E5=A4=87=E6=B3=A8=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20#6207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/ChartComponentG2.vue  | 12 ++++++++++++
 .../src/views/chart/components/ChartComponentS2.vue  |  4 ++++
 core/frontend/src/views/chart/view/TitleRemark.vue   |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/core/frontend/src/views/chart/components/ChartComponentG2.vue b/core/frontend/src/views/chart/components/ChartComponentG2.vue
index ce70e53ed4..91d200ec47 100644
--- a/core/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/core/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -15,6 +15,7 @@
       v-if="chart.type && antVRenderStatus"
       v-show="title_show"
       ref="title"
+      :class="titleIsRight"
       :style="title_class"
       style="cursor: default;display: block;"
     >
@@ -135,6 +136,9 @@ export default {
     trackBarStyleTime() {
       return this.trackBarStyle
     },
+    titleIsRight() {
+      return this.title_class?.textAlign === 'right' && 'title-is-right'
+    },
     bg_class() {
       return {
         borderRadius: this.borderRadius
@@ -477,4 +481,12 @@ export default {
     position: fixed !important;
   }
 }
+
+.fullscreen {
+  .g2-container {
+    ::v-deep .g2-tooltip {
+      position: absolute !important;
+    }
+  }
+}
 </style>
diff --git a/core/frontend/src/views/chart/components/ChartComponentS2.vue b/core/frontend/src/views/chart/components/ChartComponentS2.vue
index 66120b643e..36a328682b 100644
--- a/core/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/core/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -14,6 +14,7 @@
     <span
       v-if="chart.type"
       v-show="title_show"
+      :class="titleIsRight"
       ref="title"
       :style="title_class"
       style="cursor: default;display: block;"
@@ -184,6 +185,9 @@ export default {
   },
 
   computed: {
+    titleIsRight() {
+      return this.title_class?.textAlign === 'right' && 'title-is-right'
+    },
     scale() {
       return this.previewCanvasScale.scalePointWidth
     },
diff --git a/core/frontend/src/views/chart/view/TitleRemark.vue b/core/frontend/src/views/chart/view/TitleRemark.vue
index 49df7b105c..4738bd98e8 100644
--- a/core/frontend/src/views/chart/view/TitleRemark.vue
+++ b/core/frontend/src/views/chart/view/TitleRemark.vue
@@ -81,4 +81,7 @@ export default {
   top: 22px !important;
   left: auto !important;
 }
+.title-is-right .el-popover.remark-pop {
+  right: 0;
+}
 </style>