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

src/components/PSD/Index.vue

@@ -161,9 +161,7 @@ const removeFontHandler = (fontName:any)=>{
       cancelButtonText: '取消',
       type: 'warning'
     }).then(() => {
-        console.log('then',!fonts.value)
         if(fonts.value){
-            console.log(fonts.value,fontName)
             fonts.value?.splice(fonts.value.indexOf(fontName),1)
         }
     })

src/store/font.ts

@@ -36,7 +36,8 @@ export const useFontStore = defineStore('fonts',{
             try {
                 let response  = await FontService.GetAllFontsAsync()
                 if(response.data.resultCode == ApiResult.SUCCESS && response.data.data){
-                    this.fonts =response.data.data as CustomerFonts[]
+                    this.fonts = response.data.data as CustomerFonts[]
+                    this.formatFonts = []
                     this.fonts.forEach(x=>{
                         this.formatFonts.push({ label: x.label,value:x.fontFamily })
                     })

src/utils/psdParser/text.ts

@@ -20,19 +20,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
             fontSize = sizes[0]
         }
     }
-    const isVertical = item.layer.adjustments.typeTool.obj.textData.Ornt.value != 'Hrzn'
-    if(isVertical) {
-        let checkWord = value[0]+value[value.length-1]
-        let words = checkWord.match(/[\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]/g)
-        domheight+= words&&words.length>0?fontSize*words.length*1.3:fontSize*1.3
-        domTop-= words&&words.length>0?fontSize:0
-        domLeft += words&&words.length>0?fontSize*-0.25:(fontSize-35)/2
-    }
-    else {
-        domwidth +=fontSize+(value[value.length-1]=='】'?fontSize:0)
-        domLeft-=(value[value.length-1]=='】'?fontSize:0)
-    }
-
+    
     const StyleSheet = item.layer.adjustments.typeTool.obj.engineData.EngineDict.StyleRun.RunArray[0].StyleSheet || {}
     const { StyleSheetData } = StyleSheet
     const tracking = fontSize * (StyleSheetData.Tracking / 1000)
@@ -43,7 +31,10 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
 
     let style = `text-align:${alignment[0]}; font-size:${fontSize-2}px; font-weight:${weights[0]};`
     if (font.textDecoration || StyleSheetData.Strikethrough) {
-        style += `text-decoration:${font.textDecoration ? font.textDecoration[0] : ''} ${StyleSheetData.Strikethrough ? ' line-through' : ''}`
+        style += `text-decoration:${font.textDecoration ? font.textDecoration[0] : ''} ${StyleSheetData.Strikethrough ? ' line-through' : ''};`
+    }
+    if (StyleSheetData.FauxItalic){
+        style += `font-style:italic;`
     }
 
     let content = `<p style="${style}">${value}</p>`
@@ -64,6 +55,25 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
             textShadow = null
     }
 
+    const isVertical = item.layer.adjustments.typeTool.obj.textData.Ornt.value != 'Hrzn'
+    if(isVertical) {
+        let checkWord = value[0]+value[value.length-1]
+        let words = checkWord.match(/[\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]/g)
+        if(words&&words.length>0){
+            domheight += fontSize*words.length*1.4
+            domTop -= fontSize
+           
+        }else{
+            domheight += fontSize*1.4
+        }
+        domLeft -= 10+((leading-1)*fontSize/2)
+    }
+    else {
+        domwidth +=fontSize+(value[value.length-1]=='】'?fontSize:0)
+        domTop -= 10+((leading-1)*fontSize/2)
+    }
+
+
     let element: PPTTextElement = {
         id: "text_" + index,
         type: 'text',

src/views/Editor/Canvas/index.vue

@@ -21,8 +21,8 @@
       :style="{
         width: viewportStyles.width * canvasScale + 'px',
         height: viewportStyles.height * canvasScale + 'px',
-        left: viewportStyles.left + 'px',
-        top: viewportStyles.top + 'px',
+        left: (viewportStyles.left) + 'px',
+        top: (viewportStyles.top/2) + 'px',
       }"
     >
       <div class="operates">

src/views/Editor/Thumbnails/index.vue

@@ -238,7 +238,7 @@ const GetTripTemplate = async () =>{
       let dataRes = await ConfigService.GetTripTemplateSlide(queryMsg);
       if (dataRes.data.resultCode == 1) {
         let viewportRatio = 1.414
-        if(dataRes.data.data.TempType==1) viewportRatio = 0.7723
+        if(dataRes.data.data.TempType==1) viewportRatio = 0.7069
         slidesStore.setViewportRatio(viewportRatio)
 
         let SlidesData = JSON.parse(dataRes.data.data.TempData)

src/views/Editor/Toolbar/SlideDesignPanel.vue

@@ -120,7 +120,7 @@
         :value="viewportRatio" 
         @update:value="value => updateViewportRatio(value as number)"
         :options="[
-          { label: '横屏', value: 0.7723 },
+          { label: '横屏', value: 0.7069 },
           { label: '竖屏', value: 1.414 },
         ]"
       />