Ver código fonte

fix:翻牌器添加字体样式

liu.shiyi 1 ano atrás
pai
commit
39ecf2ce6b

+ 1 - 0
data-room-ui/packages/BasicComponents/DigitalFlop/index.vue

@@ -9,6 +9,7 @@
         :key="index"
         class="content_item"
         :style="{
+          'font-family': option.fontFamily,
           'border-color': option.borderColor,
           'border-width': option.borderWidth + 'px',
           'background-color': option.bgColor,

+ 26 - 5
data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue

@@ -27,16 +27,18 @@
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
           </div>
-           <SettingTitle v-if="config.border">边框</SettingTitle>
+          <SettingTitle v-if="config.border">
+            边框
+          </SettingTitle>
           <div class="lc-field-body">
             <BorderSetting
               v-if="config.border"
               label-width="100px"
               :config="config.border"
-              :bigTitle='config.title'
+              :big-title="config.title"
             />
           </div>
-         <SettingTitle>旋转</SettingTitle>
+          <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">
             <RotateSetting
               :config="config"
@@ -66,6 +68,23 @@
                 :predefine="predefineThemeColors"
               />
             </el-form-item>
+            <el-form-item
+              label="字体类型"
+              label-width="100px"
+            >
+              <el-select
+                v-model="config.customize.fontFamily"
+                popper-class="bs-el-select"
+                class="bs-el-select"
+              >
+                <el-option
+                  v-for="item in fontFamilyList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="卡片宽度">
               <el-input-number
                 v-model="config.customize.width"
@@ -104,7 +123,7 @@
                 :step="1"
               />
             </el-form-item>
-            <el-form-item label="卡片边框">
+            <el-form-item label="边框宽度">
               <el-input-number
                 v-model="config.customize.borderWidth"
                 class="bs-el-input-number"
@@ -165,7 +184,8 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.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 fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'BarSetting',
   components: {
@@ -177,6 +197,7 @@ export default {
   },
   data () {
     return {
+      fontFamilyList: fontList,
       // 预设主题色
       predefineThemeColors: predefineColors
     }

+ 2 - 1
data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js

@@ -58,7 +58,8 @@ const customConfig = {
     marginRight: 20,
     numberDigits: 5,
     placeHolder: '0',
-    height: 125
+    height: 125,
+    fontFamily: ''
   }
 }
 export const dataConfig = {