Merge branch 'demand-202'

src/views/datasheet_manage/components/insertDateDia.vue

@@ -7,7 +7,7 @@
 		@close="cancelHandle"
 		custom-class="dialog"
 		center
-		width="650px"
+		width="750px"
 		v-dialogDrag>
 			<div class="dialog-main">
 

src/views/ppt_manage/newVersion/components/editor/chooseCover/TextEl.vue

@@ -92,7 +92,7 @@
                     inline: true,
                     selector: `#${this.elementInfo.id}-editorDom`,
                     paste_as_text: true,
-                    fontsize_formats: '12px 14px 16px 18px 20px 22px 24px 36px 48px',
+                    fontsize_formats: '6px 8px 10px 12px 14px 16px 18px 20px 22px 24px 36px 48px',
                     font_formats: `微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';
                         楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;
                         Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;

src/views/ppt_manage/newVersion/components/formatEl/TextEl.vue

@@ -72,7 +72,7 @@ export default {
         selector: `#text_${this.index}_${this.position}`,
         paste_as_text: true,
        /*  paste_block_drop: true, 开启后阻止drop事件*/
-        fontsize_formats:'12px 14px 16px 18px 20px 22px 24px 36px 48px',
+        fontsize_formats:'6px 8px 10px 12px 14px 16px 18px 20px 22px 24px 36px 48px',
         font_formats:`微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';
                       楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;
                       Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;

src/views/ppt_manage/newVersion/components/layer/Element/TextShape.vue

@@ -86,7 +86,7 @@ export default {
         inline: true,
         selector: `#${this.elementInfo.id}-editorDom`,
         paste_as_text: true,
-        fontsize_formats:'12px 14px 16px 18px 20px 22px 24px 36px 48px',
+        fontsize_formats:'6px 8px 10px 12px 14px 16px 18px 20px 22px 24px 36px 48px',
         font_formats:`微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';
                       楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;
                       Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;

src/views/report_manage/mixins/editor.js

@@ -42,7 +42,7 @@ export default {
           "redo",
         ],
         height: 800,
-        fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
+        fontSize: ["6","8","10","12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
         fontSizeDefaultSelection: "16",
         theme: "dark", //主题
         placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",

src/views/report_manage/mixins/reportMixin.js

@@ -97,7 +97,7 @@ export default {
           "redo",
         ],
         height: 800,
-        fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
+        fontSize: ["6","8","10","12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
         fontSizeDefaultSelection: "16",
         theme: "dark", //主题
         placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",

src/views/report_manage/reportEn/reportEditor.vue

@@ -493,7 +493,7 @@ export default {
 					'undo',
 					'redo',
         ],
-        fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
+        fontSize: ["6","8","10","12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
         height:300,
         fontSizeDefaultSelection: "16",
         quickInsertEnabled: false,

src/views/smartReport/components/TextEdit.vue

@@ -59,7 +59,7 @@ export default {
                     "redo",
                 ],
                 height: 800,
-                fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
+                fontSize: ["6","8","10","12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
                 fontSizeDefaultSelection: "16",
                 theme: "dark", //主题
                 placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",