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

nezha-fronted/package.json

@@ -28,7 +28,7 @@
     "@topology/activity-diagram": "^1.1.0",
     "@topology/chart-diagram": "^1.1.0",
     "@topology/class-diagram": "^1.1.0",
-    "@topology/core": "^1.1.32",
+    "@topology/core": "^1.1.34",
     "@topology/flow-diagram": "^1.1.1",
     "@topology/form-diagram": "^1.1.32",
     "@topology/sequence-diagram": "^1.1.0",

nezha-fronted/src/assets/stylus/main.scss

@@ -1083,7 +1083,11 @@ li {
   width:0 !important;
   background-color: $--background-color-base;
 }
-.nz-table .el-table__fixed, .nz-table .el-table__fixed-right {
+// .nz-table .el-table__fixed, .nz-table .el-table__fixed-right {
+//   height: 100% !important;
+//   z-index: 1;
+// }
+.nz-table .el-table__fixed, .nz-table,.nz-table-list .el-table__fixed-right {
   height: 100% !important;
   z-index: 1;
 }

nezha-fronted/src/components/chart/chart/chartMap.vue

@@ -135,7 +135,7 @@ export default {
                   const z = urlParams[urlParams.length - 3]
                   const x = urlParams[urlParams.length - 2]
                   const y = urlParams[urlParams.length - 1]
-                  const newUrl1 = `nzMap://static/Titles/${z}/${x}/${y}.pbf`
+                  const newUrl1 = `nzMap:///static/Titles/${z}/${x}/${y}.pbf`
                   return {
                     url: newUrl1,
                     credentials: 'include',
@@ -145,7 +145,7 @@ export default {
                 }
                 if (resourceType === 'SpriteJSON') {
                   return {
-                    url: 'nzMap://static/Titles/sprite.json',
+                    url: 'nzMap:///static/Titles/sprite.json',
                     credentials: 'include',
                     method: 'GET'
                     // Include cookies for cross-origin requests
@@ -153,7 +153,7 @@ export default {
                 }
                 if (resourceType === 'SpriteImage') {
                   return {
-                    url: 'nzMap://static/Titles/sprite.png',
+                    url: 'nzMap:///static/Titles/sprite.png',
                     credentials: 'include',
                     method: 'GET'
                     // Include cookies for cross-origin requests

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

@@ -855,7 +855,7 @@ export default {
             gridColor: '#ededed',
             lineWidth: 1,
             ruleColor: '#4e4e4e',
-            pens:[]
+            pens: []
           }
           this.projectInfoShow = true
           this.projectAlertShow = true
@@ -864,6 +864,7 @@ export default {
           data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE'
           resolve(data)
         } else {
+          delete data.origin
           data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE'
           if (data.data) {
             this.topologyInfo = {

nezha-fronted/src/components/common/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login"  id="login-bgimg">
     <div class="model"></div>
-    <div class="stars-wrapper" id="stars-wrapper" v-if="!this.bgImg">
+    <div class="stars-wrapper" id="stars-wrapper" v-if="false">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 358.52 351.84" class="star-cloud star-cloud1">
         <g id="Layer_2" data-name="Layer 2">
           <g id="Layer_1-2" data-name="Layer 1">
@@ -583,7 +583,7 @@ export default {
     if (this.bgImg) {
       document.getElementById('login-bgimg').style['background-image'] = `url(${this.bgImg})`
     } else {
-      this.initStar()
+      // this.initStar()
     }
   },
   beforeDestroy () {

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

@@ -30,7 +30,9 @@ export default {
       //   this.detailViewRightObj = ''
       // }
       this.detailType = flag
-      this.$router.replace({ query: { ...this.$route.query, detailType: flag } }).catch(err => {})
+      const query = { ...this.$route.query, detailType: flag }
+      query.bottomBox = this.detailType !== 'view'
+      this.$router.replace({ query: query }).catch(err => {})
       let dataList = ''
       localStorage.setItem('detail-view-' + this.tableId, this.detailType)
       if (this.detailType === 'view') {

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

@@ -429,7 +429,7 @@
                         :class="['nz-icon',bkTypeOption.find(item1=>item1.id==selection.pen.data.gradientType).label,bkTypeOption.find(item1=>item1.id==selection.pen.data.gradientType).fontSize]"></i>
                     </div>
 
-                    <el-option v-for="(item,index) in bkTypeOption" :value="item.id" :key="index">
+                    <el-option v-for="(item,index) in bkTypeOption" :value="item.id" :label="''" :key="index">
                       <i :class="['nz-icon',item.label,item.fontSize]"></i>
                     </el-option>
                     <!--el-input__inner-->
@@ -1546,6 +1546,7 @@ export default {
       if (value === 'lineDash') {
         this.selection.pen.lineDash = val ? (val == 1 ? [5, 5] : ((val == 2 ? [10, 10] : [10, 10, 2, 10]))) : []
       }
+      console.log(this.selection.pen)
       this.$emit('change', this.selection.pen)
       // if(!this.selection.pen.type||this.selection.pens){
       //   this.$emit('change',this.selection.pen||this.selection.pens);

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

@@ -878,6 +878,7 @@ export default {
             resolve(data)
             data = null
           } else {
+            delete data.origin
             data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#f9f9f9'
             data.gridColor = this.theme == 'light' ? '#ededed' : '#090909'
             data.grid = false
@@ -1645,7 +1646,25 @@ export default {
     },
 
     onUpdateProps (node) { // 更新pen
-      getTopology(this.topologyIndex).setValue(node)
+      const obj = {
+        id: node.id,
+        x: node.x,
+        y: node.y,
+        data: node.data,
+        width: node.width,
+        height: node.height,
+        borderRadius: node.borderRadius,
+        rotate: node.rotate,
+        background: node.background,
+        iconColor: node.iconColor,
+        gradientType: node.gradientType,
+        gradientFromColor: node.gradientFromColor,
+        gradientToColor: node.gradientToColor,
+        globalAlpha: node.globalAlpha,
+        dash: node.dash,
+        strokeColor: node.strokeColor
+      }
+      getTopology(this.topologyIndex).setValue(obj)
     },
 
     handleAvatarSuccess () {

nezha-fronted/src/components/common/project/topologyMixin.js

@@ -117,7 +117,7 @@ export default {
         pen: null,
         pens: null
       }
-      if (!pens.length) return
+      if (!pens.length || !this.editTopologyFlag) return
       this.$nextTick(() => {
         if (pens.length == 1) {
           this.modulesDiff && this.modulesDiff(pens[0])

nezha-fronted/src/components/common/searchInput.vue

@@ -1611,7 +1611,7 @@ export default {
         this.select_list.forEach(item => {
           if (item.listStr) {
             if (item.listStr == 'issue') {
-              item.valnum = item.val
+              item.valnum = JSON.parse(localStorage.getItem('nz-history-' + this.where))[0][0].valnum
               item.val = JSON.parse(localStorage.getItem('nz-history-' + this.where))[0][0].val
             } else {
               item.val = this[item.listStr].find(r => r.id == item.valnum).name

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

@@ -1,5 +1,4 @@
 <template>
-<div>
   <el-table
     id="recordRuleTable"
     ref="dataTable"
@@ -132,7 +131,6 @@
       <div v-else>&nbsp;</div>
     </template>
   </el-table>
-  </div>
 </template>
 
 <script>