Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/store/font.ts

@@ -62,26 +62,27 @@ export const useFontStore = defineStore('fonts',{
             if(loadFonts && loadFonts.length>0){
                 for (let i = 0; i < loadFonts.length; i++) {
                     const item = loadFonts[i];
+                    const url = item.fontUrl.indexOf('local')==-1?`url('${item.fontUrl}')`:item.fontUrl
+                    const fontFace = new FontFace(item.fontFamily,url);
                     try {
-                        const url = item.fontUrl.indexOf('local')==-1?`url('${item.fontUrl}')`:item.fontUrl
-                        const fontFace = new FontFace(item.fontFamily,url);
                         fontFace.display = "swap"
                         await fontFace.load();
-                        document.fonts.add(fontFace)
-                        this.loaded.push(item.fontFamily)
-                        let newStyle = document.createElement('style');
-                        const fontFormat = item.fontUrl.toLowerCase().indexOf('.ttf')!=-1?'truetype':item.fontUrl.split('.').reverse()[0]
-                        newStyle.setAttribute("type", "text/css");
-                        newStyle.appendChild(document.createTextNode("\
-                            @font-face {\
-                                font-family: '" + item.fontFamily + "';\
-                                src: "+url+" format("+fontFormat+");\
-                            }\
-                        "));
-                        document.head.appendChild(newStyle);
+                        
                     } catch (error) {
                         console.log('加载字体报错',error)
                     }
+                    document.fonts.add(fontFace)
+                    this.loaded.push(item.fontFamily)
+                    let newStyle = document.createElement('style');
+                    const fontFormat = item.fontUrl.toLowerCase().indexOf('.ttf')!=-1?'truetype':(item.fontUrl.toLowerCase().indexOf('.otf')!=-1?'opentype':item.fontUrl.split('.').reverse()[0])
+                    newStyle.setAttribute("type", "text/css");
+                    newStyle.appendChild(document.createTextNode("\
+                        @font-face {\
+                            font-family: '" + item.fontFamily + "';\
+                            src: "+url+" format("+fontFormat+");\
+                        }\
+                    "));
+                    document.head.appendChild(newStyle);
                 }
             }
             loadingInstance.close()

src/utils/psdParser/resolve.ts

@@ -54,7 +54,7 @@ export const ResolvePsdToSliderHandler = async (psd:any) => {
         }
 
     }
-    if(slides.value.length>0){
+    if(slides.value.length>0 && !(slides.value.length==1 && slides.value[0].elements.length==0)){
         let copySlides = JSON.parse(JSON.stringify(slides.value))
         copySlides.splice(slides.value.length,0,...sliders)
         return copySlides

src/views/Editor/EditorHeader/index.vue

@@ -236,6 +236,7 @@ const goBack = (type:any) =>{
 }
 // 返回是否清空数据
 const setNewDatas = (type,i) => {
+  console.log(type,i)
   let list = [
     {
       id: 'test-slide-1',
@@ -373,6 +374,7 @@ const uploadImageHandler = async ()=>{
   }
   
   const thumbnails = useSlidesStore().getThumbnails
+  console.log('console thumbnails',thumbnails)
   if(thumbnails && thumbnails.length>0){
     loadingInstance.value.text='正在上传模板缩略图'
     queryObj.value.PageImage=[]
@@ -443,7 +445,7 @@ const setTemplate = async (type) =>{
   if(SourceLoading.value) setNewDatasList(datas.DataSource)
 
   await uploadImageHandler()
-  
+  console.log(JSON.stringify(queryObj.value))
   let arr = JSON.parse(JSON.stringify(slides.value))
   if(dataLoading.value){
     dataLoadingStore.setDataLoading(0)
@@ -501,6 +503,7 @@ const setTemplate = async (type) =>{
   // console.log(arr,'-------tttt')
   
   queryObj.value.TempData = JSON.stringify(arr)
+  console.log(JSON.stringify(queryObj.value))
   if(model.value==1&&userInfo.value.IsEditTripTemplate==1){
     await SetTripTemplateSlide()
   }else if(ConfigId.value&&model.value!=2){