Merge pull request #3880 from dataease/pr@dev@refactor_tool-bar

refactor: 优化悬浮工具栏最小字体
This commit is contained in:
Junjun 2022-11-25 16:56:24 +08:00 committed by GitHub
commit 1b874fabca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,7 +24,7 @@
> >
<el-tooltip :content="item.tooltip"> <el-tooltip :content="item.tooltip">
<span style="float: left;"> <span style="float: left;">
<i :class="item.icon" /> <i :class="item.icon"/>
</span> </span>
</el-tooltip> </el-tooltip>
</el-radio-button> </el-radio-button>
@ -47,7 +47,7 @@
:value="item.value" :value="item.value"
> >
<span style="float: left;"> <span style="float: left;">
<i :class="item.icon" /> <i :class="item.icon"/>
</span> </span>
<span style="float: right; color: #8492a6; font-size: 12px">{{ item.label }}</span> <span style="float: right; color: #8492a6; font-size: 12px">{{ item.label }}</span>
</el-option> </el-option>
@ -100,7 +100,7 @@
</div> </div>
<el-tooltip <el-tooltip
v-if="attrShow('fontSize')" v-if="attrShow('activeFontSize')"
:content="$t('panel.active_font_size')" :content="$t('panel.active_font_size')"
> >
<i <i
@ -257,7 +257,7 @@
@click="goColor" @click="goColor"
/> />
</el-tooltip> </el-tooltip>
<div :style="letterDivColor" /> <div :style="letterDivColor"/>
<el-color-picker <el-color-picker
ref="colorPicker" ref="colorPicker"
v-model="styleInfo.color" v-model="styleInfo.color"
@ -279,7 +279,7 @@
@click="goBoardColor" @click="goBoardColor"
/> />
</el-tooltip> </el-tooltip>
<div :style="boardDivColor" /> <div :style="boardDivColor"/>
<el-color-picker <el-color-picker
ref="boardColorPicker" ref="boardColorPicker"
v-model="styleInfo.borderColor" v-model="styleInfo.borderColor"
@ -302,7 +302,7 @@
@click="goBackgroundColor" @click="goBackgroundColor"
/> />
</el-tooltip> </el-tooltip>
<div :style="backgroundDivColor" /> <div :style="backgroundDivColor"/>
<el-color-picker <el-color-picker
ref="backgroundColorPicker" ref="backgroundColorPicker"
v-model="styleInfo.backgroundColor" v-model="styleInfo.backgroundColor"
@ -318,7 +318,7 @@
style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;"
> >
<el-tooltip :content="$t('panel.video_info')"> <el-tooltip :content="$t('panel.video_info')">
<VideoLinks :link-info="curComponent.videoLinks" /> <VideoLinks :link-info="curComponent.videoLinks"/>
</el-tooltip> </el-tooltip>
</div> </div>
@ -327,7 +327,7 @@
style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;"
> >
<el-tooltip :content="$t('panel.stream_media_info')"> <el-tooltip :content="$t('panel.stream_media_info')">
<StreamMediaLinks :link-info="curComponent.streamMediaLinks" /> <StreamMediaLinks :link-info="curComponent.streamMediaLinks"/>
</el-tooltip> </el-tooltip>
</div> </div>
@ -336,7 +336,7 @@
style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;"
> >
<el-tooltip :content="$t('panel.web_addr')"> <el-tooltip :content="$t('panel.web_addr')">
<FrameLinks :link-info="curComponent.frameLinks" /> <FrameLinks :link-info="curComponent.frameLinks"/>
</el-tooltip> </el-tooltip>
</div> </div>
<div <div
@ -356,7 +356,7 @@
style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;" style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;"
> >
<el-tooltip :content="$t('panel.tab_inner_style')"> <el-tooltip :content="$t('panel.tab_inner_style')">
<tab-style :style-info="styleInfo" /> <tab-style :style-info="styleInfo"/>
</el-tooltip> </el-tooltip>
</div> </div>
@ -465,7 +465,7 @@ export default {
mainWidthOffset: 600, mainWidthOffset: 600,
initFontSize: 12, initFontSize: 12,
initActiveFontSize: 18, initActiveFontSize: 18,
miniFontSize: 0, miniFontSize: 12,
maxFontSize: 128, maxFontSize: 128,
textAlignOptions: [ textAlignOptions: [
{ {