Merge branch 'master' into feature/业务线管理

public/css/iconfont/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">标记</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe710;</span>
+                <div class="name">取消标记</div>
+                <div class="code-name">&amp;#xe710;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6f0;</span>
+                <div class="name">双击</div>
+                <div class="code-name">&amp;#xe6f0;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe61e;</span>
                 <div class="name">export</div>
@@ -204,9 +222,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1741245710478') format('woff2'),
-       url('iconfont.woff?t=1741245710478') format('woff'),
-       url('iconfont.ttf?t=1741245710478') format('truetype');
+  src: url('iconfont.woff2?t=1750295665179') format('woff2'),
+       url('iconfont.woff?t=1750295665179') format('woff'),
+       url('iconfont.ttf?t=1750295665179') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -232,6 +250,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-biaoji"></span>
+            <div class="name">
+              标记
+            </div>
+            <div class="code-name">.icon-biaoji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quxiaobiaoji"></span>
+            <div class="name">
+              取消标记
+            </div>
+            <div class="code-name">.icon-quxiaobiaoji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shuangji"></span>
+            <div class="name">
+              双击
+            </div>
+            <div class="code-name">.icon-shuangji
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-export"></span>
             <div class="name">
@@ -457,6 +502,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-biaoji"></use>
+                </svg>
+                <div class="name">标记</div>
+                <div class="code-name">#icon-biaoji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quxiaobiaoji"></use>
+                </svg>
+                <div class="name">取消标记</div>
+                <div class="code-name">#icon-quxiaobiaoji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shuangji"></use>
+                </svg>
+                <div class="name">双击</div>
+                <div class="code-name">#icon-shuangji</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-export"></use>

public/css/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4257468 */
-  src: url('iconfont.woff2?t=1741245710478') format('woff2'),
-       url('iconfont.woff?t=1741245710478') format('woff'),
-       url('iconfont.ttf?t=1741245710478') format('truetype');
+  src: url('iconfont.woff2?t=1750295665179') format('woff2'),
+       url('iconfont.woff?t=1750295665179') format('woff'),
+       url('iconfont.ttf?t=1750295665179') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-biaoji:before {
+  content: "\e604";
+}
+
+.icon-quxiaobiaoji:before {
+  content: "\e710";
+}
+
+.icon-shuangji:before {
+  content: "\e6f0";
+}
+
 .icon-export:before {
   content: "\e61e";
 }

public/css/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "14559255",
+      "name": "标记",
+      "font_class": "biaoji",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "33872224",
+      "name": "取消标记",
+      "font_class": "quxiaobiaoji",
+      "unicode": "e710",
+      "unicode_decimal": 59152
+    },
+    {
+      "icon_id": "39084114",
+      "name": "双击",
+      "font_class": "shuangji",
+      "unicode": "e6f0",
+      "unicode_decimal": 59120
+    },
     {
       "icon_id": "10124054",
       "name": "export",