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

2021-04-22 18:05:02 +08:00
parent 1d9af5a0ba 4fe0b1356c
commit 1583e4d0db
27 changed files with 2014 additions and 2019 deletions
--- a/nezha-fronted/src/App.vue
+++ b/nezha-fronted/src/App.vue
@@ -20,7 +20,7 @@ export default {
      localStorage.clear()
      localStorage.setItem('nz-version', version)
    }
-  },
+  }
 }
 </script>

--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -737,7 +737,7 @@ export default {
      })
    },
    loadChartData (scrollTop) {
-      console.log(scrollTop);
+      console.log(scrollTop)
      if (this.dataList.length > 0) {
        this.dataList.forEach((item, index) => {
          if (!item.isLoaded) {
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -119,7 +119,7 @@ export default {
      dropdownShow: '',
      timeout: null,
      formatTime: '',
-      hideSameLabels: true,
+      hideSameLabels: true
    }
  },
  methods: {
@@ -171,7 +171,7 @@ export default {
          wrap.scrollTop = currentTop
        }
      }, 20)
-    },
+    }
  }
 }
 </script>
--- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
@@ -84,7 +84,7 @@ export default {
            type: 'input',
            label: 'params',
            disabled: false
-          },
+          }
        ]
      },
      searchLabel: { userId: this.obj.id }
@@ -100,7 +100,7 @@ export default {
        }
      }
      return ''
-    },
+    }

  }
 }
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -114,7 +114,7 @@ export default {
  components: {
    'chart-box': ChartBox,
    'chart-list': ChartList,
-    nzBottomDataList,
+    nzBottomDataList
  },
  methods: {
    // 刷新
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -471,7 +471,7 @@ const en = {
    repeat: 'Repeat',
    tooLong: 'Too long content',
    onlyWord: 'only input a-z、A-Z、0-9、"_" ',
-    mobile:'Invalid mobile',
+    mobile: 'Invalid mobile'
  },
  search: {
    searchTip: 'Enter to search', // '点击或回车执行搜索'
@@ -706,7 +706,7 @@ const en = {
      confirmPwdErr: 'The two passwords are inconsistent',
      reinputPwd: 'Enter password again',
      notification: 'Notification',
-      mobile: 'Mobile',
+      mobile: 'Mobile'
    },
    roles: {
      roles: 'Roles',
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -605,7 +605,7 @@ export default {
          moduleId: item.moduleId,
          assetId: item.assetId,
          name: item.name,
-          configs: JSON.stringify(item.configs),
+          configs: JSON.stringify(item.configs)
        }
        endpointList.push(endpoint)
      })
--- a/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/roleBox.vue
@@ -1,7 +1,7 @@
 <template>
  <div v-clickoutside="{obj: editRole, func: esc}" class="right-box right-box-asset">
    <div class="right-box__header">
-      <div class="header__title">{{editRole.id ? $t('config.user.editRole') : $t('config.user.createUser')}}</div>
+      <div class="header__title">{{editRole.id ? $t('config.roles.editRole') : $t('config.roles.createRole')}}</div>
      <div class="header__operation">
        <span v-cancel="{obj: editRole, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
      </div>
@@ -85,7 +85,7 @@
          this.editRole.roleIds = this.editRole.roles.map(t => t.id)
        }
      }
-      },
+    }
  },
  created () {

@@ -96,7 +96,6 @@
        this.$refs.menuTree.setCheckedKeys(this.selectedIds, true)
      }
    })
