qianlishi пре 4 година
родитељ
комит
0cda48fab7

+ 26 - 3
report-ui/src/assets/iconfont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe738;</span>
+                <div class="name">中国地图</div>
+                <div class="code-name">&amp;#xe738;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe625;</span>
                 <div class="name">表格</div>
@@ -690,9 +696,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1625020835610') format('woff2'),
-       url('iconfont.woff?t=1625020835610') format('woff'),
-       url('iconfont.ttf?t=1625020835610') format('truetype');
+  src: url('iconfont.woff2?t=1625038596365') format('woff2'),
+       url('iconfont.woff?t=1625038596365') format('woff'),
+       url('iconfont.ttf?t=1625038596365') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -718,6 +724,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont iconzhongguoditu"></span>
+            <div class="name">
+              中国地图
+            </div>
+            <div class="code-name">.iconzhongguoditu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont iconbiaoge"></span>
             <div class="name">
@@ -1672,6 +1687,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconzhongguoditu"></use>
+                </svg>
+                <div class="name">中国地图</div>
+                <div class="code-name">#iconzhongguoditu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconbiaoge"></use>

+ 7 - 3
report-ui/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1513211 */
-  src: url('iconfont.woff2?t=1625020835610') format('woff2'),
-       url('iconfont.woff?t=1625020835610') format('woff'),
-       url('iconfont.ttf?t=1625020835610') format('truetype');
+  src: url('iconfont.woff2?t=1625038596365') format('woff2'),
+       url('iconfont.woff?t=1625038596365') format('woff'),
+       url('iconfont.ttf?t=1625038596365') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconzhongguoditu:before {
+  content: "\e738";
+}
+
 .iconbiaoge:before {
   content: "\e625";
 }

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
report-ui/src/assets/iconfont/iconfont.js


+ 7 - 0
report-ui/src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "22378736",
+      "name": "中国地图",
+      "font_class": "zhongguoditu",
+      "unicode": "e738",
+      "unicode_decimal": 59192
+    },
     {
       "icon_id": "21338828",
       "name": "表格",

BIN
report-ui/src/assets/iconfont/iconfont.ttf


BIN
report-ui/src/assets/iconfont/iconfont.woff


BIN
report-ui/src/assets/iconfont/iconfont.woff2


+ 1 - 1
report-ui/src/views/report/bigscreen/designer/tools.js

@@ -4568,7 +4568,7 @@ const widgetTools = [
     code: 'widget-map',
     type: 'chart',
     label: '中国地图',
-    icon: 'chinaMapChart',
+    icon: 'iconzhongguoditu',
     options: {
       setup: [
         {

Неке датотеке нису приказане због велике количине промена