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

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

@@ -749,3 +749,11 @@
     color: $--button-gray-active-color;
   }
 }
+.line-area-box{
+  height: 100%;
+  width: 100%;
+  display: flex;
+  .line-area{
+    flex: 1;
+  }
+}

nezha-fronted/src/components/charts/line-chart-block.vue

@@ -948,8 +948,6 @@ export default {
         const panelTime = localStorage.getItem('panelTime') ? JSON.parse(localStorage.getItem('panelTime')) : ['', '']
         if (panelTime[0]) {
           const numInterval = new Date(panelTime[1]).getTime() - new Date(panelTime[0]).getTime()
-          console.log(numInterval)
-
           if (numInterval >= 60 * 60 * 1000) {
             option.xAxis.minInterval = 20 * 60 * 1000
           } else if (numInterval >= 30 * 60 * 1000 && numInterval < 60 * 60 * 1000) {

nezha-fronted/src/components/common/ChartDiagram/diagram.vue

@@ -1884,7 +1884,7 @@ export default {
             }
             item.strokeStyle = item.data.strokeStyle
             item.animatePlay = false
-            item.fontColor = '#000000'
+            item.fontColor = item.data.fontColor || '#222222'
             item.gradientType = item.data.gradientType ? item.data.gradientType : 0
             if (!item.data.gradientColor) {
               item.data.gradientType = 0
@@ -1902,7 +1902,7 @@ export default {
             item.fromArrowColor = item.data.arrowColor
             item.toArrowColor = item.data.arrowColor
             item.animatePlay = false
-            item.fontColor = '#000000'
+            item.fontColor = item.data.fontColor || '#22222'
           }
         })
         getTopology(this.topologyIndex).caches = {

nezha-fronted/src/components/common/language/cn.js

@@ -1455,7 +1455,17 @@ const cn = {
       cut: '剪切',
       copy: '复制',
       paste: '粘贴',
-      textContent: 'Text content'
+      textContent: 'Text content',
+      textAlign: '水平对齐',
+      textBaseline: '垂直对齐',
+      textOffsetX: '水平偏移',
+      textOffsetY: '垂直偏移',
+      left: '左对齐',
+      center: '居中',
+      right: '右对齐',
+      topOffsetY: '顶部对齐',
+      middleOffsetY: '居中',
+      bottomOffsetY: '底部对齐'
     },
     update: '更新'
   },

nezha-fronted/src/components/common/language/en.js

@@ -1459,7 +1459,17 @@ const en = {
       cut: 'Cut',
       copy: 'Copy',
       paste: 'Paste',
-      textContent: 'Text content'
+      textContent: 'Text content',
+      textAlign: 'Text align',
+      textBaseline: 'Text baseline',
+      textOffsetX: 'Text offsetX',
+      textOffsetY: 'Text offsetY',
+      left: 'left',
+      center: 'center',
+      right: 'right',
+      topOffsetY: 'top',
+      middleOffsetY: 'middle',
+      bottomOffsetY: 'bottom'
     },
     update: 'Update'
   },

nezha-fronted/src/components/common/project/L5/CanvasProps.vue

@@ -22,9 +22,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="!selection.pen.type&&fromDiagram" :label="$t('project.topology.name')" class="full-form-item" prop="type">
-            <el-input v-model="selection.pen.data.title" @change="changeTitle" class="input" size="small"></el-input>
-          </el-form-item>
           <!--iconToolState-->
 <!--          <el-form-item :label="'Icon state'" class="half-form-item" prop="type" v-if="!selection.pen.type">-->
 <!--            <el-switch-->
@@ -186,7 +183,11 @@
             <div class="tooltip-box" v-show="selection.pen.data.tooltipShow">
             <!--title-->
             <el-form-item :label="$t('project.topology.title')" class="full-form-item" prop="type">
-              <el-input v-model="selection.pen.data.chartTitle" @change="changeTitle" class="input" size="small"></el-input>
+              <el-input v-model="selection.pen.data.chartTitle" class="input" size="small"></el-input>
+            </el-form-item>
+            <!--remark-->
+            <el-form-item :label="$t('overall.remark')" class="full-form-item" prop="remark">
+              <el-input  maxlength="256" show-word-limit v-model="selection.pen.data.remark" :autosize="{ minRows: 2, maxRows: 6}" type="textarea"/>
             </el-form-item>
             <!--chart unit-->
             <el-form-item :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" prop="unit"
@@ -644,79 +645,106 @@
                   <nezhaColor :value-arr="[{name:'toArrowColor',value:selection.pen.toArrowColor}]" @colorChange="colorChange"/>
                 </div>
               </div>
-<!--              <div class="props-pen-item" v-if="selection.pen&&!selection.pen.type">-->
+
-<!--                <div>{{$t('project.topology.img')}}</div>-->
+            </div>
-<!--                <div class="p10 pl0">-->
+          </el-collapse-item>
-<!--                  <el-select :popper-append-to-body= 'false'>-->
+          <el-collapse-item :title="'Font'" name="5" v-if="selection.pen&&!selection.pen.type">
-<!--                    <el-option-group-->
+            <div class="flex flex-warp">
-<!--                      v-for="group in imgArr"-->
+              <div class="props-pen-item" style="width: 100%">
-<!--                      :key="group.label"-->
+                <div>{{$t('project.topology.textContent')}}</div>
-<!--                      :label="group.label">-->
+                <div class="p10 pl0">
-<!--                      <el-option-->
+                  <el-input v-model="selection.pen.data.title" @change="changeTitle" class="input" size="small"></el-input>
-<!--                        v-for="item in group.options"-->
+                </div>
-<!--                        :key="item.value"-->
+              </div>
-<!--                        :label="item.label"-->
+              <div class="props-pen-item" >
-<!--                        :value="item.value">-->
+                <div>{{$t('project.topology.fontSize')}}</div>
-<!--                      </el-option>-->
+                <div class="p10 pl0">
-<!--                    </el-option-group>-->
+                  <el-input-number
-<!--                  </el-select>-->
+                    @focus="inputFocus"
-<!--                </div>-->
+                    @blur="inputBlur"
-<!--              </div>-->
+                    :precision="0"
+                    controls-position="right"
+                    size="small" name="x"
+                    class="input"
+                    v-model.number="selection.pen.font.fontSize"
+                    :readonly="readonly"
+                    required
+                    @change="onChange()"></el-input-number>
+                </div>
+              </div>
+              <div class="props-pen-item">
+                <div>{{$t('project.topology.fontColor')}}</div>
+                <div class="p10 pl0">
+                  <nezhaColor :value-arr="[{name:'fontColor',value:selection.pen.fontColor}]" @colorChange="colorChange"/>
+                </div>
+              </div>
+
+              <div class="props-pen-item">
+                <div>{{$t('project.topology.textAlign')}}</div>
+                <div class="p10 pl0">
+                  <el-select :popper-append-to-body="false" class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
+                             size="mini"
+                             v-model="selection.pen.font.textAlign" value-key="chartType" @change="onChange">
+                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in textAlignOptions">
+                      <span class="panel-dropdown-label-txt">{{item.name}}</span>
+                    </el-option>
+                  </el-select>
+                </div>
+              </div>
+
+              <div class="props-pen-item">
+                <div>{{$t('project.topology.textBaseline')}}</div>
+                <div class="p10 pl0">
+                  <el-select :popper-append-to-body="false" class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
+                             size="mini"
+                             v-model="selection.pen.font.textOffsetX" value-key="chartType" @change="onChange">
+                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in textBaselineOptions">
+                      <span class="panel-dropdown-label-txt">{{item.name}}</span>
+                    </el-option>
+                  </el-select>
+                </div>
+              </div>
+
+              <div class="props-pen-item">
+                <div>{{$t('project.topology.textOffsetX')}}</div>
+                <div class="p10 pl0">
+                  <el-input-number
+                    @focus="inputFocus"
+                    @blur="inputBlur"
+                    :precision="0"
+                    controls-position="right"
+                    size="small" name="x"
+                    class="input"
+                    v-model.number="selection.pen.textOffsetX"
+                    :readonly="readonly"
+                    required
+                    @change="onChange()"></el-input-number>
+                </div>
+              </div>
+
+              <div class="props-pen-item">
+                <div>{{$t('project.topology.textOffsetY')}}</div>
+                <div class="p10 pl0">
+                  <el-input-number
+                    @focus="inputFocus"
+                    @blur="inputBlur"
+                    :precision="0"
+                    controls-position="right"
+                    size="small" name="x"
+                    class="input"
+                    v-model.number="selection.pen.textOffsetY"
+                    :readonly="readonly"
+                    required
+                    @change="onChange()"></el-input-number>
+                </div>
+              </div>
 
             </div>
           </el-collapse-item>
         </el-collapse>
-        <div class="project-content node-content">
-          <div class="project-content-title">{{$t('project.topology.animation')}}
-            <span class="float-right" style="margin-right: 10px">
-<!--              <el-switch-->
-<!--                v-model="selection.pen.data.animatePlay"-->
-<!--                :active-value="true"-->
-<!--                :inactive-value="false"-->
-<!--                active-color="#ee9d3f"-->
-<!--                @change="()=>{onAnimate()}">-->
-<!--              </el-switch>-->
-            </span>
-          </div>
-          <div class="project-content-box" style="width: 100%">
-            <!--节点动画-->
-            <div class="project-content-item" v-if="!selection.pen.type">
-              <label>{{$t('project.topology.animationType')}}</label>
-              <div class="full pr10">
-                <el-select :popper-append-to-body="false"
-                  v-model="selection.pen.animateType"
-                  size="small"
-                  @change="(val)=>{changeAnimatePlay(val,'node')}"
-                >
-                  <el-option v-for="(item,index) in nodeAnimateOptions" :value="item.id" :key="index"
-                             :label="item.name"></el-option>
-                </el-select>
-              </div>
-            </div>
-            <!--连线-->
-            <div class="project-content-item half" v-if="selection.pen.type">
-              <label>{{$t('project.topology.animationType')}}</label>
-              <div class="full pr10">
-                <el-select :popper-append-to-body="false" v-model="selection.pen.animateType" size="small"
-                           @change="(val)=>{changeAnimatePlay(val,'line')}"
-                           >
-                  <el-option v-for="(item,index) in lineAnimateOptions" :value="item.id" :key="index"
-                             :label="item.name"></el-option>
-                </el-select>
-              </div>
-            </div>
-            <div class="project-content-item half" v-if="selection.pen.type">
-              <label>{{$t('project.topology.animationColor')}}</label>
-              <div class="full pr10">
-                <nezhaColor :value-arr="[{name:'animateColor',value:selection.pen.animateColor}]" @colorChange="colorChange"/>
-              </div>
-            </div>
-
-          </div>
-        </div>
       </el-tab-pane>
     </el-tabs>
-<!--    选中多个-->
+    <!--选中多个-->
     <div v-else-if="selection.pens" class="">
       <el-collapse v-model="activeNames">
         <!--对齐方式-->
@@ -1153,22 +1181,22 @@ export default {
       nodesAlign: [// 对齐方式
         {
           value: 'left',
-          desc: '左对齐'
+          desc: this.$t('project.topology.left')
         }, {
           value: 'right',
-          desc: '右对齐'
+          desc: this.$t('project.topology.right')
         }, {
           value: 'top',
-          desc: '顶部对齐'
+          desc: this.$t('project.topology.topOffsetY')
         }, {
           value: 'bottom',
-          desc: '底部对齐'
+          desc: this.$t('project.topology.bottomOffsetY')
         }, {
           value: 'center',
-          desc: '垂直居中'
+          desc: this.$t('project.topology.center')
         }, {
           value: 'middle',
-          desc: '水平居中'
+          desc: this.$t('project.topology.middleOffsetY')
         }],
       layout: { // 显示对应属性
         maxWidth: undefined,
@@ -1288,7 +1316,35 @@ export default {
         '#E55400', '#FA6400', '#FF9830',
         '#7C2EA3', '#8F3BB8', '#B877D9'
       ],
-      loading: false
+      loading: false,
+      textAlignOptions: [
+        {
+          id: 'left',
+          name: this.$t('project.topology.left')
+        },
+        {
+          id: 'center',
+          name: this.$t('project.topology.center')
+        },
+        {
+          id: 'right',
+          name: this.$t('project.topology.right')
+        }
+      ],
+      textBaselineOptions: [
+        {
+          id: 'top',
+          name: this.$t('project.topology.topOffsetY')
+        },
+        {
+          id: 'middle',
+          name: this.$t('project.topology.middleOffsetY')
+        },
+        {
+          id: 'bottom',
+          name: this.$t('project.topology.bottomOffsetY')
+        }
+      ]
     }
   },
   mixins: [rz],
@@ -1442,7 +1498,12 @@ export default {
       }
     },
     changeTitle (val) {
+      if (!val) {
+        this.selection.pen.text = this.selection.pen.data.moduleName || ''
+        this.selection.pen.data.title = this.selection.pen.data.moduleName || ''
+      } else {
         this.selection.pen.text = val
+      }
       this.onChange()
     },
     onChange (value) {
@@ -1563,6 +1624,9 @@ export default {
           this.selection.pen.gradientToColor = this.selection.pen.fillStyle ? this.selection.pen.fillStyle : '#fff'
         }
       }
