From 5f0a10242ecb979a8093dcd75c1de7b6cabb3207 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Wed, 13 Sep 2023 17:52:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=BE=B9=E6=A1=86=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../RightSetting/BorderSetting.vue | 25 +++++++++++++------
.../BorderComponent1/index.vue | 2 +-
.../BorderComponent2/index.vue | 2 +-
data-room-ui/packages/Render/RenderCard.vue | 1 +
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
index 1528386a..d3f24695 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
@@ -5,13 +5,24 @@
:label-width="labelWidth"
label="边框"
>
- <el-button
- size="small"
- type="primary"
- @click="init"
- >
- 选择边框
- </el-button>
+ <el-input
+ v-model="config.type"
+ v-support
+ clearable
+ read-only
+ placeholder="请选择边框"
+ @focus="init"
+ >
+ <template slot="append">
+ <el-button
+ size="small"
+ type="primary"
+ @click="init"
+ >
+ 选择
+ </el-button>
+ </template>
+ </el-input>
<BorderSelect
v-model="config.type"
ref="BorderSelect"
diff --git a/data-room-ui/packages/BorderComponents/BorderComponent1/index.vue b/data-room-ui/packages/BorderComponents/BorderComponent1/index.vue
index 01b7a66f..4b9251d8 100644
--- a/data-room-ui/packages/BorderComponents/BorderComponent1/index.vue
+++ b/data-room-ui/packages/BorderComponents/BorderComponent1/index.vue
@@ -6,7 +6,7 @@
<dv-border-box-1
:id="'dataV' + config.code"
>
- <div class="element" v-if="config.border&&config.border.type" :style="`font-size:${config.border.fontSize}px;line-height:${config.border.titleHeight}px;color:${config.border.color[0]};height:${config.border.titleHeight};margin:0 0 0 20px`">{{config.title}}</div>
+ <div class="element" :style="`font-size:${config.border.fontSize}px;line-height:${config.border.titleHeight}px;color:${config.border.color[0]};height:${config.border.titleHeight};margin:0 0 0 20px`">{{config.title}}</div>
</dv-border-box-1>
</div>
</template>
diff --git a/data-room-ui/packages/BorderComponents/BorderComponent2/index.vue b/data-room-ui/packages/BorderComponents/BorderComponent2/index.vue
index 742ae2c5..c6c12a3e 100644
--- a/data-room-ui/packages/BorderComponents/BorderComponent2/index.vue
+++ b/data-room-ui/packages/BorderComponents/BorderComponent2/index.vue
@@ -7,7 +7,7 @@
:id="'dataV' + config.code"
:key="updateKey"
>
- <div class="element" v-if="config.border&&config.border.type" style="box-sizing: content-box;font-size:40px;color:#fff;height:50px;margin:20px 0 0 20px">{{config.title}}</div>
+ <div class="element" style="box-sizing: content-box;font-size:40px;color:#fff;height:50px;margin:0 0 0 20px">{{config.title}}</div>
</dv-border-box-2>
</div>
</template>
diff --git a/data-room-ui/packages/Render/RenderCard.vue b/data-room-ui/packages/Render/RenderCard.vue
index 8168468d..de639e7c 100644
--- a/data-room-ui/packages/Render/RenderCard.vue
+++ b/data-room-ui/packages/Render/RenderCard.vue
@@ -109,5 +109,6 @@ export default {
position: relative;
overflow: hidden;
box-sizing: border-box;
+ padding-bottom:20px;
}
</style>