Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

components.d.ts

@@ -24,10 +24,8 @@ declare module 'vue' {
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTable: typeof import('element-plus/es')['ElTable']

src/assets/styles/common.css

@@ -12,18 +12,6 @@ page {
 	url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/cW4aPGiVFgIJ.woff") format("woff");
 	font-display: swap;
 }
-@font-face {
-	font-family: FZCSJW--GB1-0;
-	src: url("http://uploadfile.oytour.com/assets/font/FZCSJW.ttf") format("TrueType");
-}
-@font-face {
-	font-family: FZKTJW--GB1-0;
-	src: local('方正楷体简体');
-}
-@font-face {
-	font-family: DengXian;
-	src: local('等线');
-}
 .alifont{
 	font-family: alifont,chineseAlifont;
 }

src/store/font.ts

@@ -68,6 +68,16 @@ export const useFontStore = defineStore('fonts',{
                         await fontFace.load();
                         document.fonts.add(fontFace)
                         this.loaded.push(item.fontFamily)
+                        let newStyle = document.createElement('style');
+                        const fontFormat = item.fontUrl.toLowerCase().indexOf('.ttf')!=-1?'truetype':item.fontUrl.split('.').reverse()[0]
+                        newStyle.setAttribute("type", "text/css");
+                        newStyle.appendChild(document.createTextNode("\
+                            @font-face {\
+                                font-family: '" + item.fontFamily + "';\
+                                src: "+url+" format("+fontFormat+");\
+                            }\
+                        "));
+                        document.head.appendChild(newStyle);
                     } catch (error) {
                         console.log('加载字体报错',error)
                     }

src/views/Market/newFile.vue

@@ -441,14 +441,7 @@ const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
 #ImageContainer *{
     position: absolute;
 }
-@font-face {
-  font-family: FZCSJW--GB1-0;
-  src: local('方正粗宋简体');
-}
-@font-face {
-  font-family: MicrosoftYaHeiLight;
-  src: local('Microsoft YaHei Light');
-}
+
 .text-mask{
   -webkit-background-clip: text;
 }