+      if (name === 'fontColor') {
+        this.selection.pen.font.color = this.colorRGBtoHex(val)
+      }
       this.selection.pen.data[name] = this.colorRGBtoHex(val)
       this.onChange()
     },

nezha-fronted/src/components/common/project/L5/topoTooltip.vue

@@ -3,7 +3,7 @@
     <div class="tooltip-box-chart" style="" v-if="isChart||(chartData.displayChart&&chartData.tooltipShow&&chartData.expressAllArr&&chartData.expressAllArr.length)">
         <line-chart-block v-show="isChart || chartData.type !== 'table'"
                           :key="'inner' + chartData.id"
-                          :class="isPanel? 'topology-tool-tip' : ''"
+                          :class="isPanel? 'topology-tool-tip line-chart' : 'line-chart'"
                           id="listContainer"
                           :from="'topology'"
                           :ref="chartData.type !== 'table'?'editChart' + chartData.type:'editChart'"
@@ -15,6 +15,9 @@
                           :chartTitleShow="false"
                           :chart-data="chartData">
         </line-chart-block>
+      <div v-if="chartData.remark" class="chart-remark">
+        {{chartData.remark}}
+      </div>
       <chart-table  v-show="isChart || chartData.type === 'table'"
                     :key="'inner' + 1"
                     :from="'project'"
