NEZ-2335 fix：修复 asset 复制时，原占用的机柜位置可选的问题

2022-10-31 14:06:42 +08:00
parent 3336f96703
commit a90a94e095
25 changed files with 44 additions and 46 deletions
--- a/nezha-fronted/src/assets/css/font/iconfont.js
+++ b/nezha-fronted/src/assets/css/font/iconfont.js
--- a/nezha-fronted/src/components/chart/chart/grid/utils.js
+++ b/nezha-fronted/src/components/chart/chart/grid/utils.js
@@ -227,7 +227,7 @@ export function moveElement (layout, l, x, y, isUserAction, preventCollision) {
  // nearest collision.
  let sorted = sortLayoutItemsByRowCol(layout)
  if (movingUp) sorted = sorted.reverse()
-  let collisions = getAllCollisions(sorted, l)
+  const collisions = getAllCollisions(sorted, l)
  if (preventCollision && collisions.length) {
    l.x = oldX
    l.y = oldY
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -3,7 +3,7 @@ import * as echarts from 'echarts'
 import { getMetricTypeValue } from '@/components/common/js/tools'
 import { getChart, getMousePoint, setChart } from '@/components/common/js/common'
 import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
-import chartDataFormat from "@/components/chart/chartDataFormat";
+import chartDataFormat from '@/components/chart/chartDataFormat'
 export default {
  data () {
    return {
--- a/nezha-fronted/src/components/common/alert/alertMessageInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfo.vue
@@ -350,7 +350,7 @@ export default {
    this.getAlertMessageInfo()
    window.addEventListener('resize', this.resize)
  },
-  destroyed() {
+  destroyed () {
    window.removeEventListener('resize', this.resize)
  }
 }
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -153,7 +153,6 @@ export default {
 }
 </script>

-
 <style scoped>

 </style>
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -152,7 +152,7 @@ export default {
  },
  props: {
    from: String,
-    sign:[Number,String]
+    sign: [Number, String]
  },
  watch: {
    obj: {
--- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue
+++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue
@@ -85,7 +85,7 @@
 import { fromRoute } from '@/components/common/js/constants'
 import { bottomBoxWindow } from '@/components/common/js/tools'
 import detailViewRight from '@/components/common/detailView/view/detailViewRight'
-import panelChart from "@/components/chart/panelChart";
+import panelChart from '@/components/chart/panelChart'

 export default {
  name: 'nzDataList',
--- a/nezha-fronted/src/components/common/js/common.js
+++ b/nezha-fronted/src/components/common/js/common.js
@@ -375,7 +375,7 @@ export const coordinatePoint = {
    offsetY: '77.5%',
    point: [
      { x: 40, y: 130 },
-      { x: 20, y: 150 , disabled: true},
+      { x: 20, y: 150, disabled: true },
      { x: 10, y: 160 },
      { x: 30, y: 180 },
      { x: 70, y: 185 },
@@ -383,7 +383,7 @@ export const coordinatePoint = {
      { x: 110, y: 150 },
      { x: 120, y: 120 },
      { x: 160, y: 70 },
-      { x: 170, y: 60 , disabled: true},
+      { x: 170, y: 60, disabled: true },
      { x: 190, y: 50 },
      { x: 230, y: 30 },
      { x: 220, y: 10 },
@@ -397,7 +397,7 @@ export const coordinatePoint = {
    offsetY: '47.5%',
    point: [
      { x: 160, y: 260 },
-      { x: 120, y: 230 , disabled: true},
+      { x: 120, y: 230, disabled: true },
      { x: 110, y: 220 },
      { x: 70, y: 225 },
      { x: 65, y: 260 },
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -618,7 +618,7 @@ export default {
        this.showMetrics = true
        this.expressions = ['']
        this.$refs.alertRuleForm.clearValidate('expr') // 移除from表单的 expr 验证
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
          this.showSnmpTrap = true
        })
      } else if (val === 2) {
@@ -626,7 +626,7 @@ export default {
        this.expressions = ['']
        // showMetrics 为 false 时,展示 Logs label
        this.showSnmpTrap = false // showSnmpTrap 为 true 时显示 expr,threshold,unit
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
          this.showSnmpTrap = true
        })
        this.$refs.alertRuleForm.clearValidate('expr') // 移除from表单的 expr 验证
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -171,7 +171,7 @@ import deleteButton from '@/components/common/deleteButton'
 export default {
  name: 'alertMessageTable',
  components: {
-    alertRuleInfo: alertRuleInfo,deleteButton
+    alertRuleInfo: alertRuleInfo, deleteButton
  },
  props: {
    nowTime: {
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -107,9 +107,9 @@ import bottomBox from '@/components/common/bottomBox/bottomBox'
 import { bottomBoxWindow } from '@/components/common/js/tools'
 import panelChart from '@/components/chart/panelChart'
 import bus from '@/libs/bus'
-import routerPathParams from "@/components/common/mixin/routerPathParams";
-import lodash from "lodash";
-import SearchBox from "@/components/common/searchBox/searchBox";
+import routerPathParams from '@/components/common/mixin/routerPathParams'
+import lodash from 'lodash'
+import SearchBox from '@/components/common/searchBox/searchBox'
 export default {
  name: 'nzDataList',
  mixins: [routerPathParams],
--- a/nezha-fronted/src/components/common/vueQR/packages/index.js
+++ b/nezha-fronted/src/components/common/vueQR/packages/index.js
@@ -1,5 +1,5 @@
-import vueQr from './vue-qr.vue';
+import vueQr from './vue-qr.vue'

-vueQr.install = Vue => Vue.component(vueQr.name, vueQr);
+vueQr.install = Vue => Vue.component(vueQr.name, vueQr)

-export default vueQr;
+export default vueQr
--- a/nezha-fronted/src/components/common/vueQR/packages/readAsArrayBuffer.js
+++ b/nezha-fronted/src/components/common/vueQR/packages/readAsArrayBuffer.js
@@ -1,16 +1,16 @@
-function readAsArrayBuffer(url, callback) {
+function readAsArrayBuffer (url, callback) {
  return new Promise((resolve, reject) => {
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "blob"; //设定返回数据类型为Blob
-    xhr.onload = function() {
-      var reader = new FileReader();
-      reader.onloadend = function() {
+    const xhr = new XMLHttpRequest()
+    xhr.responseType = 'blob' // 设定返回数据类型为Blob
+    xhr.onload = function () {
+      const reader = new FileReader()
+      reader.onloadend = function () {
        resolve(reader.result)
-      };
-      reader.readAsArrayBuffer(xhr.response); //xhr.response就是一个Blob，用FileReader读取
-    };
-    xhr.open("GET", url);
-    xhr.send();
-  });
+      }
+      reader.readAsArrayBuffer(xhr.response) // xhr.response就是一个Blob，用FileReader读取
+    }
+    xhr.open('GET', url)
+    xhr.send()
+  })
 }
 export default readAsArrayBuffer
--- a/nezha-fronted/src/components/common/vueQR/packages/util.js
+++ b/nezha-fronted/src/components/common/vueQR/packages/util.js
@@ -1,4 +1,4 @@
-export function toBoolean(val) {
+export function toBoolean (val) {
  if (val === '') return val
  return val === 'true' || val == '1'
 }
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -386,7 +386,7 @@ export default {
          val: '',
          listStr: 'silenceState'
        },
-        jsonKey: 'valnum',
+        jsonKey: 'valnum'
      }
    }
    this.initQueryFromPath(searchKeys)
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -472,7 +472,7 @@ export default {
    duplicate (row) {
      this.$get(`${this.url}/${row.id}`).then(response => {
        if (response.code === 200) {
-          this.object = { ...response.data, id: '', name: `${row.name}-copy`, brandAndModel: '' }
+          this.object = { ...response.data, id: '', name: `${row.name}-copy`, brandAndModel: '', cabinet: '', dc: '', u: [], cabinetId: '', dcId: '' }
          if (this.object.name.length > 64) {
            const length = this.object.name.length - 64
            this.object.name = row.name.substring(0, row.name.length - length) + '-copy'
--- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
@@ -8,7 +8,7 @@ window.onload = function () {
    commonOption.toolbox.feature.dataZoom.title.zoom = vm.$i18n.t('overall.toolBox.zoom')
    commonOption.toolbox.feature.dataZoom.title.back = vm.$i18n.t('overall.toolBox.back')
    commonOption.toolbox.feature.magicType.title.stack = vm.$i18n.t('overall.toolBox.stack')
-  }else {
+  } else {
    commonOption.toolbox.feature.dataZoom.title.zoom = exportHtml.$i18n.t('overall.toolBox.zoom')
    commonOption.toolbox.feature.dataZoom.title.back = exportHtml.$i18n.t('overall.toolBox.back')
    commonOption.toolbox.feature.magicType.title.stack = exportHtml.$i18n.t('overall.toolBox.stack')
--- a/nezha-fronted/src/entrance/exportHtml/App.vue
+++ b/nezha-fronted/src/entrance/exportHtml/App.vue
@@ -61,7 +61,7 @@ import exploreItem from '@/components/page/dashboard/explore/exploreItemHtml'
 import moment from 'moment-timezone'
 import { loadI18n } from '@/components/common/i18n'
 import i18nData from '@/entrance/exportHtml/i18nData'
-import bus from "@/libs/bus";
+import bus from '@/libs/bus'
 const dataJson = window.dataJson || {}
 export default {
  name: 'Entrance',
@@ -114,7 +114,6 @@ export default {
    onScroll () {
      const _self = this
      this.scrollbarWrap.addEventListener('scroll', bus.debounce(function () {
-
        _self.showTopBtn = _self.scrollbarWrap.scrollTop > 50
        _self.overScroll10 = _self.scrollbarWrap.scrollTop > 50
        _self.$refs.chartList.onScroll(_self.scrollbarWrap.scrollTop)
--- a/nezha-fronted/src/entrance/exportHtml/exportHtml.js
+++ b/nezha-fronted/src/entrance/exportHtml/exportHtml.js
@@ -26,7 +26,7 @@ import chartList from '@/components/chart/chartList.vue' // 全局引入 chartLi
 import pickTime from '@/components/common/pickTime'
 import nzDataList from '@/components/common/table/nzDataList'
 import mainMixin from '@/components/common/mixin/mainMixinFun'
-import Pagination from "@/components/common/pagination";
+import Pagination from '@/components/common/pagination'
 Vue.component('pick-time', pickTime)
 Vue.component('nzDataList', nzDataList)
 Vue.component('chartList', chartList)
--- a/nezha-fronted/src/store/panel.js
+++ b/nezha-fronted/src/store/panel.js
@@ -207,7 +207,7 @@ const panel = {
    },
    dispatchHomeLoading (store, homeLoading) {
      store.commit('setHomeLoading', homeLoading)
-    },
+    }
  }
 }
 export default panel