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

3 files changed, 27 insertions, 30 deletions

diff --git a/nezha-fronted/src/components/chart/richTextEditor.vue b/nezha-fronted/src/components/chart/richTextEditor.vue
index 5d2aefd87..b28a8e692 100644
--- a/nezha-fronted/src/components/chart/richTextEditor.vue
+++ b/nezha-fronted/src/components/chart/richTextEditor.vue
@@ -54,7 +54,6 @@ export default {
         // 覆盖默认上传图片
         const toolbar = this.quill.getModule('toolbar')
         toolbar.addHandler('image', (value) => {
-          this.uploadType = 'image'
           if (value) {
             this.$refs.upload.$children[0].$refs.input.click()
           } else {
@@ -106,6 +105,7 @@ export default {
     },
     // 上传图片
     async uploadChange (file) {
+      // 图片小于4M
       const isLt4M = (file.size / 1024 / 1024) < 4
       if (isLt4M) {
         console.log(this.$axios.defaults.baseURL + 'file/download/')
@@ -142,29 +142,30 @@ export default {
 </script>
 
 <style>
-  .rich-text-editor .ql-editor{
-    overflow: auto !important;
-  }
-  .text-too-long{
-    color: #F56C6C;
-    font-size: 12px;
-    line-height: 1;
-    padding-top: 4px;
-    position: absolute;
-    top: 100%;
-    left: 0;
-  }
-  .rich-text-editor-error  {
-    border: 1px solid #F56C6C;
-  }
-  .rich-text-editor-error .ql-container.ql-snow {
-    border: unset !important
-  }
 
-  .rich-text-editor-error .ql-toolbar.ql-snow{
-    border-top: unset !important;
-    border-left: unset !important;
-    border-right: unset !important;
-  }
+.rich-text-editor .ql-editor{
+  overflow: auto !important;
+}
+.text-too-long{
+  color: #F56C6C;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+}
+.rich-text-editor-error  {
+  border: 1px solid #F56C6C;
+}
+.rich-text-editor-error .ql-container.ql-snow {
+  border: unset !important
+}
+
+.rich-text-editor-error .ql-toolbar.ql-snow{
+  border-top: unset !important;
+  border-left: unset !important;
+  border-right: unset !important;
+}
 
 </style>
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 1f4b36d31..f1a4a3348 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -109,7 +109,7 @@
         <span>{{$t('overall.save')}}</span>
       </button>
     </div>
-<!--    预览-->
+   <!-- 预览 -->
     <el-dialog
       v-if="previewShow"
       :visible.sync="previewShow"
@@ -501,7 +501,7 @@ export default {
     preview (show) {
       if (show) {
         this.prevChart = ''
-        setTimeout(()=>{
+        setTimeout(() => {
           const start = new Date().setHours(new Date().getHours() - 1)
           const end = new Date()
           this.timeRange = [bus.computeTimezoneTime(start), bus.computeTimezoneTime(end)]
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index 9d585f7fa..6eefe3d65 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -416,7 +416,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>