Commit e042c458 authored by 罗超's avatar 罗超

修改行程内容加载未关闭弹窗问题,修复数据绑定限定在OP操作时生效

parent afc2c09a
...@@ -185,9 +185,15 @@ const GetTripFiledData = async () =>{ ...@@ -185,9 +185,15 @@ const GetTripFiledData = async () =>{
} }
let dataRes = await ConfigService.triptemplateGetTripFiledData(queryMsg); let dataRes = await ConfigService.triptemplateGetTripFiledData(queryMsg);
if (dataRes.data.resultCode == 1) { if (dataRes.data.resultCode == 1) {
if(!dataRes.data.data) return if(!dataRes.data.data) {
loadingObj.close()
return
}
datas.DataSource.TravelAatas = dataRes.data.data datas.DataSource.TravelAatas = dataRes.data.data
if(TempId.value&&!searchData.value.TempId) return if(TempId.value&&!searchData.value.TempId) {
loadingObj.close()
return
}
let isHideOverflowText = false let isHideOverflowText = false
try { try {
await ElMessageBox.confirm('行程数据可能会超出模板预设宽度或高度,是否自动裁剪','提示',{ await ElMessageBox.confirm('行程数据可能会超出模板预设宽度或高度,是否自动裁剪','提示',{
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</Popover> </Popover>
</ButtonGroup> </ButtonGroup>
<ElementDataMapping ></ElementDataMapping> <ElementDataMapping v-if="mode==0"></ElementDataMapping>
<Divider /> <Divider />
<ElementColorMask /> <ElementColorMask />
...@@ -85,6 +85,7 @@ import Button from '@/components/Button.vue' ...@@ -85,6 +85,7 @@ import Button from '@/components/Button.vue'
import ButtonGroup from '@/components/ButtonGroup.vue' import ButtonGroup from '@/components/ButtonGroup.vue'
import Popover from '@/components/Popover.vue' import Popover from '@/components/Popover.vue'
import UploadPicture from '../../CanvasTool/UploadPicture.vue' import UploadPicture from '../../CanvasTool/UploadPicture.vue'
import { query } from '@/utils/common'
const shapeClipPathOptions = CLIPPATHS const shapeClipPathOptions = CLIPPATHS
const ratioClipOptions = [ const ratioClipOptions = [
...@@ -124,6 +125,8 @@ const mainStore = useMainStore() ...@@ -124,6 +125,8 @@ const mainStore = useMainStore()
const slidesStore = useSlidesStore() const slidesStore = useSlidesStore()
const { handleElement, handleElementId } = storeToRefs(mainStore) const { handleElement, handleElementId } = storeToRefs(mainStore)
const { currentSlide } = storeToRefs(slidesStore) const { currentSlide } = storeToRefs(slidesStore)
const param = query()
const mode = parseInt(param.model??1)
const handleImageElement = handleElement as Ref<PPTImageElement> const handleImageElement = handleElement as Ref<PPTImageElement>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
>{{item.label}}</div> >{{item.label}}</div>
</div> </div>
<ElementDataMapping></ElementDataMapping> <ElementDataMapping v-if="mode==0"></ElementDataMapping>
<Divider /> <Divider />
...@@ -351,6 +351,7 @@ import Select from '@/components/Select.vue' ...@@ -351,6 +351,7 @@ import Select from '@/components/Select.vue'
import SelectGroup from '@/components/SelectGroup.vue' import SelectGroup from '@/components/SelectGroup.vue'
import Popover from '@/components/Popover.vue' import Popover from '@/components/Popover.vue'
import PopoverMenuItem from '@/components/PopoverMenuItem.vue' import PopoverMenuItem from '@/components/PopoverMenuItem.vue'
import { query } from '@/utils/common'
// 注意,存在一个未知原因的BUG,如果文本加粗后文本框高度增加,画布的可视区域定位会出现错误 // 注意,存在一个未知原因的BUG,如果文本加粗后文本框高度增加,画布的可视区域定位会出现错误
// 因此在执行预置样式命令时,将加粗命令放在尽可能靠前的位置,避免字号增大后再加粗 // 因此在执行预置样式命令时,将加粗命令放在尽可能靠前的位置,避免字号增大后再加粗
...@@ -431,6 +432,8 @@ const mainStore = useMainStore() ...@@ -431,6 +432,8 @@ const mainStore = useMainStore()
const slidesStore = useSlidesStore() const slidesStore = useSlidesStore()
const { formatFonts } = storeToRefs(useFontStore()) const { formatFonts } = storeToRefs(useFontStore())
const { handleElement, handleElementId, richTextAttrs, availableFonts, textFormatPainter } = storeToRefs(mainStore) const { handleElement, handleElementId, richTextAttrs, availableFonts, textFormatPainter } = storeToRefs(mainStore)
const param = query()
const mode = parseInt(param.model??1)
const { addHistorySnapshot } = useHistorySnapshot() const { addHistorySnapshot } = useHistorySnapshot()
const { toggleTextFormatPainter } = useTextFormatPainter() const { toggleTextFormatPainter } = useTextFormatPainter()
......
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