cxmo 5 mesiacov pred
rodič
commit
f8cf8cdb71

+ 5 - 3
src/views/ppt_manage/mixins/pptMixins.js

@@ -87,7 +87,7 @@ export default {
         const {titleDetail,titleContent,title} = page
         //兼容之前的ppt
         if(!titleDetail||!titleContent){
-            slide.addText(this.pageList[i].title, {
+            slide.addText(title, {
                 placeholder:"slideTitle",
                 x:'10%',
                 y:'5.5%',
@@ -99,11 +99,13 @@ export default {
             const {left,top,width,height} = titleDetail
             const text = toTextProps(toJson(titleContent))
             slide.addText(text,{
-                placeholder:"slideTitle",
+                /* placeholder:"slideTitle", */ //加上后会走母版slideTitle的设置
                 x:left+'%',
                 y:top+'%',
                 w:width+'%',
-                h:height+'%'
+                h:height+'%',
+                color:'333333',
+                fontSize:12
             })
         }
         return slide

+ 2 - 1
src/views/ppt_manage/newVersion/css/common.scss

@@ -39,7 +39,8 @@ $titleColor:#333333;
         width:4.5em !important;
       }
     .tox-menu.tox-swatches-menu.tox-selected-menu{
-        left:185px !important;
+        left:auto !important;
+        right:0;
     }
     .tox{
         .tox-collection__group{

+ 3 - 2
src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -292,14 +292,15 @@ export default {
       const length = this.pageList.length;
       for (let i = 0; i < length; i++) {
         let slide = pptx.addSlide({ masterName: pptSlideMaster.title });
-        slide.addText(this.pageList[i].title, {
+        /* slide.addText(this.pageList[i].title, {
           placeholder:"slideTitle",
           x:'8%',
           y:'5.5%',
           w:'62%',
           h:'7%',
           color:'333333'
-        });
+        }); */
+        slide = this.setPPTTitle(slide,this.pageList[i])
         const elements = this.pageList[i].elements;
         const elLength = elements.length;
         for (let j = 0; j < elLength; j++) {