Merge branch 'develop'

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1627378753360') format('woff2'),
-       url('iconfont.woff?t=1627378753360') format('woff'),
-       url('iconfont.ttf?t=1627378753360') format('truetype');
+  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
+       url('iconfont.woff?t=1627870211301') format('woff'),
+       url('iconfont.ttf?t=1627870211301') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-qingqiuicon:before {
+  content: "\e871";
+}
+
+.icon-xiangyingicon:before {
+  content: "\e87c";
+}
+
 .icon-duoxuanxuanzhong:before {
   content: "\e88f";
 }
@@ -21,10 +29,6 @@
   content: "\e890";
 }
 
-.icon-daochu_xuanfu1:before {
-  content: "\e891";
-}
-
 .icon-chenggongicon:before {
   content: "\e892";
 }
@@ -53,14 +57,6 @@
   content: "\e89b";
 }
 
-.icon-xuanzhong3:before {
-  content: "\e89e";
-}
-
-.icon-xuanzechenggongicon:before {
-  content: "\e89f";
-}
-
 .icon-xiezuozheguanliicon:before {
   content: "\e8a1";
 }
@@ -73,10 +69,6 @@
   content: "\e8a3";
 }
 
-.icon-bg:before {
-  content: "\e8a4";
-}
-
 .icon-xuanzhongjibenshezhiicon:before {
   content: "\e8a5";
 }
@@ -121,10 +113,6 @@
   content: "\e870";
 }
 
-.icon-fuceng:before {
-  content: "\e871";
-}
-
 .icon-cuowu:before {
   content: "\e872";
 }

public/css/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "23261798",
+      "name": "请求icon",
+      "font_class": "qingqiuicon",
+      "unicode": "e871",
+      "unicode_decimal": 59505
+    },
+    {
+      "icon_id": "23261799",
+      "name": "响应icon",
+      "font_class": "xiangyingicon",
+      "unicode": "e87c",
+      "unicode_decimal": 59516
+    },
     {
       "icon_id": "23144143",
       "name": "多选选中",
@@ -19,13 +33,6 @@
       "unicode": "e890",
       "unicode_decimal": 59536
     },
-    {
-      "icon_id": "23144145",
-      "name": "导出_悬浮",
-      "font_class": "daochu_xuanfu1",
-      "unicode": "e891",
-      "unicode_decimal": 59537
-    },
     {
       "icon_id": "23144146",
       "name": "成功icon",
@@ -75,20 +82,6 @@
       "unicode": "e89b",
       "unicode_decimal": 59547
     },
-    {
-      "icon_id": "23144156",
-      "name": "选中",
-      "font_class": "xuanzhong3",
-      "unicode": "e89e",
-      "unicode_decimal": 59550
-    },
-    {
-      "icon_id": "23144157",
-      "name": "选择成功icon",
-      "font_class": "xuanzechenggongicon",
-      "unicode": "e89f",
-      "unicode_decimal": 59551
-    },
     {
       "icon_id": "23144158",
       "name": "协作者管理icon",
@@ -110,13 +103,6 @@
       "unicode": "e8a3",
       "unicode_decimal": 59555
     },
-    {
-      "icon_id": "23144161",
-      "name": "bg",
-      "font_class": "bg",
-      "unicode": "e8a4",
-      "unicode_decimal": 59556
-    },
     {
       "icon_id": "23144162",
       "name": "选中基本设置icon",
@@ -194,13 +180,6 @@
       "unicode": "e870",
       "unicode_decimal": 59504
     },
-    {
-      "icon_id": "23046249",
-      "name": "复层",
-      "font_class": "fuceng",
-      "unicode": "e871",
-      "unicode_decimal": 59505
-    },
     {
       "icon_id": "23046252",
       "name": "错误",

src/forge/Settings/Webhooks/sub/historyContent.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Menu } from 'antd';
+import { Menu , Tag } from 'antd';
 import Nodata from '../../../Nodata';
 import ReactJson from 'react-json-view';
 import Editor from "../../../Component/Monaco";
@@ -50,8 +50,10 @@ function HistoryContent({request_content,payload_content,response_content}) {
     <div className="contentPanel">
       <div>
         <Menu selectedKeys={[key]} onSelect={(e)=>setKey(e.key)} mode={"horizontal"} className="contentMenu">
-          <Menu.Item key={"request"}><i className="iconfont icon-weixuanzhongqingqiuicon font-15 mr5"></i>请求</Menu.Item>
-          <Menu.Item key={"response"}><i className="iconfont icon-xuanzhongxiangyingicon font-16 mr5"></i>响应</Menu.Item>
+          <Menu.Item key={"request"}><i className="iconfont icon-qingqiuicon font-15 mr5"></i>请求内容</Menu.Item>
+          <Menu.Item key={"response"}><i className="iconfont icon-xiangyingicon font-16 mr5"></i>响应内容
+            {response_content && <Tag color={response_content.status === 200 ? "#2DB44D":"#CA0002"} style={{margin:"0px",marginLeft:"3px",fontSize:"12px"}}>{response_content.status}</Tag>}
+          </Menu.Item>
         </Menu>
       </div>
       <div style={{paddingLeft:"16px"}}>
@@ -61,7 +63,7 @@ function HistoryContent({request_content,payload_content,response_content}) {
             {
             requestHeader && requestHeader.length > 0 &&
               <div>
-                <p className="retitle">标题</p>
+                <p className="retitle">头信息</p>
                 <div className="con">
                   {
                     requestHeader.map((i,k)=>{
@@ -76,7 +78,7 @@ function HistoryContent({request_content,payload_content,response_content}) {
             {
               payload_content &&
               <div>
-                <p className="retitle">有效载荷</p>
+                <p className="retitle">内容</p>
                 <div className="con">
                   <ReactJson 
                     src={payload_content} 
@@ -99,7 +101,7 @@ function HistoryContent({request_content,payload_content,response_content}) {
             {
             responseHeader && responseHeader.length > 0 &&
               <div>
-                <p className="retitle">标题</p>
+                <p className="retitle">头信息</p>
                 <div className="con">
                   {
                     responseHeader.map((i,k)=>{