Merge pull request #13018 from dataease/pr@dev-v2@refact_font

Pr@dev v2@refact font
This commit is contained in:
王嘉豪 2024-10-30 16:41:15 +08:00 committed by GitHub
commit 370c50cba6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 52 deletions

View File

@ -620,15 +620,7 @@ const marginRight = computed<CSSProperties>(() => {
}) })
const autoStyle = computed(() => { const autoStyle = computed(() => {
return { return { zoom: scale.value }
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
}) })
</script> </script>

View File

@ -604,12 +604,7 @@ onBeforeUnmount(() => {
}) })
const autoStyle = computed(() => { const autoStyle = computed(() => {
return { return { zoom: scale.value }
height: 20 * scale.value + 8 + 'px',
width: 100 / scale.value + '%!important',
left: 50 * (1 - 1 / scale.value) + '%', // 2
transform: 'scale(' + scale.value + ') translateZ(0)'
}
}) })
const autoHeightStyle = computed(() => { const autoHeightStyle = computed(() => {

View File

@ -313,44 +313,46 @@ const save = () => {
<el-tab-pane label="组件样式" name="componentStyle"> </el-tab-pane> <el-tab-pane label="组件样式" name="componentStyle"> </el-tab-pane>
<el-tab-pane label="整体样式" name="style"> </el-tab-pane> <el-tab-pane label="整体样式" name="style"> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="config-mobile-tab" v-show="activeCollapse === 'style'"> <template v-if="!mobileLoading">
<MobileBackgroundSelector @styleChange="changeTimes++"></MobileBackgroundSelector> <div class="config-mobile-tab" v-show="activeCollapse === 'style'">
</div> <MobileBackgroundSelector @styleChange="changeTimes++"></MobileBackgroundSelector>
<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>
</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>
</div> </div>
</template> </template>