Merge branch 'ch/need_pool227' of eta_front/eta_front into master

src/views/ppt_manage/newVersion/components/TextEditor.vue

@@ -66,7 +66,7 @@ export default {
         paste_as_text: true,
         fontsize_formats:'12px 14px 16px 18px 20px 22px 24px 36px 48px',
         font_formats:`微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';
-                      楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;
+                      楷体='楷体';隶书='隶书';幼圆='幼圆';思源宋体='思源宋体';思源黑体='思源黑体';Andale Mono=andale mono,times;
                       Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;
                       Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;
                       Courier New=courier new,courier;Georgia=georgia,palatino;

src/views/ppt_manage/newVersion/utils/tinymceSetting.js

@@ -11,7 +11,7 @@ export const setting = {
     paste_as_text: true,
     fontsize_formats:'6px 8px 10px 12px 14px 16px 18px 20px 22px 24px 36px 48px',
     font_formats:`微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';
-            楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;
+            楷体='楷体';隶书='隶书';幼圆='幼圆';思源宋体='思源宋体';思源黑体='思源黑体';Andale Mono=andale mono,times;
             Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;
             Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;
             Courier New=courier new,courier;Georgia=georgia,palatino;
@@ -103,6 +103,42 @@ export const fontSizeList = [
     },
 ]
 export const fontFamily = [
+    {
+        label:'微软雅黑',
+        value:'微软雅黑',
+    },
+    {
+        label:'宋体',
+        value:'宋体',
+    },
+    {
+        label:'黑体',
+        value:'黑体',
+    },
+    {
+        label:'仿宋',
+        value:'仿宋',
+    },
+    {
+        label:'楷体',
+        value:'楷体',
+    },
+    {
+        label:'隶书',
+        value:'隶书',
+    },
+    {
+        label:'幼圆',
+        value:'幼圆',
+    },
+    {
+        label:'思源宋体',
+        value:'思源宋体'
+    },
+    {
+        label:'思源黑体',
+        value:'思源黑体'
+    },
     {
         label:'Helvetica',
         value:'helvetica',
@@ -127,18 +163,34 @@ export const fontFamily = [
         label:'Times New Roman',
         value:"Times New Roman',Times,serif",
     },
+    {
+        label:'Andale Mono',
+        value:"Andale Mono",
+    },
     {
         label:'Verdana',
         value:'Verdana,Geneva,sans-serif',
     },
     {
-        label:'思源宋体',
-        value:'思源宋体'
+        label:'Book Antiqua',
+        value:'Book Antiqua',
     },
     {
-        label:'思源黑体',
-        value:'思源黑体'
-    }
+        label:'Comic Sans MS',
+        value:'Comic Sans MS',
+    },
+    {
+        label:'Courier New',
+        value:"Courier New",
+    },
+    {
+        label:'Webdings',
+        value:"Webdings",
+    },
+    {
+        label:'Wingdings',
+        value:"Wingdings",
+    },
 ]
 export const titleDefault = {
     top:6.6,left:10,width:68,height:5,

src/views/report_manage/mixins/reportMixin.js

@@ -27,14 +27,31 @@ export default {
   },
   computed:{
       CNEditorConfig(){
-          return {...this.froalaConfig,...{fontFamily:{'Arial,Helvetica,sans-serif': 'Arial',
-          'Georgia,serif': 'Georgia',
-          'Impact,Charcoal,sans-serif': 'Impact',
-          'Tahoma,Geneva,sans-serif': 'Tahoma',
-          "'Times New Roman',Times,serif": 'Times New Roman',
-          'Verdana,Geneva,sans-serif': 'Verdana',
-          '思源宋体':'思源宋体',
-          '思源黑体':'思源黑体',}}
+          return {...this.froalaConfig,...{fontFamily:{
+            '微软雅黑': '微软雅黑',
+            '宋体': '宋体',
+            '黑体': '黑体',
+            '仿宋': '仿宋',
+            '楷体': '楷体',
+            '隶书': '隶书',
+            '幼圆': '幼圆',
+            '思源宋体': '思源宋体',
+            '思源黑体': '思源黑体',
+            'Helvetica': 'Helvetica',
+            'Arial,Helvetica,sans-serif': 'Arial',
+            'Arial Black': 'Arial Black',
+            'Georgia,serif': 'Georgia',
+            'Impact,Charcoal,sans-serif': 'Impact',
+            'Tahoma,Geneva,sans-serif': 'Tahoma',
+            'Times New Roman,Times,serif': 'Times New Roman',
+            'Andale Mono': 'Andale Mono',
+            'Verdana,Geneva,sans-serif': 'Verdana',
+            'Book Antiqua': 'Book Antiqua',
+            'Comic Sans MS': 'Comic Sans MS',
+            'Courier New': 'Courier New',
+            'Webdings': 'Webdings',
+            'Wingdings': 'Wingdings',
+          }}
         }
       },
       panelTabs(){

src/views/report_manage/reportEn/reportEditor.vue

@@ -24,7 +24,7 @@
           id="froala-editor"
           ref="froalaEditor"
           :tag="'textarea'"
-          :config="{...froalaConfig,quickInsertEnabled: false,}"
+          :config="{...froalaConfig,quickInsertEnabled: false, fontFamily:overviewConfig.fontFamily}"
           v-model="aeForm.content"
         ></froala>
 		  </div>
@@ -494,6 +494,31 @@ export default {
 					'redo',
         ],
         fontSize: ["6","8","10","12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
+				fontFamily: {
+					'微软雅黑': '微软雅黑',
+					'宋体': '宋体',
+					'黑体': '黑体',
+					'仿宋': '仿宋',
+					'楷体': '楷体',
+					'隶书': '隶书',
+					'幼圆': '幼圆',
+					'思源宋体': '思源宋体',
+					'思源黑体': '思源黑体',
+					'Helvetica': 'Helvetica',
+					'Arial,Helvetica,sans-serif': 'Arial',
+					'Arial Black': 'Arial Black',
+					'Georgia,serif': 'Georgia',
+					'Impact,Charcoal,sans-serif': 'Impact',
+					'Tahoma,Geneva,sans-serif': 'Tahoma',
+					'Times New Roman,Times,serif': 'Times New Roman',
+					'Andale Mono': 'Andale Mono',
+					'Verdana,Geneva,sans-serif': 'Verdana',
+					'Book Antiqua': 'Book Antiqua',
+					'Comic Sans MS': 'Comic Sans MS',
+					'Courier New': 'Courier New',
+					'Webdings': 'Webdings',
+					'Wingdings': 'Wingdings',
+				},
         height:300,
         fontSizeDefaultSelection: "16",
         quickInsertEnabled: false,

src/views/report_manage/reportV2/normalReport/mixins/reportMixin.js

@@ -27,14 +27,31 @@ export default {
   },
   computed:{
       CNEditorConfig(){
-          return {...this.froalaConfig,...{fontFamily:{'Arial,Helvetica,sans-serif': 'Arial',
-          'Georgia,serif': 'Georgia',
-          'Impact,Charcoal,sans-serif': 'Impact',
-          'Tahoma,Geneva,sans-serif': 'Tahoma',
-          "'Times New Roman',Times,serif": 'Times New Roman',
-          'Verdana,Geneva,sans-serif': 'Verdana',
-          '思源宋体':'思源宋体',
-          '思源黑体':'思源黑体',}}
+          return {...this.froalaConfig,...{fontFamily:{
+            '微软雅黑': '微软雅黑',
+            '宋体': '宋体',
+            '黑体': '黑体',
+            '仿宋': '仿宋',
+            '楷体': '楷体',
+            '隶书': '隶书',
+            '幼圆': '幼圆',
+            '思源宋体': '思源宋体',
+            '思源黑体': '思源黑体',
+            'Helvetica': 'Helvetica',
+            'Arial,Helvetica,sans-serif': 'Arial',
+            'Arial Black': 'Arial Black',
+            'Georgia,serif': 'Georgia',
+            'Impact,Charcoal,sans-serif': 'Impact',
+            'Tahoma,Geneva,sans-serif': 'Tahoma',
+            'Times New Roman,Times,serif': 'Times New Roman',
+            'Andale Mono': 'Andale Mono',
+            'Verdana,Geneva,sans-serif': 'Verdana',
+            'Book Antiqua': 'Book Antiqua',
+            'Comic Sans MS': 'Comic Sans MS',
+            'Courier New': 'Courier New',
+            'Webdings': 'Webdings',
+            'Wingdings': 'Wingdings',
+          }}
         }
       },
       insertTabs(){

src/views/report_manage/reportV2/smartReport/components/TextEdit.vue

@@ -70,14 +70,29 @@ export default {
                 toolbarSticky: false, //操作栏是否自动吸顶
                 saveInterval: 0,
                 fontFamily:{
+                    '微软雅黑': '微软雅黑',
+                    '宋体': '宋体',
+                    '黑体': '黑体',
+                    '仿宋': '仿宋',
+                    '楷体': '楷体',
+                    '隶书': '隶书',
+                    '幼圆': '幼圆',
+                    '思源宋体': '思源宋体',
+                    '思源黑体': '思源黑体',
+                    'Helvetica': 'Helvetica',
                     'Arial,Helvetica,sans-serif': 'Arial',
+                    'Arial Black': 'Arial Black',
                     'Georgia,serif': 'Georgia',
                     'Impact,Charcoal,sans-serif': 'Impact',
                     'Tahoma,Geneva,sans-serif': 'Tahoma',
                     'Times New Roman,Times,serif': 'Times New Roman',
+                    'Andale Mono': 'Andale Mono',
                     'Verdana,Geneva,sans-serif': 'Verdana',
-                    '思源宋体':'思源宋体',
-                    '思源黑体':'思源黑体',
+                    'Book Antiqua': 'Book Antiqua',
+                    'Comic Sans MS': 'Comic Sans MS',
+                    'Courier New': 'Courier New',
+                    'Webdings': 'Webdings',
+                    'Wingdings': 'Wingdings',
                 },
                 events: {
                     //this.editor 定义在vue data 中

src/views/sandbox_manage/common/toolConfig.js

@@ -25,7 +25,27 @@ export const colorsOptions = ['#333','#5B9BD5','#f00','#fff','#00f','#000','#00F
 export const familyOptions = [
 	{name:localStorage.getItem('i18n')=='zh'?'微软雅黑':'Microsoft YaHei',value:'微软雅黑'},
 	{name:localStorage.getItem('i18n')=='zh'?'宋体':'SimSun',value:'宋体'},
-	{name:localStorage.getItem('i18n')=='zh'?'黑体':'SimHei',value:'黑体'}
+	{name:localStorage.getItem('i18n')=='zh'?'黑体':'SimHei',value:'黑体'},
+	{name:localStorage.getItem('i18n')=='zh'?'仿宋':'FangSong',value:'仿宋'},
+	{name:localStorage.getItem('i18n')=='zh'?'楷体':'KaiTi',value:'楷体'},
+	{name:localStorage.getItem('i18n')=='zh'?'隶书':'LiSu',value:'隶书'},
+	{name:localStorage.getItem('i18n')=='zh'?'幼圆':'YouYuan',value:'幼圆'},
+	{name:localStorage.getItem('i18n')=='zh'?'思源宋体':'Source Han Sans',value:'思源宋体'},
+	{name:localStorage.getItem('i18n')=='zh'?'思源黑体':'Source Han Sans',value:'思源黑体'},
+	{name:localStorage.getItem('i18n')=='zh'?'Helvetica':'Helvetica',value:'Helvetica'},
+	{name:localStorage.getItem('i18n')=='zh'?'Arial':'Arial',value:'Arial,Helvetica,sans-serif'},
+	{name:localStorage.getItem('i18n')=='zh'?'Arial Black':'Arial Black',value:'Arial Black'},
+	{name:localStorage.getItem('i18n')=='zh'?'Georgia':'Georgia',value:'Georgia,serif'},
+	{name:localStorage.getItem('i18n')=='zh'?'Impact':'Impact',value:'Impact,Charcoal,sans-serif'},
+	{name:localStorage.getItem('i18n')=='zh'?'Tahoma':'Tahoma',value:'Tahoma,Geneva,sans-serif'},
+	{name:localStorage.getItem('i18n')=='zh'?'Times New Roman':'Times New Roman',value:'Times New Roman,Times,serif'},
+	{name:localStorage.getItem('i18n')=='zh'?'Andale Mono':'Andale Mono',value:'Andale Mono'},
+	{name:localStorage.getItem('i18n')=='zh'?'Verdana':'Verdana',value:'Verdana,Geneva,sans-serif'},
+	{name:localStorage.getItem('i18n')=='zh'?'Book Antiqua':'Book Antiqua',value:'Book Antiqua'},
+	{name:localStorage.getItem('i18n')=='zh'?'Comic Sans MS':'Comic Sans MS',value:'Comic Sans MS'},
+	{name:localStorage.getItem('i18n')=='zh'?'Courier New':'Courier New',value:'Courier New'},
+	{name:localStorage.getItem('i18n')=='zh'?'Webdings':'Webdings',value:'Webdings'},
+	{name:localStorage.getItem('i18n')=='zh'?'Wingdings':'Wingdings',value:'Wingdings'}
 ]
 export const fontSizeOptions = [
 	{name:'12px',value:12},

src/views/sandbox_manage/sandFlowNew/index.vue

@@ -119,11 +119,13 @@
                     <span v-show="nodeTextDisable" class="disabled-item" @click.stop="()=>{}"></span>
                   </el-tooltip>
                 </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-for="f in familyOptions" :command="f.value" :key="f.value"
-                :class="styleOptions.fontF==f.value?'style-acitve':''">
-                    {{ f.name }}
-                </el-dropdown-item>
+              <el-dropdown-menu slot="dropdown" style="padding: 0;">
+                <div style="max-height: 208px; overflow-y: auto; padding: 10px 0;">
+                  <el-dropdown-item v-for="f in familyOptions" :command="f.value" :key="f.value"
+                  :class="styleOptions.fontF==f.value?'style-acitve':''">
+                      {{ f.name }}
+                  </el-dropdown-item>
+                </div>
               </el-dropdown-menu>
             </el-dropdown>
           </div>

src/views/smartReport/components/TextEdit.vue

@@ -70,14 +70,29 @@ export default {
                 toolbarSticky: false, //操作栏是否自动吸顶
                 saveInterval: 0,
                 fontFamily:{
+                    '微软雅黑': '微软雅黑',
+                    '宋体': '宋体',
+                    '黑体': '黑体',
+                    '仿宋': '仿宋',
+                    '楷体': '楷体',
+                    '隶书': '隶书',
+                    '幼圆': '幼圆',
+                    '思源宋体': '思源宋体',
+                    '思源黑体': '思源黑体',
+                    'Helvetica': 'Helvetica',
                     'Arial,Helvetica,sans-serif': 'Arial',
+                    'Arial Black': 'Arial Black',
                     'Georgia,serif': 'Georgia',
                     'Impact,Charcoal,sans-serif': 'Impact',
                     'Tahoma,Geneva,sans-serif': 'Tahoma',
                     'Times New Roman,Times,serif': 'Times New Roman',
+                    'Andale Mono': 'Andale Mono',
                     'Verdana,Geneva,sans-serif': 'Verdana',
-                    '思源宋体':'思源宋体',
-                    '思源黑体':'思源黑体',
+                    'Book Antiqua': 'Book Antiqua',
+                    'Comic Sans MS': 'Comic Sans MS',
+                    'Courier New': 'Courier New',
+                    'Webdings': 'Webdings',
+                    'Wingdings': 'Wingdings',
                 },
                 events: {
                     //this.editor 定义在vue data 中

src/views/system_manage/components/smartReportImgSet.vue

@@ -238,7 +238,8 @@ export default {
                 value: '',
             },
             dragIndex:0,
-            layoutFontF:['Arial','Georgia','Impact','Tahoma','Times New Roman','Verdana','思源宋体','思源黑体'],
+            layoutFontF:['微软雅黑','宋体','黑体','仿宋','楷体','隶书','幼圆','思源宋体','思源黑体','Helvetica','Arial','Arial Black','Georgia','Impact','Tahoma','Times New Roman','Andale Mono','Verdana','Book Antiqua','Comic Sans MS','Courier New','Webdings','Wingdings'],
+            // layoutFontF:['Arial','Georgia','Impact','Tahoma','Times New Roman','Verdana','思源宋体','思源黑体'],
             layoutFontS:['12','13','14','15','16','18','20','24','28','32','36','40'],
             layoutFontW:[{value:'normal',label:this.$t('SystemManage.BaseConfig.style_font_w_normal')},
                         {value:'bold',label:this.$t('SystemManage.BaseConfig.style_font_w_bold')}],