@@ -469,10 +472,26 @@ export default {
     box-sizing: border-box;
     .tooltip-box-chart{
       border: 1px solid #E7EAED;
-      width: 300px;
       max-height: 400px;
       min-height: 200px;
       height: 100%;
+      display: flex;
+      overflow: hidden;
+      .line-chart{
+        width: 300px;
+        flex: 1;
+        /deep/ .resize-box{
+          border: none;
+        }
+      }
+      .chart-remark{
+        width: 110px;
+        font-size: 12px;
+        color: #666666;
+        letter-spacing: 0;
+        line-height: 18px;
+        font-weight: 400
+      }
     }
     .tooltip-box-info{
       border: 1px solid #E7EAED;
@@ -493,6 +512,12 @@ export default {
 }
   .topology-tool-tip /deep/ .topology-chart-title{
     margin-top: -23px;
+    border-bottom: 1px dashed #DCE1E7;
+    padding-left: 0;
+    margin-left: 10px;
+    padding: 0;
+    box-sizing: border-box;
+    width: 388px;
   }
   .topology-tool-tip /deep/ .line-area{
     margin-top: -15px;

nezha-fronted/src/components/common/project/topology.scss

@@ -514,11 +514,11 @@
   }
 }
 .from-project{
-  padding: 0 !important;
+  padding: 10px 10px 0 0 !important;
   .nz-table2{
     padding: 0;
     box-sizing: content-box;
-    height: calc(100% - 30px);
+    height: calc(100% - 50px);
     border: none;
   }
 }

nezha-fronted/src/components/common/project/topologyL5.vue

@@ -4,7 +4,7 @@
 </style>
 <template>
   <div class="project-box list-page" v-loading="topologyLoading" v-has="'topo_list'">
-    <div class="main-list">
+    <div class="main-list" style="height: calc(100% - 30px)">
       <div class="main-container" :class="fromOverView?'from-overview':'from-project'">
         <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);display: inline-block">
           <!--工具栏-->
@@ -1783,7 +1783,7 @@ export default {
             item.fillStyle = item.data.fillStyle
             item.strokeStyle = item.data.strokeStyle
             item.animatePlay = false
-            item.fontColor = '#000000'
+            item.fontColor = item.data.fontColor || '#222222'
             item.gradientType = item.data.gradientType ? item.data.gradientType : 0
             if (!item.data.gradientColor) {
               item.data.gradientType = 0
@@ -1801,7 +1801,7 @@ export default {
             item.fromArrowColor = item.data.arrowColor
             item.toArrowColor = item.data.arrowColor
             item.animatePlay = false
-            item.fontColor = '#000000'
+            item.fontColor = item.data.fontColor || '#222222'
           }
         })
         getTopology(this.topologyIndex).caches = {

nezha-fronted/static/config.json

@@ -1 +1 @@
-{"baseUrl":"/", "version": "21.04"}
+{"baseUrl":"http://192.168.40.42:8080/nz-admin/", "version": "21.04"}