From 5d9f86aa134fb190364b4a6ff78dc9326a6c11d1 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Mon, 25 Sep 2023 17:45:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:dataV=E8=BE=B9=E6=A1=86=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BorderComponents/GcBorder1/index.vue | 7 ++++---
 data-room-ui/packages/BorderComponents/GcBorder9/index.vue | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/index.vue b/data-room-ui/packages/BorderComponents/GcBorder1/index.vue
index ae90bb29..09efc2d5 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder1/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder1/index.vue
@@ -49,8 +49,8 @@ export default {
       return this.config.border.borderMainColor ||
         this.config.border.borderSecondaryColor
         ? [
-            this.config.border.borderMainColor,
-            this.config.border.borderSecondaryColor
+            this.config.border.borderMainColor||this.config.border.borderSecondaryColor,
+            this.config.border.borderSecondaryColor||this.config.border.borderMainColor
           ]
         : null
     },
@@ -68,7 +68,7 @@ export default {
       },
       deep: true
     },
-    'config.border.gradientColor':{
+     'config.border.gradientColor':{
          handler (val) {
           this.changeColor()
       },immediate: true
@@ -149,6 +149,7 @@ export default {
   position: absolute;
   width: 100%;
   height: 100%;
+  // padding: 0 16px;
   background-color: transparent;
   border-radius: 4px;
   box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/index.vue b/data-room-ui/packages/BorderComponents/GcBorder9/index.vue
index dfb16510..c1eaf88b 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder9/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder9/index.vue
@@ -49,8 +49,8 @@ export default {
       return this.config.border.borderMainColor ||
         this.config.border.borderSecondaryColor
         ? [
-            this.config.border.borderMainColor,
-            this.config.border.borderSecondaryColor
+            this.config.border.borderMainColor||this.config.border.borderSecondaryColor,
+            this.config.border.borderSecondaryColor||this.config.border.borderMainColor
           ]
         : null
     },