Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

public/react/public/css/demo_index.html

@@ -1812,6 +1812,12 @@
                 <div class="code-name">&amp;#xe710;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe711;</span>
+                <div class="name">编组</div>
+                <div class="code-name">&amp;#xe711;</div>
+              </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -4535,6 +4541,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-bianzu2"></span>
+            <div class="name">
+              编组
+            </div>
+            <div class="code-name">.icon-bianzu2
+            </div>
+          </li>
+          
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -6940,6 +6955,14 @@
                 <div class="code-name">#icon-fuzhi3</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bianzu2"></use>
+                </svg>
+                <div class="name">编组</div>
+                <div class="code-name">#icon-bianzu2</div>
+            </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>

public/react/public/css/iconfont.json

@@ -2083,6 +2083,13 @@
       "font_class": "fuzhi3",
       "unicode": "e710",
       "unicode_decimal": 59152
+    },
+    {
+      "icon_id": "12608142",
+      "name": "编组",
+      "font_class": "bianzu2",
+      "unicode": "e711",
+      "unicode_decimal": 59153
     }
   ]
 }

public/react/public/css/iconfont.svg

@@ -911,6 +911,9 @@ Created by iconfont
     <glyph glyph-name="fuzhi3" unicode="&#59152;" d="M648.533333-128h-477.866666C75.093333-128 0-52.906667 0 42.666667v477.866666C0 616.106667 75.093333 691.2 170.666667 691.2h477.866666C744.106667 691.2 819.2 616.106667 819.2 520.533333v-477.866666c0-95.573333-75.093333-170.666667-170.666667-170.666667z m-477.866666 750.933333C116.053333 622.933333 68.266667 575.146667 68.266667 520.533333v-477.866666c0-54.613333 47.786667-102.4 102.4-102.4h477.866666c54.613333 0 102.4 47.786667 102.4 102.4v477.866666c0 54.613333-47.786667 102.4-102.4 102.4h-477.866666zM955.733333 110.933333c-20.48 0-34.133333 13.653333-34.133333 34.133334V691.2c0 54.613333-47.786667 102.4-102.4 102.4H273.066667c-20.48 0-34.133333 13.653333-34.133334 34.133333s13.653333 34.133333 34.133334 34.133334h546.133333c95.573333 0 170.666667-75.093333 170.666667-170.666667v-546.133333c0-20.48-13.653333-34.133333-34.133334-34.133334z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="bianzu2" unicode="&#59153;" d="M512 353.882353m-240.941176 0a240.941176 240.941176 0 1 1 481.882352 0 240.941176 240.941176 0 1 1-481.882352 0ZM512 534.588235m-361.411765 0a361.411765 361.411765 0 1 1 722.82353 0 361.411765 361.411765 0 1 1-722.82353 0ZM402.552471 426.285176L279.491765 527.600941a9.035294 9.035294 0 0 0 0 13.974588l123.030588 101.315765a9.035294 9.035294 0 0 0 14.757647-6.987294v-52.103529a9.035294 9.035294 0 0 1 9.035294-9.035295h171.309177a9.035294 9.035294 0 0 1 9.035294 9.035295v52.103529a9.035294 9.035294 0 0 0 14.757647 6.987294l123.030588-101.315765a9.035294 9.035294 0 0 0 0-13.974588l-123.030588-101.315765a9.035294 9.035294 0 0 0-14.757647 6.987295v52.103529a9.035294 9.035294 0 0 1-9.035294 9.035294H426.345412a9.035294 9.035294 0 0 1-9.035294-9.035294v-52.103529a9.035294 9.035294 0 0 0-14.757647-6.987295z"  horiz-adv-x="1024" />
+
+    
 
 
   </font>

public/react/public/index.html

@@ -158,6 +158,17 @@
 
     <!-- 在tpi js里加载这3个脚本 -->
     <script>
+      (function() {
+        if (window.history && window.history.pushState) {
+          $(window).on('popstate', function () {
+            window.history.pushState('forward', null, '#');
+            window.history.forward(1);
+            window.location.href = window.location.reload();
+          });
+        }
+        window.history.pushState('forward', null, '#'); //在IE中必须得有这两行
+        window.history.forward(1);
+      })();
       (function() { // Scoping function to avoid globals
 	    var href = location.href;
         if(window.location.port === "3007"){

public/react/src/AppConfig.js

@@ -10,6 +10,7 @@ const $ = window.$;
 const opens ="79e33abd4b6588941ab7622aed1e67e8";
 let timestamp;
 let checkSubmitFlg = false;
+let message501=false;
 broadcastChannelOnmessage('refreshPage', () => {
     window.location.reload()
 })
@@ -224,10 +225,19 @@ export function initAxiosInterceptors(props) {
         }
 
         if (response.data.status === 501) {
-          window.location.reload()
-          notification.warning({
-            description:response.data.message || '访问异常，请求不合理',
-          })
+          if(message501===false){
+            message501=true
+            notification.open({
+              message:"提示",
+              description:response.data.message || '访问异常，请求不合理',
+              style: {
+                zIndex: 99999999
+              }
+            })
+          }
+          window.setTimeout(function () {
+              message501=false
+          }, 2000);
         }