-
  },
  methods: {
    clickOutside () {
@@ -108,13 +107,13 @@
      this.$emit('close', refresh)
    },
    getMenus: function () {
-        let self = this;
+      const self = this
      return new Promise(resolve => {
        self.menus = []
        if (self.editRole.id) {
          self.$get('/sys/role/menu/' + self.editRole.id).then(response => {
            if (response.code == 200) {
-                self.menus = response.data.menus;
+              self.menus = response.data.menus
              self.selectedIds = response.data.selectedIds
            } else {
              self.$message.error('load menu faild')
@@ -124,8 +123,7 @@
        } else {
          self.$get('/sys/menu').then(response => {
            if (response.code == 200) {
-                self.menus = response.data.list;
-
+              self.menus = response.data.list
            } else {
              self.$message.error('load menu faild')
            }
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -78,14 +78,14 @@
  props: {
    obj: {
      type: Object
-      },
+    }
  },
  computed: {
    isCurrentUser () {
      return function (username) {
        return localStorage.getItem('nz-username') == username
      }
-      },
+    }
  },
  data () {
    const vm = this
@@ -121,7 +121,7 @@
        ],
        email: [
          { type: 'email', message: this.$t('validate.email') }
-          ],
+        ]
      },
      rules2: { // 表单校验规则
        username: [
@@ -150,7 +150,7 @@
          this.editUser.roleIds = this.editUser.roles.map(t => t.id)
        }
      }
-      },
+    }
  },
  mounted () {
    this.getRoles()
--- a/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
@@ -224,7 +224,7 @@ export default {
        {
          label: this.$t('project.endpoint.configs'),
          prop: 'configs',
-          show: true,
+          show: true
        }
      ],
      typeList: [],
@@ -540,7 +540,7 @@ export default {
    selectEndpointList: {
      immediate: true,
      handler (n) {
-        console.log(n);
+        console.log(n)
        this.endpointTableData = JSON.parse(JSON.stringify(n))
        this.endpointTableData.forEach(item => {
          item.configs = JSON.parse(item.configs)
@@ -550,7 +550,7 @@ export default {
          item.assetName = item.asset.name
          item.type = item.module.type
        })
-        console.log(this.endpointTableData);
+        console.log(this.endpointTableData)
      }
    }
  }
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -633,7 +633,7 @@ export default {
    },
    // 点击搜索
    select () {
-      console.log(this.select_list);
+      console.log(this.select_list)
      const objectInfo = {}
      this.change_sreach_show = true
      this.name = '', this.id = ''
--- a/nezha-fronted/src/components/common/searchSelectInfo.vue
+++ b/nezha-fronted/src/components/common/searchSelectInfo.vue
@@ -109,7 +109,7 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
    {
      value: 'logout',
      label: i18n.t('config.operationlog.operations.logout')
-    },
+    }

  ],
  alertMessageState: [
--- a/nezha-fronted/src/components/layout/leftMenu.vue
+++ b/nezha-fronted/src/components/layout/leftMenu.vue
@@ -42,14 +42,14 @@ export default {
    return {
      isShrink: localStorage.getItem('nz-left-menu-shrink') == 'true',
      systemName: localStorage.getItem('nz-sys-name'),
-      logo:'',
+      logo: ''
    }
  },
  created () {
-    const self = this;
+    const self = this
    window.addEventListener('setItemEvent', function (e) {
      if (e.key == 'nz-sys-logo' && e.value) {
-        self.logo = e.value;
+        self.logo = e.value
      }
    })
  },
@@ -76,7 +76,7 @@ export default {
    },
    route () {
      return this.$route.path
-    },
+    }
  },
  methods: {
    shrink () {
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -172,7 +172,7 @@ export default {
      osTypes: [{
        label: 'Centos',
        name: 'centos'
-      },
+      }
      //   {
        //   label: 'Ubuntu',
        //   name: 'ubuntu'
@@ -189,7 +189,7 @@ export default {
  },
  methods: {
    toDownloadAgent: function () {
-      this.getAllDc();
+      this.getAllDc()
      this.showAgentDownload = true
      this.token = sessionStorage.getItem('nz-token')
      axios.get('/healthy').then(response => {
--- a/nezha-fronted/src/components/page/config/operationLog.vue
+++ b/nezha-fronted/src/components/page/config/operationLog.vue
@@ -85,9 +85,9 @@ export default {
            type: 'input',
            label: 'params',
            disabled: false
-          },
+          }
        ]
-      },
+      }
    }
  }
 }
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -264,7 +264,6 @@ export default {
        unsaved_change: 'on',
        default_scrape_interval: '60',
        default_scrape_timeout: '30',
-        default_scrape_interval:'60',
        snmp_trap_listen_port: 162,
        map_center_config: { longitude: 116.39, latitude: 39.9, zoom: 4, minZoom: 1, maxZoom: 10 }
      },
@@ -314,12 +313,12 @@ export default {
        terminal_timeout: 30,
        terminal_telnet_user_tip: 'ogin:',
        terminal_telnet_pin_tip: 'assword:',
-        terminal_record_local_retention:365,
+        terminal_record_local_retention: 365
      },
      terminalCopy: null,
      terminalRules: {
        // terminal_timeout: [{ validator: positiveInteger, trigger: 'blur' }],
-        terminal_record_local_retention: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }],
+        terminal_record_local_retention: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }]
      },
      ldap: {
        ldap_address: '',
@@ -329,14 +328,14 @@ export default {
        ldap_user_filter: '',
        ldap_mapping: '',
        ldap_enable: 'off',
-        ldap_timeout:'',
+        ldap_timeout: ''
      },
      ldapCopy: null,
      ldapRules: {
        ldap_address: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
        ldap_user_filter: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
        ldap_mapping: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
-        ldap_timeout: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }],
+        ldap_timeout: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: positiveInteger, trigger: 'blur' }]
      },
      reset: {
        type: [],
@@ -394,9 +393,9 @@ export default {
      this.querySetInfo(tab.name)
    },
    queryTimezone: function () {
-      this.$get("/sys/timezone").then(response=>{
+      this.$get('/sys/timezone').then(response => {
        if (response.code == 200) {
-          this.timezoneOption = response.data.list;
+          this.timezoneOption = response.data.list
        }
      })
    },
@@ -410,7 +409,7 @@ export default {
      }
      this.$get('/sys/config/' + type).then(response => {
        if (response.code == 200) {
-          for (let key in response.data){
+          for (const key in response.data) {
            this[type][key] = response.data[key]
          }
          if (type == 'basic') {
@@ -441,7 +440,7 @@ export default {
          const param = Object.assign({}, this[type])

          if (type == 'basic') {
-            let mapConfig = this.$refs.latlngPicker.getAttribute()
+            const mapConfig = this.$refs.latlngPicker.getAttribute()
            param.map_center_config = JSON.stringify(mapConfig)
          }
          const postParam = Object.assign({}, param)
@@ -756,47 +755,46 @@ export default {
      // window.open(item.url)
    },
    handleLogoChange (file, fileList) {
-      const imageTypes = ['image/jpeg','image/jpg','image/png'];
+      const imageTypes = ['image/jpeg', 'image/jpg', 'image/png']
      console.log(file.raw.type)
-      const isImage = imageTypes.some(t=> file.raw.type === t);
-      const isLt2M = file.raw.size / 1024 / 1024 < 2;
+      const isImage = imageTypes.some(t => file.raw.type === t)
+      const isLt2M = file.raw.size / 1024 / 1024 < 2

      this.imageFormatErr = (!isImage || !isLt2M)

      if (isImage && isLt2M) {
-        const self = this;
+        const self = this
        this.fileToBase64(file.raw).then(res => {
-          self.basic.system_logo = res;
-        });
+          self.basic.system_logo = res
+        })
      }
    },
    fileToBase64: function (file) {
      return new Promise((resolve, reject) => {
-        let  reader = new FileReader();
-        reader.readAsDataURL(file);//转化二进制流，异步方法
-        let base64Str='';
+        const reader = new FileReader()
+        reader.readAsDataURL(file)// 转化二进制流，异步方法
+        let base64Str = ''
        reader.onload = function () { // 完成后this.result为二进制流console.log(this.result);
-           base64Str = this.result;
-          resolve(base64Str);
+          base64Str = this.result
+          resolve(base64Str)
        }
-
      })
    },
    timezoneOptionHandler: function (offset) {
-      let offsetHour = (offset/1000/60/60).toFixed(0)
+      const offsetHour = (offset / 1000 / 60 / 60).toFixed(0)

-      let offsetMinute = offset%(1000*60*60)/(1000*60)
+      const offsetMinute = offset % (1000 * 60 * 60) / (1000 * 60)

-      let hour = offsetHour>0?(offsetHour<9?'+0'+offsetHour:'+'+offsetHour):(offsetHour == 0?(offsetMinute==0?'':'+00'):(offsetHour>-10?'-0'+Math.abs(offsetHour):offsetHour))
+      const hour = offsetHour > 0 ? (offsetHour < 9 ? '+0' + offsetHour : '+' + offsetHour) : (offsetHour == 0 ? (offsetMinute == 0 ? '' : '+00') : (offsetHour > -10 ? '-0' + Math.abs(offsetHour) : offsetHour))

-      let minute = offsetHour==0&&offsetMinute == 0?'':(offsetMinute==0?':00':(Math.abs(offsetMinute)>9?':'+Math.abs(offsetMinute):':0'+Math.abs(offsetMinute)))
+      const minute = offsetHour == 0 && offsetMinute == 0 ? '' : (offsetMinute == 0 ? ':00' : (Math.abs(offsetMinute) > 9 ? ':' + Math.abs(offsetMinute) : ':0' + Math.abs(offsetMinute)))

      return 'UTC' + hour + minute
    }
  },
  mounted () {
    this.querySetInfo(this.activeTab)
-    this.queryTimezone();
+    this.queryTimezone()
  }
 }
 </script>
--- a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
@@ -72,7 +72,7 @@ export default {
    addApiKey: function () {
      this.$refs.dataTable.addApiKey()
      this.$refs.dataTable.getRoles()
-    },
+    }
  }
 }
 </script>
--- a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
@@ -140,7 +140,7 @@ export default {
      roles: [],
      rules: {
        name: { required: true, message: this.$t('validate.required'), switch: false },
-        roleId: { required: true, message: this.$t('validate.required'), switch: false },
+        roleId: { required: true, message: this.$t('validate.required'), switch: false }
        // expireAt: { required: true, message: this.$t('validate.required'), switch: false }
      },
      pickerOptions: {
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -284,7 +284,7 @@ export default {
      // this.$refs.editor.setContent(value)
      this.dropDownVisible = false
      this.$emit('change', value)
-      this.$forceUpdate();
+      this.$forceUpdate()
    },
    metricKeyDown (val) {
      if (this.required) {
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -138,7 +138,7 @@ export default {
          label: 'ids',
          disabled: false
        }]
-      },
+      }
    }
  },
  methods: {
@@ -196,7 +196,6 @@ export default {
  },
  created () {
    if (localStorage.getItem('moduleProjectId')) {
-
      this.searchLabel.projectIds = localStorage.getItem('moduleProjectId')
    }
    if (localStorage.getItem('moduleProjectId')) {
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -198,13 +198,13 @@ window.vm = new Vue({

 export default window.vm

-const orignalSetItem = localStorage.setItem;
+const orignalSetItem = localStorage.setItem
 localStorage.setItem = function (key, value) {
-  const setItemEvent = new Event("setItemEvent");
-  setItemEvent.key=key;
-  setItemEvent.value = value;
-  window.dispatchEvent(setItemEvent);
-  orignalSetItem.apply(this,arguments);
+  const setItemEvent = new Event('setItemEvent')
+  setItemEvent.key = key
+  setItemEvent.value = value
+  window.dispatchEvent(setItemEvent)
+  orignalSetItem.apply(this, arguments)
 }

 /* 重写组件内容 */
--- a/nezha-fronted/src/store/index.js
+++ b/nezha-fronted/src/store/index.js
@@ -33,7 +33,7 @@ const store = new Vuex.Store({
    overViewProject: {},
    dcDataRefresh: false,
    showTopoScreen: false,
-    logo:'',
+    logo: ''
  },
  getters: {
    getLinkData (state) {
@@ -62,7 +62,7 @@ const store = new Vuex.Store({
    },
    getLogo (state) {
      console.log('get logo', state)
-      return state.logo;
+      return state.logo
    }
  },
  mutations: {
@@ -143,7 +143,7 @@ const store = new Vuex.Store({
    },
    setLogo (state, logo) {
      console.log('set log', logo)
-      state.logo = logo;
+      state.logo = logo
    }
  },
  actions: {