Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

nezha-fronted/src/assets/css/components/index.scss

@@ -72,6 +72,7 @@
 @import './common/table/asset/assetTable.scss';
 @import './common/table/settings/userTable.scss';
 @import './common/table/settings/backupsTable.scss';
+@import './common/table/settings/endpointTable.scss';
 @import './common/table/settings/switchTab.scss';
 @import './common/table/settings/cortexDetailTable.scss';
 @import './common/table/special/endpointQuery.scss';

nezha-fronted/src/components/common/alert/nzTooltip.vue

@@ -22,8 +22,7 @@ export default {
     alertTableDialog: Boolean,
     isTopoInfo: Boolean,
     width: {
-      type: Number,
-      default: 150
+      type: Number
     }
   },
   data () {
@@ -90,7 +89,11 @@ export default {
           labelPosition.right =
             clientWidth - position.left - leftOffSetView + 'px'
         }
-        labelPosition.width = this.width + 'px'
+        if (this.width) {
+          labelPosition.width = this.width + 'px'
+        } else {
+          labelPosition.width = 'auto'
+        }
         return labelPosition
       }
     },

nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js

@@ -218,6 +218,7 @@ export default {
       pen.isBottom = true
       pen.flipX = pen.flipX || false
       pen.flipY = pen.flipY || false
+      pen.locked = pen.locked || 0
       if (pen.rect) {
         pen.x = pen.rect.x
         pen.y = pen.rect.y

nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue

@@ -241,6 +241,7 @@ export default {
         }
       }
       getTopology(this.meta2dId).setValue(obj)
+      this.$forceUpdate()
     },
     copyPen (item) {
       const obj = deepClone(item)

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

@@ -100,7 +100,7 @@
           <span class="configs-endpoint metrics"
                 @mouseenter="labelHover1(scope.row, item.prop, true, $event)"
                 @mouseleave="labelHover1(scope.row, item.prop, false, $event, true)">
-            [{{scope.row.configs[0].enable ?  'Metrics':''}}{{scope.row.configs[0].enable&&scope.row.configs[1].enable?',':''}}{{scope.row.configs[1].enable ?  'logs' : ''}}]
+            [{{scope.row.configs[0].enable ?  'Metrics':''}}{{scope.row.configs[0].enable&&scope.row.configs[1].enable?',':''}}{{scope.row.configs[1].enable ?  'Logs' : ''}}]
           </span>
           <nz-tooltip :that="scope.row[item.prop]" class="data-column__" v-if="scope.row[item.prop] && scope.row[item.prop].loading" :type="item.prop" @tipHover="tipHover($event,scope.row, item.prop,)" >
               <div name="default">