Commit 769b925d authored by 罗超's avatar 罗超

优化导入

parent 89dc11bb
...@@ -18,16 +18,19 @@ declare module 'vue' { ...@@ -18,16 +18,19 @@ declare module 'vue' {
Divider: typeof import('./src/components/Divider.vue')['default'] Divider: typeof import('./src/components/Divider.vue')['default']
Drawer: typeof import('./src/components/Drawer.vue')['default'] Drawer: typeof import('./src/components/Drawer.vue')['default']
EditableInput: typeof import('./src/components/ColorPicker/EditableInput.vue')['default'] EditableInput: typeof import('./src/components/ColorPicker/EditableInput.vue')['default']
ElAside: typeof import('element-plus/es')['ElAside']
ElButton: typeof import('element-plus/es')['ElButton'] ElButton: typeof import('element-plus/es')['ElButton']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckTag: typeof import('element-plus/es')['ElCheckTag'] ElCheckTag: typeof import('element-plus/es')['ElCheckTag']
ElCol: typeof import('element-plus/es')['ElCol'] ElCol: typeof import('element-plus/es')['ElCol']
ElContainer: typeof import('element-plus/es')['ElContainer']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider'] ElDivider: typeof import('element-plus/es')['ElDivider']
ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage'] ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElMain: typeof import('element-plus/es')['ElMain']
ElOption: typeof import('element-plus/es')['ElOption'] ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination'] ElPagination: typeof import('element-plus/es')['ElPagination']
ElRow: typeof import('element-plus/es')['ElRow'] ElRow: typeof import('element-plus/es')['ElRow']
...@@ -37,6 +40,7 @@ declare module 'vue' { ...@@ -37,6 +40,7 @@ declare module 'vue' {
ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs'] ElTabs: typeof import('element-plus/es')['ElTabs']
ElTag: typeof import('element-plus/es')['ElTag'] ElTag: typeof import('element-plus/es')['ElTag']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElUpload: typeof import('element-plus/es')['ElUpload'] ElUpload: typeof import('element-plus/es')['ElUpload']
FileInput: typeof import('./src/components/FileInput.vue')['default'] FileInput: typeof import('./src/components/FileInput.vue')['default']
FormulaContent: typeof import('./src/components/LaTeXEditor/FormulaContent.vue')['default'] FormulaContent: typeof import('./src/components/LaTeXEditor/FormulaContent.vue')['default']
......
...@@ -701,7 +701,8 @@ export interface Slide { ...@@ -701,7 +701,8 @@ export interface Slide {
background?: SlideBackground background?: SlideBackground
animations?: PPTAnimation[] animations?: PPTAnimation[]
turningMode?: TurningMode turningMode?: TurningMode
pageType: number pageType: number,
isTripItems?:boolean
} }
/** /**
......
...@@ -12,6 +12,8 @@ export const ResolveLayer = async (item: any, index: number,offsetLeft:number,of ...@@ -12,6 +12,8 @@ export const ResolveLayer = async (item: any, index: number,offsetLeft:number,of
const height = item.coords.bottom - item.coords.top const height = item.coords.bottom - item.coords.top
const opacity = (parseFloat(item.layer.opacity) / 255.0).toFixed(2) const opacity = (parseFloat(item.layer.opacity) / 255.0).toFixed(2)
let objectEFFFects = item.layer.objectEffects ? item.layer.objectEffects() : null
let element: PPTImageElement = { let element: PPTImageElement = {
id: "img_" + index, id: "img_" + index,
type: 'image', type: 'image',
......
...@@ -42,6 +42,7 @@ export const ResolvePsdToSliderHandler = async (psd:any) => { ...@@ -42,6 +42,7 @@ export const ResolvePsdToSliderHandler = async (psd:any) => {
let randomNum = Math.floor(Math.random()*100)+i let randomNum = Math.floor(Math.random()*100)+i
// let t =CreateDefaultSlider(ID_PREV+i) // let t =CreateDefaultSlider(ID_PREV+i)
let t =CreateDefaultSlider(ID_PREV+randomNum) let t =CreateDefaultSlider(ID_PREV+randomNum)
t.isTripItems=x.name.indexOf('trip_item')!=-1
const {_children} = x const {_children} = x
if(_children && _children.length>0){ if(_children && _children.length>0){
...@@ -82,7 +83,7 @@ const CreateDefaultSlider = (id:string):Slide =>{ ...@@ -82,7 +83,7 @@ const CreateDefaultSlider = (id:string):Slide =>{
background: { background: {
type: 'solid', type: 'solid',
color: '#ffffff', color: '#ffffff',
}, }
} }
} }
...@@ -95,7 +96,6 @@ const GetSlidersHandler = async (child:any[],offsetLeft:number,offsetTop:number, ...@@ -95,7 +96,6 @@ const GetSlidersHandler = async (child:any[],offsetLeft:number,offsetTop:number,
Z_INDEX-- Z_INDEX--
if(x.layer.name == 'first_row') groupId='first_row' if(x.layer.name == 'first_row') groupId='first_row'
if(x.layer.name == 'form_bg') groupId = '' if(x.layer.name == 'form_bg') groupId = ''
console.log(x.layer.name,groupId)
if(x.layer.typeTool){ if(x.layer.typeTool){
elements.push(ResolveText(x, Z_INDEX, offsetLeft, offsetTop,groupId)) elements.push(ResolveText(x, Z_INDEX, offsetLeft, offsetTop,groupId))
} }
......
...@@ -70,6 +70,7 @@ import Draggable from 'vuedraggable' ...@@ -70,6 +70,7 @@ import Draggable from 'vuedraggable'
import { ElLoading, ElMessageBox } from 'element-plus' import { ElLoading, ElMessageBox } from 'element-plus'
import FileService from '@/services/FileService' import FileService from '@/services/FileService'
import { VIEWPORT_SIZE, VIEWPORT_VER_SIZE } from '@/configs/canvas' import { VIEWPORT_SIZE, VIEWPORT_VER_SIZE } from '@/configs/canvas'
import { Slide } from '@/types/slides'
const mainStore = useMainStore() const mainStore = useMainStore()
const slidesStore = useSlidesStore() const slidesStore = useSlidesStore()
...@@ -382,10 +383,13 @@ const GetTripTemplate = async () =>{ ...@@ -382,10 +383,13 @@ const GetTripTemplate = async () =>{
}) })
}) })
console.log(newSlides,'=======模版数据newSlides') console.log(newSlides,'=======模版数据newSlides')
if(ConfigId.value>0){
newSlides = newSlides.filter((x:Slide)=>!x.isTripItems)
}
slidesStore.setSlides(newSlides) slidesStore.setSlides(newSlides)
layoutsStore.setLayouts(JSON.parse(JSON.stringify(newSlides))) layoutsStore.setLayouts(JSON.parse(JSON.stringify(newSlides)))
CoverImgStore.setCoverImg(dataRes.data.data.CoverImg) CoverImgStore.setCoverImg(dataRes.data.data.CoverImg)
queryObj.value.TempId = dataRes.data.data.TempId queryObj.value.TempId = dataRes.data.data.TempId
queryObj.value.LineId = dataRes.data.data.LineId queryObj.value.LineId = dataRes.data.data.LineId
queryObj.value.LineName = dataRes.data.data.LineName queryObj.value.LineName = dataRes.data.data.LineName
......
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