소스 검색

优化生成ppt的警告

cxmo 1 년 전
부모
커밋
0ff5914542
1개의 변경된 파일13개의 추가작업 그리고 3개의 파일을 삭제
  1. 13 3
      src/views/ppt_manage/mixins/pptMixins.js

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

@@ -989,19 +989,29 @@ export default {
 
       if(chartData.SourcesFrom&&JSON.parse(chartData.SourcesFrom).isShow) {
         let sourceObj = JSON.parse(chartData.SourcesFrom);
+        //pptx 只接受6bit的颜色格式,用333警告太多了 优化下
+        const color = sourceObj.color.includes('rgb') ? rgbaToHex(sourceObj.color).color.substring(1) 
+                    : sourceObj.color.indexOf('#')===0 
+                    ? sourceObj.color.substring(1).length<6 
+                    ? '000000':sourceObj.color.substring(1)
+                    : '666666'
         slide.addText(`来源:${sourceObj.text}`,{
           x:x,
           y: yPercent,
           w: width,
           margin:10,
           fontSize: sourceObj.fontSize*0.75,
-          color: sourceObj.color.includes('rgb') ? rgbaToHex(sourceObj.color).color.substring(1) : sourceObj.color.indexOf('#')===0 ? sourceObj.color.substring(1): '666',
+          color,
         })
       }
 
       if(chartData.Instructions&&JSON.parse(chartData.Instructions).isShow) {
         let instructObj = JSON.parse(chartData.Instructions);
-
+        const color = instructObj.color.includes('rgb') ? rgbaToHex(instructObj.color).color.substring(1) 
+                    : instructObj.color.indexOf('#')===0 
+                    ? instructObj.color.substring(1).length<6 
+                    ? '000000':instructObj.color.substring(1)
+                    : '666666'
         slide.addText(instructObj.text,{
           x:x,
           y: yPercent,
@@ -1009,7 +1019,7 @@ export default {
           align:'right',
           margin:10,
           fontSize: instructObj.fontSize*0.75,
-          color: instructObj.color.includes('rgb') ? rgbaToHex(instructObj.color).color.substring(1) : instructObj.color.indexOf('#')===0 ? instructObj.color.substring(1): '666',
+          color,
         })
       }
     }