From e6b657e435b8c7408d1ede81136d4918a0f4cf96 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Thu, 9 Nov 2023 15:34:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E8=BE=B9=E6=A1=8614?=
 =?UTF-8?q?=E3=80=8115=E7=9A=84=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/Borders/Border14/setting.vue     | 56 +++++++++-------
 .../packages/Borders/Border15/setting.vue     | 65 ++++++++++---------
 2 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/data-room-ui/packages/Borders/Border14/setting.vue b/data-room-ui/packages/Borders/Border14/setting.vue
index 9d41e1d7..7409aab0 100644
--- a/data-room-ui/packages/Borders/Border14/setting.vue
+++ b/data-room-ui/packages/Borders/Border14/setting.vue
@@ -7,27 +7,35 @@
       label-position="left"
       class="setting-body bs-el-form"
     >
-      <div class="lc-field-body">
-        <slot name="top" />
-        <el-form
-          :model="config.customize"
-          label-position="left"
-          class="setting-body bs-el-form"
-          label-width="90px"
+      <slot name="top" />
+      <el-form
+        :model="config.customize"
+        label-position="left"
+        class="setting-body bs-el-form"
+        label-width="90px"
+      >
+        <SettingTitle>标题</SettingTitle>
+        <el-form-item
+          label="边框名称"
+          class="lc-field-body"
         >
-          <el-form-item label="边框名称">
-            <el-input
-              v-model="config.title"
-              clearable
-            />
-          </el-form-item>
+          <el-input
+            v-model="config.title"
+            clearable
+          />
+        </el-form-item>
+        <SettingTitle>位置</SettingTitle>
+        <div class="lc-field-body">
           <PosWhSetting :config="config" />
-          <SettingTitle>旋转</SettingTitle>
-          <div class="lc-field-body">
-            <RotateSetting
-              :config="config"
-            />
-          </div>
+        </div>
+        <SettingTitle>旋转</SettingTitle>
+        <div class="lc-field-body">
+          <RotateSetting
+            :config="config"
+          />
+        </div>
+        <SettingTitle>基础</SettingTitle>
+        <div class="lc-field-body">
           <el-form-item label="边框线颜色">
             <ColorPicker
               v-model="config.customize.borderColor"
@@ -105,8 +113,8 @@
             />
           </el-form-item>
           <slot name="bottom" />
-        </el-form>
-      </div>
+        </div>
+      </el-form>
     </el-form>
   </div>
 </template>
@@ -114,13 +122,15 @@
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
-import {predefineColors} from 'data-room-ui/js/utils/colorList'
+import { predefineColors } from 'data-room-ui/js/utils/colorList'
+import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 export default {
   name: 'Border14Setting',
   components: {
     ColorPicker,
     PosWhSetting,
-    RotateSetting
+    RotateSetting,
+    SettingTitle
   },
   props: {
     config: {
diff --git a/data-room-ui/packages/Borders/Border15/setting.vue b/data-room-ui/packages/Borders/Border15/setting.vue
index 1758f3fe..6d049891 100644
--- a/data-room-ui/packages/Borders/Border15/setting.vue
+++ b/data-room-ui/packages/Borders/Border15/setting.vue
@@ -7,34 +7,39 @@
       label-position="left"
       class="setting-body bs-el-form"
     >
-      <div class="lc-field-body">
-        <slot name="top" />
-        <el-form
-          :model="config.customize"
-          label-position="left"
-          class="setting-body bs-el-form"
-          label-width="90px"
-        >
-          <el-form-item label="边框名称">
-            <el-input
-              v-model="config.title"
-              clearable
-            />
-          </el-form-item>
+      <slot name="top" />
+      <el-form
+        :model="config.customize"
+        label-position="left"
+        class="setting-body bs-el-form"
+        label-width="90px"
+      >
+        <SettingTitle>标题</SettingTitle>
+        <el-form-item label="边框名称"   class="lc-field-body">
+          <el-input
+            v-model="config.title"
+            clearable
+          />
+        </el-form-item>
+        <SettingTitle>位置</SettingTitle>
+        <div class="lc-field-body">
           <PosWhSetting :config="config" />
-          <SettingTitle>旋转</SettingTitle>
-          <div class="lc-field-body">
-            <RotateSetting
-              :config="config"
-            />
-          </div>
-          <el-form-item label="文本">
-            <el-input
-              v-model="config.customize.text"
-              clearable
-            />
-          </el-form-item>
-        </el-form>
+        </div>
+        <SettingTitle>旋转</SettingTitle>
+        <div class="lc-field-body">
+          <RotateSetting
+            :config="config"
+          />
+        </div>
+      </el-form>
+      <SettingTitle>基础</SettingTitle>
+      <div class="lc-field-body">
+        <el-form-item label="文本">
+          <el-input
+            v-model="config.customize.text"
+            clearable
+          />
+        </el-form-item>
         <el-form-item label="边框线颜色">
           <ColorPicker
             v-model="config.customize.borderColor"
@@ -116,10 +121,12 @@
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
-import {predefineColors} from "data-room-ui/js/utils/colorList";
+import { predefineColors } from 'data-room-ui/js/utils/colorList'
+import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 export default {
   name: 'Border14Setting',
   components: {
+    SettingTitle,
     ColorPicker,
     PosWhSetting,
     RotateSetting
@@ -129,7 +136,7 @@ export default {
       type: Object,
       required: true
     },
-     predefineThemeColors: {
+    predefineThemeColors: {
       type: Array,
       default: () => predefineColors
     }