[ISSUE alibaba#9448] use local font files (alibaba#9995)

- add some font files to local path Close alibaba#9448
onewe · Feb 23, 2023 · 7ca8c59 · 7ca8c59
1 parent 579571c
commit 7ca8c59
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 30 deletions.
diff --git a/console-ui/build/webpack.prod.conf.js b/console-ui/build/webpack.prod.conf.js
@@ -27,7 +27,8 @@ cssLoader.use.push({
   options: {
     modifyVars: {
       '$icon-font-path': '"../console-ui/public/icons/icon-font"',
-      '$font-custom-path': '"../console-ui/public/fonts/"'
+      '$font-custom-path': '"../console-ui/public/fonts/"',
+      '$adv-icon-font-path': '"../console-ui/public/fonts/font_1533967_slipq25tezj"',
     }
   }
 })

diff --git a/console-ui/src/index.js b/console-ui/src/index.js
@@ -55,8 +55,6 @@ import reducers from './reducers';
 import { changeLanguage } from './reducers/locale';
 
 import './index.scss';
-import '@alifd/theme-design-pro/variables.css';
-import '@alifd/theme-design-pro/dist/next.var.css';
 import PropTypes from 'prop-types';
 
 module.hot && module.hot.accept();

diff --git a/console-ui/src/index.scss b/console-ui/src/index.scss
@@ -1258,3 +1258,15 @@ form.vertical-margin-lg .form-group {
 .row-bg-red {
   background-color: #ffece4;
 }
+
+
+// 引用主题变量
+@import "~@alifd/theme-design-pro/variables.scss";
+
+$adv-icon-font-path: "http://at.alicdn.com/t/font_1533967_slipq25tezj.woff2" !default;
+$icon-font-path: $adv-icon-font-path;
+
+// 引用基础主题
+@import "~@alifd/next/index.scss";
+
+@import "~@alifd/theme-design-pro/icons.scss";
diff --git a/console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf b/console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf
diff --git a/console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff b/console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff
diff --git a/console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2 b/console/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2
diff --git a/console/src/main/resources/static/css/main.css b/console/src/main/resources/static/css/main.css
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?a8bd622b4e7c17b2a122" rel="stylesheet"></head>
+<link href="./css/main.css?e6cfdf2bcbe588ff572f" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?a8bd622b4e7c17b2a122"></script></body>
+<script type="text/javascript" src="./js/main.js?e6cfdf2bcbe588ff572f"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js