From 7d3a6cb0a22466fc40a2468fa3e96af68e087a5e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 31 Oct 2022 11:01:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=BB=84=E4=BB=B6):=20Tab=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/TextAttr.vue |  3 ++-
 .../src/components/widget/DeWidget/DeTabs.vue | 24 +++++++++++++++++--
 .../components/widget/DeWidget/TabStyle.vue   | 18 ++++++++++----
 frontend/src/lang/en.js                       |  3 ++-
 frontend/src/lang/tw.js                       |  3 ++-
 frontend/src/lang/zh.js                       |  3 ++-
 frontend/src/views/chart/chart/chart.js       | 10 ++++----
 frontend/src/views/panel/panel.js             |  5 ++--
 8 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 20a9bacfa8..981cff69f9 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -414,9 +414,10 @@ import StreamMediaLinks from '@/components/canvas/components/Editor/StreamMediaL
 import DateFormat from '@/components/canvas/components/Editor/DateFormat'
 import { COLOR_PANEL } from '@/views/chart/chart/chart'
 import FrameLinks from '@/components/canvas/components/Editor/FrameLinks'
+import TitlePosition from '@/components/widget/DeWidget/TitlePosition'
 
 export default {
-  components: { FrameLinks, DateFormat, VideoLinks, StreamMediaLinks },
+  components: { TitlePosition, FrameLinks, DateFormat, VideoLinks, StreamMediaLinks },
   props: {
     canvasId: {
       type: String,
diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index b97cd577fd..4fd91f9569 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="de-tabs-div">
-
+  <div
+    class="de-tabs-div"
+    :class="heatClass"
+  >
     <dataease-tabs
       v-model="activeTabName"
       type="card"
@@ -293,6 +295,9 @@ export default {
     }
   },
   computed: {
+    heatClass() {
+      return 'tab-head-' + this.element.style.headPosition
+    },
     curCanvasScaleSelf() {
       return this.curCanvasScaleMap[this.canvasId]
     },
@@ -634,5 +639,20 @@ export default {
 .canvas_move_in {
   border-color: blueviolet;
 }
+::v-deep .el-tabs__nav{
+  width: 100%;
+}
+.tab-head-left ::v-deep .el-tabs__nav{
+  width: 100%;
+  text-align: left;
+}
+.tab-head-right ::v-deep .el-tabs__nav{
+  width: 100%;
+  text-align: right;
+}
+.tab-head-center ::v-deep .el-tabs__nav{
+  width: 100%;
+  text-align: center;
+}
 
 </style>
diff --git a/frontend/src/components/widget/DeWidget/TabStyle.vue b/frontend/src/components/widget/DeWidget/TabStyle.vue
index 5c21b2029b..a95cdae96b 100644
--- a/frontend/src/components/widget/DeWidget/TabStyle.vue
+++ b/frontend/src/components/widget/DeWidget/TabStyle.vue
@@ -8,7 +8,7 @@
       ref="tabsStyleForm"
       :model="styleInfo"
       size="small"
-      class="demo-form-inline"
+      class="de-form-item"
     >
       <el-form-item
         label="头部字体颜色"
@@ -102,8 +102,17 @@
           </el-input>
         </div>
       </el-form-item>
+      <el-form-item :label="$t('detabs.head_position')">
+        <el-radio-group
+          v-model="styleInfo.headPosition"
+          size="mini"
+        >
+          <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>
+          <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>
+          <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
-
     <i
       slot="reference"
       class="iconfont icon-tabs"
@@ -114,6 +123,7 @@
 
 <script>
 import { mapState } from 'vuex'
+
 export default {
   name: 'TabStyle',
   props: {
@@ -123,9 +133,7 @@ export default {
     }
   },
   data() {
-    return {
-
-    }
+    return {}
   },
   computed: {
 
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index db216eed33..03c032e687 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -534,7 +534,8 @@ export default {
     selectview: 'Select View',
     selectOthers: 'Select Others',
     availableComponents: 'Available Components',
-    please: 'Please'
+    please: 'Please',
+    head_position: 'Head Position'
   },
   example: {
     warning: 'Creating and editing pages cannot be cached by keep-alive because keep-alive include does not currently support caching based on routes, so it is currently cached based on component name. If you want to achieve a similar caching effect, you can use a browser caching scheme such as localStorage. Or do not use keep-alive include to cache all pages directly. See details'
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 5b22d42f9d..af54180706 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -534,7 +534,8 @@ export default {
     selectview: '選擇視圖',
     selectOthers: '選擇組件',
     availableComponents: '可選組件',
-    please: '未'
+    please: '未',
+    head_position: '頭部位置'
   },
   example: {
     warning: '創建和編輯頁面是不能被 keep-alive 緩存的，因爲keep-alive 的 include 目前不支持根據路由來緩存，所以目前都是基於 component name 來進行緩存的。如果妳想類似的實現緩存效果，可以使用 localStorage 等瀏覽器緩存方案。或者不要使用 keep-alive 的 include，直接緩存所有頁面。詳情見'
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 71ae979218..3c0e1809ae 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -533,7 +533,8 @@ export default {
     selectview: '选择视图',
     selectOthers: '选择组件',
     availableComponents: '可选组件',
-    please: '未'
+    please: '未',
+    head_position: '头部位置'
   },
   example: {
     warning: '创建和编辑页面是不能被 keep-alive 缓存的，因为keep-alive 的 include 目前不支持根据路由来缓存，所以目前都是基于 component name 来进行缓存的。如果你想类似的实现缓存效果，可以使用 localStorage 等浏览器缓存方案。或者不要使用 keep-alive 的 include，直接缓存所有页面。详情见'
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 1a9a2cd68a..2ff280ca1a 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -1,15 +1,17 @@
 export const DEFAULT_TAB_COLOR_CASE_DARK = {
   headFontColor: '#FFFFFF',
   headFontActiveColor: '#FFFFFF',
-  headBorderColor: '',
-  headBorderActiveColor: ''
+  headBorderColor: '#FFFFFF',
+  headBorderActiveColor: '#FFFFFF',
+  headPosition: 'left'
 }
 
 export const DEFAULT_TAB_COLOR_CASE_LIGHT = {
   headFontColor: '#OOOOOO',
   headFontActiveColor: '#OOOOOO',
-  headBorderColor: '',
-  headBorderActiveColor: ''
+  headBorderColor: '#OOOOOO',
+  headBorderActiveColor: '#OOOOOO',
+  headPosition: 'left'
 }
 
 export const DEFAULT_COLOR_CASE = {
diff --git a/frontend/src/views/panel/panel.js b/frontend/src/views/panel/panel.js
index 66ae68688f..12d121c09e 100644
--- a/frontend/src/views/panel/panel.js
+++ b/frontend/src/views/panel/panel.js
@@ -5,8 +5,9 @@ import { COMMON_BACKGROUND_BASE } from '@/components/canvas/custom-component/com
 export const TAB_COMMON_STYLE = {
   headFontColor: '#000000',
   headFontActiveColor: '#000000',
-  headBorderColor: null,
-  headBorderActiveColor: null
+  headBorderColor: '#ffffff',
+  headBorderActiveColor: '#ffffff',
+  headPosition: 'left'
 }
 
 export const FILTER_COMMON_STYLE = {