Merge branch 'ppt-demand-053'

src/App.vue

@@ -242,9 +242,9 @@ div::-webkit-scrollbar-corner {
   background: #666;
 }
 /*firefox*/
-div{
+/* div{
     scrollbar-width: thin;
-}
+} */
 .customName:hover {
   text-decoration: underline;
 }
@@ -294,9 +294,9 @@ ul::-webkit-scrollbar-corner {
   background: #666;
 }
 /*firefox*/
-ul{
+/* ul{
     scrollbar-width: thin;
-}
+} */
 
 textarea {
   font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",

src/views/ppt_manage/mixins/pptMixins.js

@@ -572,7 +572,7 @@ export default {
         let titleHTML = null
         //中英文发布页需设置title换行
         //一行可容纳的中文字体数
-        const fontSize = chartTheme?chartTheme.titleOptions.style.fontSize:1
+        const fontSize = chartTheme?chartTheme.titleOptions.style.fontSize:16
         let count = parseInt($(`#${refName}`)[0].offsetWidth / fontSize)*1.75
         let {total,newStr} = getStrSize(options.MyChartTitle,count)
         const isPublish = this.$route.path==='/pptpublish'||this.$route.path==='/pptenpublish'