Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

# Conflicts:
#	src/assets/css/components/index.scss

src/assets/css/components/index.scss

@@ -68,4 +68,5 @@
 @import 'views/charts2/linkTrafficLine';
 @import 'views/charts2/dnsTrafficLine';
 @import 'views/charts2/dnsRecentEvents';
+@import 'views/charts2/dnsActiveMaliciousDomain';
 //@import '../chart';

src/assets/css/components/views/charts2/dnsActiveMaliciousDomain.scss

@@ -0,0 +1,65 @@
+.dns-mailcious-domain {
+  $blue: #046ECA;
+  $fontFamily: NotoSansHans-Medium;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .dns-mailcious-domain-title {
+    font-family: NotoSansHans-Medium;
+    font-size: 14px;
+    color: #353636;
+    margin-bottom: 12px;
+  }
+
+  .dns-mailcious-domain-table {
+    height: 100% !important;
+    border: 1px solid #E2E5EC;
+    border-radius: 4px;
+    padding: 1px;
+
+    .el-table__header-wrapper {
+      tr th {
+        padding: 4px 0;
+
+        .dns-column__span {
+          font-family: $fontFamily;
+          font-size: 12px;
+          color: #353636;
+        }
+      }
+    }
+  }
+
+  .data-mailcious-domain-table {
+    display: flex !important;
+    height: auto;
+    line-height: 16.9px;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: wrap;
+
+    .data-column-domain, .data-column-ips {
+      font-family: NotoSansSChineseRegular;
+      width: 210px;
+      font-size: 12px;
+      color: $blue;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+
+      .data-column-ips-hover-block {
+        height: 24px;
+        line-height: 24px;
+        color: #046ECA;
+      }
+    }
+  }
+
+  //.el-table--group::after, .el-table--border::after, .el-table::before {
+  //  height: 0px;
+  //}
+
+}

src/assets/css/components/views/charts2/linkBlock.scss

@@ -29,9 +29,16 @@
       margin: auto;
 
       .block-list__block {
-        margin: 0 2px;
+        padding: 0 2px;
         height: 51px;
+        cursor: pointer;
+        overflow: hidden;
 
+        &:hover {
+          .block-hex-in {
+            box-shadow: 0 1px 3px 0 #046ECA, 0 1px 3px 0 rgba(0,0,0,0.50);
+          }
+        }
         .block-hex {
           overflow: hidden;
           display: block;
@@ -45,16 +52,11 @@
           height: 51px;
           text-align: center;
           transform: skewY(-30deg) rotate(60deg);
-          cursor: pointer;
           box-shadow: none;
           transition: all linear .2s;
-
-          &:hover {
-            box-shadow: 0 1px 3px 0 #046ECA, 0 1px 3px 0 rgba(0,0,0,0.50);
-          }
         }
         &:nth-child(9n + 1) {
-          margin-left: 26px;
+          margin-left: 24px;
         }
         &:nth-child(n + 5) {
           margin-top: -9px;