Merge pull request '部分缺陷' (#813) from Eeeros/forgeplus-react:gitlink_ssr_head into gitlink_ssr_head

src/common/util/emoji.js

@@ -93,7 +93,7 @@ export const emojiList = [
     { index: 1, code: ':hankey:', name: 'hankey' },
     { index: 1, code: ':poop:', name: 'poop' },
     { index: 1, code: ':shit:', name: 'shit' },
-    { index: 1, code: ':+1:', name: '+1' },
+    { index: 1, code: ':+1:', name: 'plus1' },
     { index: 1, code: ':thumbsup:', name: 'thumbsup' },
     { index: 1, code: ':-1:', name: '-1' },
     { index: 1, code: ':thumbsdown:', name: 'thumbsdown' },
@@ -299,7 +299,7 @@ export const emojiList = [
     { index: 1, code: ':waning_crescent_moon:', name: 'waning_crescent_moon' },
     { index: 1, code: ':last_quarter_moon_with_face:', name: 'last_quarter_moon_with_face' },
     { index: 1, code: ':first_quarter_moon_with_face:', name: 'first_quarter_moon_with_face' },
-    { index: 1, code: ':moon:', name: 'moon' },
+    { index: 1, code: ':moon:', name: 'waxing_gibbous_moon' },
     { index: 1, code: ':earth_africa:', name: 'earth_africa' },
     { index: 1, code: ':earth_americas:', name: 'earth_americas' },
     { index: 1, code: ':earth_asia:', name: 'earth_asia' },
@@ -860,7 +860,7 @@ export const emojiList = [
     { index: 1, code: ':white_medium_small_square:', name: 'white_medium_small_square' },
     { index: 1, code: ':black_medium_square:', name: 'black_medium_square' },
     { index: 1, code: ':white_medium_square:', name: 'white_medium_square' },
-    { index: 1, code: ':black_large_square:', name: 'black_large_square' },
+    { index: 1, code: ':black_large_square:', name: 'black_square' },
     { index: 1, code: ':white_large_square:', name: 'white_large_square' },
     { index: 1, code: ':white_check_mark:', name: 'white_check_mark' },
     { index: 1, code: ':black_square_button:', name: 'black_square_button' },

src/components/render-html.jsx

@@ -70,11 +70,14 @@ export default ({
         rs = rs.replace(matchStr[i],getEmoji(matchStr[i]));
       }
     }
-
     if(rs){
       for(let i = 0;i<emojiList.length;i++){
         if(rs.indexOf(emojiList[i].code)>=0){
-          const reg = '/\\'+emojiList[i].code+'/g'
+          let reg = '/\\'+emojiList[i].code+'/g'
+          if (emojiList[i].code === ':+1:') {
+            // 匹配+1
+            reg = /:\+1:/g
+          }
           switch(emojiList[i].index){
             case 1:
               rs = rs.replace(eval(reg), `<img style="width:24px;" src="https://testforum.trustie.net/editormd/emoji/${emojiList[i].name}.png"/>`)

src/forge/Information/index.scss

@@ -1616,6 +1616,7 @@
 .source_detail_box{
   background-color: #fff;
   padding:10px 35px 70px 30px;
+  word-wrap: break-word;
   .s_d_title{
     padding:20px 0px 10px;
     border-bottom: 1px dashed rgba(141, 149, 172, 0.27);

src/forge/SecuritySetting/bot/exploit/configuration/compenent/basicInformation.jsx

@@ -36,6 +36,7 @@ function BasicInformation(props){
     if(botDetail){
       setContent(botDetail.bot_des);
       setImage(botDetail.logo)
+      window.scrollTo(0,0)
     }
   },[botDetail])