dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7881 from dataease/pr@dev@fix_tab-mix

Browse Source 
Pr@dev@fix tab mix
This commit is contained in:
王嘉豪 2024-01-29 16:59:41 +08:00 committed by GitHub
commit d647b088be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/frontend/src/components/canvas/components/TextAttr.vue
View File

@ -81,7 +81,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="iconfont icon-font_size"
class="iconfont iconfont-custom icon-font_size"
/>
</el-tooltip>
@ -105,7 +105,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="iconfont icon-font"
class="iconfont iconfont-custom icon-font"
/>
</el-tooltip>
@ -129,7 +129,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-font-weight-bold"
class="icon iconfont iconfont-custom icon-font-weight-bold"
/>
</el-tooltip>
@ -154,7 +154,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-letter_spacing"
class="icon iconfont iconfont-custom icon-letter_spacing"
/>
</el-tooltip>
@ -178,7 +178,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-margin"
class="icon iconfont iconfont-custom icon-margin"
/>
</el-tooltip>
@ -202,7 +202,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-touming"
class="icon iconfont iconfont-custom icon-touming"
/>
</el-tooltip>
@ -227,7 +227,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-fangxing-"
class="icon iconfont iconfont-custom icon-fangxing-"
/>
</el-tooltip>
@ -253,7 +253,7 @@
<div style="width: 16px;height: 18px">
<el-tooltip :content="$t('panel.color')">
<i
class="icon iconfont icon-zimua"
class="icon iconfont iconfont-custom icon-zimua"
@click="goColor"
/>
</el-tooltip>
@ -275,7 +275,7 @@
<div style="width: 16px;height: 18px">
<el-tooltip :content="$t('panel.border_color')">
<i
class="iconfont icon-huabi"
class="iconfont iconfont-custom icon-huabi"
@click="goBoardColor"
/>
</el-tooltip>
@ -298,7 +298,7 @@
<div style="width: 16px;height: 18px">
<el-tooltip :content="$t('panel.background_color')">
<i
class="iconfont icon-beijingse1"
class="iconfont iconfont-custom icon-beijingse1"
@click="goBackgroundColor"
/>
</el-tooltip>
@ -466,34 +466,34 @@ export default {
initFontSize: 12,
initActiveFontSize: 18,
miniFontSize: 12,
maxFontSize: 256,
maxFontSize: 48,
textAlignOptions: [
{
icon: 'iconfont icon-juzuo',
icon: 'iconfont iconfont-custom icon-juzuo',
tooltip: this.$t('panel.text_align_left'),
label: 'left'
},
{
icon: 'iconfont icon-align-center',
icon: 'iconfont iconfont-custom icon-align-center',
tooltip: this.$t('panel.text_align_center'),
label: 'center'
},
{
icon: 'iconfont icon-juyou',
icon: 'iconfont iconfont-custom icon-juyou',
tooltip: this.$t('panel.text_align_right'),
label: 'right'
}
],
lineStyle: [{
icon: 'iconfont icon-solid_line',
icon: 'iconfont iconfont-custom icon-solid_line',
value: 'solid',
label: '实线'
}, {
icon: 'iconfont icon-xuxian',
icon: 'iconfont iconfont-custom icon-xuxian',
value: 'dashed',
label: '虚线'
}, {
icon: 'iconfont icon-dianxian',
icon: 'iconfont iconfont-custom icon-dianxian',
value: 'dotted',
label: '点线'
}],
@ -802,4 +802,9 @@ export default {
-moz-appearance: textfield !important;
}
div {
line-height: 24px;
font-size: 16px;
}
</style>

4
core/frontend/src/components/widget/deWidget/DeTabs.vue
View File

@ -74,7 +74,7 @@
/>
<div
v-if="item.content && item.content.type==='canvas' && (!isEdit || mobileLayoutStatus)"
style="width: 100%;height:100%"
style="width: 100%;height:100%;font-size: initial"
>
<Preview
:ref="'canvasTabRef-'+item.name"
@ -512,7 +512,7 @@ export default {
this.$nextTick(() => {
if (this.element.options.tabList.length > 1) {
const containerDom = document.getElementById('tab-' + this.element.options.tabList[this.element.options.tabList.length - 1].name)
this.tabsAreaScroll = containerDom.parentNode.scrollWidth > containerDom.parentNode.parentNode.scrollWidth
this.tabsAreaScroll = containerDom.parentNode.scrollWidth >= containerDom.parentNode.parentNode.scrollWidth
} else {
this.tabsAreaScroll = false
}