Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.11

nezha-fronted/src/assets/css/components/charts/chart.scss

@@ -525,13 +525,13 @@
     white-space: initial;
     box-sizing: border-box;
     padding: 12px 15px;
+    li{
+      list-style-type: unset !important;
+    }
   }
   .v-md-copy-code-btn{
     display: none !important;
   }
-  li{
-    list-style-type: unset !important;
-  }
 }
 
 

nezha-fronted/src/components/common/mixin/dataList.js

@@ -62,8 +62,6 @@ export default {
     delCallBack (ids, from) {
       const dataList = this.$refs.dataList
       if ((dataList && dataList.from == from) && (dataList.bottomBox && dataList.bottomBox.showSubList)) {
-        console.log(dataList.bottomBox.object)
-        console.log(dataList.bottomBox.object.id)
         if (ids.indexOf(dataList.bottomBox.object.id) !== -1) {
           dataList.bottomBox.showSubList = false
         }

nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue

@@ -136,6 +136,7 @@
       :id="alertLabelId"
       :that="alertLabelObj"
       :type="alertLabelType"
+      @tipHover="tipHover"
     ></alertLabel>
     <el-upload
       action=""