From 6185ea544dca750bcc52460e720afe4523d75fcd Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 1 Nov 2022 10:42:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=87=E9=A2=98=E4=B8=8D=E8=83=BD=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponentG2.vue      | 4 ++--
 frontend/src/views/chart/components/ChartComponentS2.vue      | 4 ++--
 frontend/src/views/chart/components/ChartTitleUpdate.vue      | 2 +-
 frontend/src/views/chart/components/normal/LabelNormal.vue    | 4 ++--
 .../src/views/chart/components/normal/LabelNormalText.vue     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue
index fe9cca5dfa..c0b4fcbf8f 100644
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -18,11 +18,11 @@
       :style="title_class"
       style="cursor: default;display: block;"
     >
-      <div style="padding:6px 4px 0;margin: 0;display: flex;">
+      <div style="padding:6px 4px 0;margin: 0;">
         <chart-title-update :chart-info="chartInfo" />
         <title-remark
           v-if="remarkCfg.show"
-          style="text-shadow: none!important;"
+          style="text-shadow: none!important;margin-left: 4px;"
           :remark-cfg="remarkCfg"
         />
       </div>
diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index 5729228c25..caf1e6a9bd 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -18,11 +18,11 @@
       :style="title_class"
       style="cursor: default;display: block;"
     >
-      <div style="padding:6px 4px 0;margin: 0;display: flex;">
+      <div style="padding:6px 4px 0;margin: 0;">
         <chart-title-update :chart-info="chartInfo" />
         <title-remark
           v-if="remarkCfg.show"
-          style="text-shadow: none!important;"
+          style="text-shadow: none!important;margin-left: 4px;"
           :remark-cfg="remarkCfg"
         />
       </div>
diff --git a/frontend/src/views/chart/components/ChartTitleUpdate.vue b/frontend/src/views/chart/components/ChartTitleUpdate.vue
index 334c4d53bf..6470e26293 100644
--- a/frontend/src/views/chart/components/ChartTitleUpdate.vue
+++ b/frontend/src/views/chart/components/ChartTitleUpdate.vue
@@ -11,7 +11,7 @@
   />
   <p
     v-else
-    style="overflow: hidden;white-space: pre;text-overflow: ellipsis;display: inline-block;min-width: 30px"
+    style="overflow: hidden;white-space: pre;text-overflow: ellipsis;display: inline;min-width: 30px"
     @click.stop="handleTitleEditer"
   >{{ chart.title }}</p>
 </template>
diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue
index a83de2a35a..0ebe162b6a 100644
--- a/frontend/src/views/chart/components/normal/LabelNormal.vue
+++ b/frontend/src/views/chart/components/normal/LabelNormal.vue
@@ -10,11 +10,11 @@
       :style="title_class"
       style="cursor: default;display: block;"
     >
-      <div style="display: flex;">
+      <div>
         <chart-title-update :chart-info="chartInfo" />
         <title-remark
           v-if="chart.render && chart.render === 'antv' && remarkCfg.show"
-          style="text-shadow: none!important;"
+          style="text-shadow: none!important;margin-left: 4px;"
           :remark-cfg="remarkCfg"
         />
       </div>
diff --git a/frontend/src/views/chart/components/normal/LabelNormalText.vue b/frontend/src/views/chart/components/normal/LabelNormalText.vue
index a334114921..693d747dc2 100644
--- a/frontend/src/views/chart/components/normal/LabelNormalText.vue
+++ b/frontend/src/views/chart/components/normal/LabelNormalText.vue
@@ -17,11 +17,11 @@
       :style="title_class"
       style="cursor: default;display: block;"
     >
-      <div style="display: flex;">
+      <div>
         <chart-title-update :chart-info="chartInfo" />
         <title-remark
           v-if="chart.render && chart.render === 'antv' && remarkCfg.show"
-          style="text-shadow: none!important;"
+          style="text-shadow: none!important;margin-left: 4px;"
           :remark-cfg="remarkCfg"
         />
       </div>

From 16da32b17ce48215bd097f9c770150a59857453f Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 1 Nov 2022 10:49:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=87=E9=A2=98=E4=B8=8D=E8=83=BD=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/component-style/TitleSelector.vue  | 4 ++--
 .../chart/components/component-style/TitleSelectorAntV.vue    | 4 ++--
 .../src/views/panel/SubjectSetting/PanelStyle/ViewTitle.vue   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue
index b674de0668..d5691cc72e 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelector.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue
@@ -12,10 +12,10 @@
           :label="$t('chart.show')"
           class="form-item"
         >
-          <el-switch
+          <el-checkbox
             v-model="titleForm.show"
             @change="changeTitleStyle('show')"
-          />
+          >{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <div v-show="showProperty('show') && titleForm.show">
           <el-form-item
diff --git a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
index f396c9288b..3168fe96f8 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
@@ -12,10 +12,10 @@
           :label="$t('chart.show')"
           class="form-item"
         >
-          <el-switch
+          <el-checkbox
             v-model="titleForm.show"
             @change="changeTitleStyle('show')"
-          />
+          >{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <div v-show="showProperty('show') && titleForm.show">
           <el-form-item
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/ViewTitle.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/ViewTitle.vue
index 83b58ae6dd..9e874e140f 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/ViewTitle.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/ViewTitle.vue
@@ -11,10 +11,10 @@
           :label="$t('chart.show')"
           class="form-item"
         >
-          <el-switch
+          <el-checkbox
             v-model="titleForm.show"
             @change="changeTitleStyle('show')"
-          />
+          >{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <div v-show="titleForm.show">
           <el-form-item