Commit f4602436 authored by zhengke's avatar zhengke

文字对齐方式,屏蔽 插入公式

parent 7dd34eb0
...@@ -3,7 +3,7 @@ import { useMainStore, useSlidesStore } from '@/store' ...@@ -3,7 +3,7 @@ import { useMainStore, useSlidesStore } from '@/store'
import type { PPTElement } from '@/types/slides' import type { PPTElement } from '@/types/slides'
import { ElementAlignCommands } from '@/types/edit' import { ElementAlignCommands } from '@/types/edit'
import { getElementListRange } from '@/utils/element' import { getElementListRange } from '@/utils/element'
import { VIEWPORT_SIZE } from '@/configs/canvas' import { VIEWPORT_SIZE,VIEWPORT_VER_SIZE } from '@/configs/canvas'
import useHistorySnapshot from './useHistorySnapshot' import useHistorySnapshot from './useHistorySnapshot'
export default () => { export default () => {
...@@ -18,8 +18,8 @@ export default () => { ...@@ -18,8 +18,8 @@ export default () => {
* @param command 对齐方向 * @param command 对齐方向
*/ */
const alignElementToCanvas = (command: ElementAlignCommands) => { const alignElementToCanvas = (command: ElementAlignCommands) => {
const viewportWidth = VIEWPORT_SIZE.Value const viewportWidth = viewportRatio.value<1?VIEWPORT_SIZE.Value:VIEWPORT_VER_SIZE.Value
const viewportHeight = VIEWPORT_SIZE.Value * viewportRatio.value const viewportHeight = (viewportRatio.value<1?VIEWPORT_SIZE.Value:VIEWPORT_VER_SIZE.Value) * viewportRatio.value
const { minX, maxX, minY, maxY } = getElementListRange(activeElementList.value) const { minX, maxX, minY, maxY } = getElementListRange(activeElementList.value)
const newElementList: PPTElement[] = JSON.parse(JSON.stringify(currentSlide.value.elements)) const newElementList: PPTElement[] = JSON.parse(JSON.stringify(currentSlide.value.elements))
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</template> </template>
<IconInsertTable class="handler-item" v-tooltip="'插入表格'" /> <IconInsertTable class="handler-item" v-tooltip="'插入表格'" />
</Popover> </Popover>
<IconFormula class="handler-item" v-tooltip="'插入公式'" @click="latexEditorVisible = true" /> <!-- <IconFormula class="handler-item" v-tooltip="'插入公式'" @click="latexEditorVisible = true" /> -->
<IconEarth class="handler-item" v-tooltip="'编辑地图'" @click="mapVisibleStatus = true" v-if="userInfo.iv||userInfo.it" /> <IconEarth class="handler-item" v-tooltip="'编辑地图'" @click="mapVisibleStatus = true" v-if="userInfo.iv||userInfo.it" />
<!-- <Popover trigger="click" v-model:value="mediaInputVisible"> <!-- <Popover trigger="click" v-model:value="mediaInputVisible">
<template #content> <template #content>
......
...@@ -155,7 +155,8 @@ ...@@ -155,7 +155,8 @@
</div> </div>
</div> </div>
<div v-if="(dataList.length>0&&queryObj.pageIndex>1)||(dataList.length>0&&queryObj.pageIndex==1&&!loading)" <!-- (dataList.length>0&&queryObj.pageIndex>1)||(dataList.length>0&&queryObj.pageIndex==1&&!loading) -->
<div v-if="dataList.length>0"
class="listBox rounded"> class="listBox rounded">
<!-- :width="260" --> <!-- :width="260" -->
<Waterfall :list="dataList" <Waterfall :list="dataList"
...@@ -464,7 +465,7 @@ const queryTemplateBySearchHandler = async () => { ...@@ -464,7 +465,7 @@ const queryTemplateBySearchHandler = async () => {
} }
setTimeout(()=>{ setTimeout(()=>{
loading.value = false loading.value = false
},300) },500)
} catch (error) { } catch (error) {
loading.value = false loading.value = false
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment