fix:翻牌器添加字体样式

main
liu.shiyi 1 year ago
parent c617aac061
commit 39ecf2ce6b

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

@ -27,13 +27,15 @@
<div class="lc-field-body"> <div class="lc-field-body">
<PosWhSetting :config="config" /> <PosWhSetting :config="config" />
</div> </div>
<SettingTitle v-if="config.border"></SettingTitle> <SettingTitle v-if="config.border">
边框
</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<BorderSetting <BorderSetting
v-if="config.border" v-if="config.border"
label-width="100px" label-width="100px"
:config="config.border" :config="config.border"
:bigTitle='config.title' :big-title="config.title"
/> />
</div> </div>
<SettingTitle>旋转</SettingTitle> <SettingTitle>旋转</SettingTitle>
@ -66,6 +68,23 @@
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </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-form-item label="卡片宽度">
<el-input-number <el-input-number
v-model="config.customize.width" v-model="config.customize.width"
@ -104,7 +123,7 @@
:step="1" :step="1"
/> />
</el-form-item> </el-form-item>
<el-form-item label="卡片边框"> <el-form-item label="边框宽度">
<el-input-number <el-input-number
v-model="config.customize.borderWidth" v-model="config.customize.borderWidth"
class="bs-el-input-number" 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 BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.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 { export default {
name: 'BarSetting', name: 'BarSetting',
components: { components: {
@ -177,6 +197,7 @@ export default {
}, },
data () { data () {
return { return {
fontFamilyList: fontList,
// //
predefineThemeColors: predefineColors predefineThemeColors: predefineColors
} }

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

Loading…
Cancel
Save