소스 검색

feat:边框功能优化

liu.tao3 1 년 전
부모
커밋
5f0a10242e

+ 18 - 7
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"

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 0
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>