Merge pull request #13018 from dataease/pr@dev-v2@refact_font
Pr@dev v2@refact font
This commit is contained in:
commit
370c50cba6
@ -620,15 +620,7 @@ const marginRight = computed<CSSProperties>(() => {
|
||||
})
|
||||
|
||||
const autoStyle = computed(() => {
|
||||
return {
|
||||
position: 'absolute',
|
||||
height: 100 / scale.value + '%!important',
|
||||
width: 100 / scale.value + '%!important',
|
||||
left: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2
|
||||
top: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2
|
||||
transform: 'scale(' + scale.value + ') translateZ(0)',
|
||||
opacity: element.value?.style?.opacity || 1
|
||||
} as CSSProperties
|
||||
return { zoom: scale.value }
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
@ -604,12 +604,7 @@ onBeforeUnmount(() => {
|
||||
})
|
||||
|
||||
const autoStyle = computed(() => {
|
||||
return {
|
||||
height: 20 * scale.value + 8 + 'px',
|
||||
width: 100 / scale.value + '%!important',
|
||||
left: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2
|
||||
transform: 'scale(' + scale.value + ') translateZ(0)'
|
||||
}
|
||||
return { zoom: scale.value }
|
||||
})
|
||||
|
||||
const autoHeightStyle = computed(() => {
|
||||
|
||||
@ -313,44 +313,46 @@ const save = () => {
|
||||
<el-tab-pane label="组件样式" name="componentStyle"> </el-tab-pane>
|
||||
<el-tab-pane label="整体样式" name="style"> </el-tab-pane>
|
||||
</el-tabs>
|
||||
<div class="config-mobile-tab" v-show="activeCollapse === 'style'">
|
||||
<MobileBackgroundSelector @styleChange="changeTimes++"></MobileBackgroundSelector>
|
||||
</div>
|
||||
<div class="config-mobile-tab-style" v-show="activeCollapse === 'componentStyle'">
|
||||
<component-style-editor
|
||||
:canvas-view-info-mobile="canvasViewInfoMobile"
|
||||
></component-style-editor>
|
||||
</div>
|
||||
<div class="config-mobile-tab" v-show="activeCollapse === 'com'">
|
||||
<div
|
||||
:style="{ height: '198px', width: '198px' }"
|
||||
class="mobile-wrapper-inner-adaptor"
|
||||
v-for="item in componentDataNotInMobile"
|
||||
:key="item.id"
|
||||
>
|
||||
<div class="component-outer">
|
||||
<ComponentWrapper
|
||||
v-show="item.isShow"
|
||||
canvas-id="canvas-main"
|
||||
:canvas-style-data="canvasStyleData"
|
||||
:dv-info="dvInfo"
|
||||
:canvas-view-info="canvasViewInfoMobile"
|
||||
:view-info="canvasViewInfoMobile[item.id]"
|
||||
:config="item"
|
||||
:style="getComponentStyleDefault()"
|
||||
show-position="preview"
|
||||
:search-count="0"
|
||||
:scale="80"
|
||||
/>
|
||||
</div>
|
||||
<div class="mobile-com-mask" @click="addToMobile(item)">
|
||||
<span v-show="item.component === 'DeStreamMedia'" style="color: #909399"
|
||||
>IOS可能无法显示</span
|
||||
>
|
||||
</div>
|
||||
<div class="pc-select-to-mobile" @click="addToMobile(item)" v-if="!mobileLoading"></div>
|
||||
<template v-if="!mobileLoading">
|
||||
<div class="config-mobile-tab" v-show="activeCollapse === 'style'">
|
||||
<MobileBackgroundSelector @styleChange="changeTimes++"></MobileBackgroundSelector>
|
||||
</div>
|
||||
</div>
|
||||
<div class="config-mobile-tab-style" v-show="activeCollapse === 'componentStyle'">
|
||||
<component-style-editor
|
||||
:canvas-view-info-mobile="canvasViewInfoMobile"
|
||||
></component-style-editor>
|
||||
</div>
|
||||
<div class="config-mobile-tab" v-show="activeCollapse === 'com'">
|
||||
<div
|
||||
:style="{ height: '198px', width: '198px' }"
|
||||
class="mobile-wrapper-inner-adaptor"
|
||||
v-for="item in componentDataNotInMobile"
|
||||
:key="item.id"
|
||||
>
|
||||
<div class="component-outer">
|
||||
<ComponentWrapper
|
||||
v-show="item.isShow"
|
||||
canvas-id="canvas-main"
|
||||
:canvas-style-data="canvasStyleData"
|
||||
:dv-info="dvInfo"
|
||||
:canvas-view-info="canvasViewInfoMobile"
|
||||
:view-info="canvasViewInfoMobile[item.id]"
|
||||
:config="item"
|
||||
:style="getComponentStyleDefault()"
|
||||
show-position="preview"
|
||||
:search-count="0"
|
||||
:scale="80"
|
||||
/>
|
||||
</div>
|
||||
<div class="mobile-com-mask" @click="addToMobile(item)">
|
||||
<span v-show="item.component === 'DeStreamMedia'" style="color: #909399"
|
||||
>IOS可能无法显示</span
|
||||
>
|
||||
</div>
|
||||
<div class="pc-select-to-mobile" @click="addToMobile(item)" v-if="!mobileLoading"></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user