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

nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss

@@ -364,11 +364,14 @@
     height: 100%;
   }
   .textarea-box {
+    overflow: hidden;
+    resize: vertical;
     // border: 1px solid $--border-color-light;
     background-color: $--background-color-empty;
     .textarea-small.el-textarea {
       height: 100% !important;
       border: 1px solid $--border-color-light;
+      box-sizing: border-box;
     }
     .textarea-big.el-textarea {
       height: calc(100% - 40px) !important;
@@ -385,6 +388,7 @@
     border: 1px solid $--border-color-light;
     display: flex;
     flex-direction: column;
+    box-sizing: border-box;
     .ql-toolbar.ql-snow {
       border-top: unset !important;
       border-left: unset !important;
@@ -496,3 +500,11 @@
     bottom: 5px;
   }
 }
+.resize-rich-text-editor-table {
+  .el-table--border td:first-child .cell {
+    padding-right: 20px;
+  }
+  .el-table__body-wrapper {
+    overflow-x: hidden;
+  }
+}

nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue

@@ -343,12 +343,13 @@ export default {
         type: 'warning'
       }).then(() => {
         let url = ''
-        if (this.from === fromRoute.alertSilence) {
-          this.alertSilenceUrl = `/alert/silence/${this.obj.id}/rel`
-          url = this.alertSilenceUrl
-        } else {
-          url = this.url
-        }
+        // if (this.from === fromRoute.alertSilence) {
+        //   this.alertSilenceUrl = `/alert/silence/${this.obj.id}/rel`
+        //   url = this.alertSilenceUrl
+        // } else {
+        //   url = this.url
+        // }
+        url = this.url
         this.$delete(url + '?ids=' + row.id + '&state=' + row.state).then(response => {
           if (response.code === 200) {
             self.delFlag = true

nezha-fronted/src/components/common/bottomBox/tabs/commentsBottomTab.vue

@@ -14,7 +14,7 @@
   >
     <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
     <template v-slot>
-      <div class="textarea-box" :style="{height: rowBox ?'184px':'33px','margin-bottom': '10px'}">
+      <div class="textarea-box" :style="{height: rowBox ?'184px':'33px','margin-bottom': '10px', 'min-height': rowBox ?'184px':'33px'}">
         <el-input
           v-if="!rowBox"
           type="textarea"

nezha-fronted/src/components/common/table/asset/assetCommentTable.vue

@@ -6,6 +6,7 @@
     :height="height"
     :show-header="false"
     tooltip-effect="light"
+    class="resize-rich-text-editor-table"
     border
     @header-dragend="dragend"
     @sort-change="tableDataSort"
@@ -39,7 +40,7 @@
             <i v-if="scope.row.createUser.id == userId" class="nz-icon nz-icon-edit descriptions-button" @click="edit(scope.row.id)" :title="$t('overall.edit')" style="margin-right: 18px;cursor: pointer;"></i>
             <i v-if="scope.row.createUser.id == userId" class="nz-icon nz-icon-delete descriptions-button" @click="$emit('del', scope.row)" :title="$t('overall.delete')" style="cursor: pointer;"></i>
           </div>
-          <div v-if="editContentId == scope.row.id" class="textarea-box" style="height:184px;margin-top: 5px;">
+          <div v-if="editContentId == scope.row.id" class="textarea-box" style="height:184px;margin-top: 5px;min-height: 184px">
             <rich-text-editor class="comment-editor" ref="richTextEditor" :edit-data="editComment.html" @textChange="textChange(arguments)" style="height:100%;">
               <div class="textarea-button">
                 <button class="nz-btn nz-btn-size-mini nz-btn-style-normal" style="margin-right: 10px" type="button"  @click="$emit('save', editComment,true)"><span>{{$t('overall.save')}}</span></button>