From 5e942ad036b3081ec9a04f17a45973b61e5871fa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 16 May 2023 14:40:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=20tools=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=8F=91=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/js/validate.js      |  21 +
 .../rightBox/asset/assetDiscoveryBox.vue      |   2 +-
 .../components/page/tool/assetDiscovery.vue   | 370 ++++++++++++++++++
 nezha-fronted/src/router/index.js             |   4 +
 4 files changed, 396 insertions(+), 1 deletion(-)
 create mode 100644 nezha-fronted/src/components/page/tool/assetDiscovery.vue

diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index b9fe266ef..3e3763e68 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -271,6 +271,27 @@ export function packageSizeValidator (rule, value, callback) {
     }
   }, 100)
 }
+// 验证retries
+export function retriesValidator (rule, value, callback) {
+  setTimeout(() => {
+    // 判断是否是数字
+    if (isNaN(Number(value))) {
+      callback(new Error(vm.$t('validate.number')))
+    } else {
+      // 判断是否是正整数
+      if (Number(value) >= 0 && (String(value).indexOf('.') == -1)) {
+        // 判断范围
+        if (value >= 1 && value <= 100) {
+          callback()
+        } else {
+          callback(new Error(vm.$t('validate.packageSize')))
+        }
+      } else {
+        callback(new Error(vm.$t('validate.positiveInteger')))
+      }
+    }
+  }, 100)
+}
 
 // 验证maxHops
 export function maxHopsValidator (rule, value, callback) {
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetDiscoveryBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetDiscoveryBox.vue
index 5e30be323..2780b467a 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetDiscoveryBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetDiscoveryBox.vue
@@ -68,7 +68,7 @@
           <!--         schedule.nums -->
           <el-form-item :label='$t("backup.WeekOn")' prop="schedule.nums" v-if="editAssetDiscovery.schedule.type === 3">
             <el-checkbox-group v-model="editAssetDiscovery.schedule.nums" size="medium" @change="clearNumsError()">
-              <el-checkbox-button v-for="num in weeks" :label="num" :key="num">{{weekStr[num]}}</el-checkbox-button>
+              <el-checkbox-button v-for="num in weeks" :label="num" :key="num">{{weekStr[num - 1]}}</el-checkbox-button>
             </el-checkbox-group>
           </el-form-item>
           <el-form-item :label='$t("backup.DayOfMonth")' prop="schedule.nums" v-if="editAssetDiscovery.schedule.type === 4">
diff --git a/nezha-fronted/src/components/page/tool/assetDiscovery.vue b/nezha-fronted/src/components/page/tool/assetDiscovery.vue
new file mode 100644
index 000000000..27742f590
--- /dev/null
+++ b/nezha-fronted/src/components/page/tool/assetDiscovery.vue
@@ -0,0 +1,370 @@
+<template>
+  <nz-data-list
+    ref="dataList"
+    :layout="[]"
+    :from="fromRoute.ping"
+    class="radar-box"
+  >
+    <template v-slot:top-tool-left>
+      <div class="tools-header">
+        <div class="tools-header-left">
+          <span>{{$t('config.operationlog.ip')}}</span>
+          <vue-tags-input
+            class="ipInput"
+            style="height: 190px"
+            v-model="ip"
+            :placeholder="$t('overall.placeHolder')+' IP'"
+            :add-from-paste="false"
+            :tags="tags"
+            @tags-changed="newTags => tags = newTags"
+            @before-adding-tag="value => beforeAddTag(value)"
+            @adding-duplicate="value => addDuplicate(value)"
+          />
+        </div>
+
+        <div  class="tools-header-center">
+          <el-form size="small" ref="discoveryForm" :model="discoveryForm" :rules="formRules" label-position="right" label-width="150px">
+            <el-form-item :label='$t("config.mib.credentials")' prop="snmpCredentialIds">
+              <el-select
+                v-model="discoveryForm.snmpCredentialIds"
+                class="right-box__select"
+                popper-class="right-box-select-top prevent-clickoutside"
+                multiple placeholder="请选择"
+                size="small">
+                <el-option
+                  v-for="item in credentialData"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <!-- retries -->
+            <el-form-item prop="retries" style="margin-bottom:14px" :label="$t('Retries')">
+              <div class="wrap" style="height:32px">
+                <el-input v-model.number="discoveryForm.retries" placeholder="">
+                </el-input>
+              </div>
+            </el-form-item>
+            <!-- Timeout -->
+            <el-form-item prop="timeout" style="margin-bottom:14px" :label="$t('ping.timeout')">
+              <div class="wrap" style="height:32px">
+                <el-input v-model.number="discoveryForm.timeout" placeholder="">
+                  <template slot="append">{{$t('overall.ms')}}</template>
+                </el-input>
+              </div>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="tools-header-right">
+          <div class="radar">
+            <div class="first-circle"></div>
+            <div class="second-circle"></div>
+            <div class="third-circle"></div>
+            <div class="sector" :class="isStart?'active':''"></div>
+            <div class="radar-line"></div>
+          </div>
+          <div class="tools-header-right-content">
+            <div class="tools-header-right-title right-content-text">{{$t('dashboard.dashboard.chartForm.statistics')}}</div>
+            <div class="right-content-text right-content-box">
+              <span class="margin-l-5">{{$t('asset.total')}}:<span class="margin-l-10 margin-r-30">{{total}}</span></span>
+              <span>{{$t('ping.done')}}:<span class="margin-l-10 margin-r-30">{{done}}</span></span>
+              <span>{{$t('ping.progress')}}:<span class="margin-l-10 margin-r-30">{{process}}%</span></span>
+            </div>
+            <el-button class="nz-btn nz-btn-size-normal nz-btn-style-normal" v-if="!isStart" @click="startTask">
+              {{$t('Discovery')}}
+            </el-button>
+            <el-button class="nz-btn nz-btn-size-normal nz-btn-style-normal" v-else @click="clearTask">
+              {{$t('config.terminallog.stop')}}
+            </el-button>
+          </div>
+        </div>
+        <div class="tools-header-title">{{$t('overall.config')}}</div>
+      </div>
+    </template>
+
+    <template v-slot:default>
+      <!-- 初始展示的内容 -->
+      <div class="empty" v-if="tid===undefined">
+        <el-steps align-center>
+          <el-step>
+            <span class="nz-icon nz-icon-edit" slot="icon"></span>
+            <p class="txt" slot="title">{{$t('overall.placeHolder')}} IP</p>
+          </el-step>
+          <!-- <el-step>
+            <span class="el-icon-more" slot="icon"></span>
+            <p class="txt" slot="title">{{$t('ping.filter')}}</p>
+          </el-step> -->
+          <el-step>
+            <span class="nz-icon nz-icon-search" slot="icon"></span>
+            <p class="txt" slot="title">Discovery asset</p>
+          </el-step>
+        </el-steps>
+      </div>
+      <!-- 存在任务id时展示表格 -->
+      <div class="data-wrap" v-show="tid!==undefined">
+        <span>{{$t('ping.results')}}</span>
+        <div class="data-bottom">
+          <disccoveryTabTable
+            ref="dataTable"
+            :loading="loading"
+            v-my-loading="loading"
+            :custom-table-title="tools.customTableTitle"
+            :table-data="tableData"
+            :api="url"
+            :orderByFa="orderBy"
+          >
+          </disccoveryTabTable>
+        </div>
+      </div>
+    </template>
+  </nz-data-list>
+</template>
+
+<script>
+import bus from '@/libs/bus'
+import nzDataList from '@/components/common/table/nzDataList'
+import dataListMixin from '@/components/common/mixin/dataList'
+import VueTagsInput from '@johmun/vue-tags-input'
+import { timeoutValidator, retriesValidator } from '../../common/js/validate'
+import disccoveryTabTable from '@/components/common/table/asset/disccoveryTabTable'
+const ipv4 = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])(\:\d{0,5})?$/
+const ipv6 = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/
+export default {
+  mixins: [dataListMixin],
+  components: {
+    nzDataList,
+    disccoveryTabTable,
+    VueTagsInput
+  },
+  data () {
+    return {
+      url: '',
+      tableId: 'discoveryAsset',
+      // 防止用户重复点击
+      flag: true,
+      loading: false,
+      // 弹出框是否显示
+      visible: false,
+      ip: '',
+      tags: [],
+      // 是否全选
+      checkAll: true,
+      isIndeterminate: false,
+      // 数据中心
+      dataCenter: [],
+      // 实际选中的值
+      checked: [],
+      // 复选框选中的值
+      oldChecked: [-1],
+      // 是否正在请求数据
+      isStart: false,
+      // 定时器id
+      timer: null,
+      // 任务id
+      tid: undefined,
+      // 表格总数据
+      total: 0,
+      // 已完成
+      done: 0,
+      // 进度
+      process: 0,
+      // 表格数据
+      tableData: [],
+      discoveryForm: {
+        // 超时时间
+        timeout: 100,
+        subnetIds: '',
+        snmpCredentialIds: '',
+        retries: 1
+      },
+      credentialData: [],
+      formRules: {
+        timeout: [{ validator: timeoutValidator, trigger: 'blur' }],
+        retries: [{ validator: retriesValidator, trigger: 'blur' }]
+      }
+    }
+  },
+  created () {
+    this.getCredentialData()
+  },
+  mounted () {
+    const tiInput = document.getElementsByClassName('ti-input')[0]
+    tiInput.addEventListener('click', (e) => {
+      const event = e || window.event
+      if (event && event.stopPropagation) {
+        event.stopPropagation()
+      } else {
+        event.cancelBubble = true
+      }
+      if (event.path[0].className === 'ti-input') {
+        const tiInputBox = document.getElementsByClassName('ti-new-tag-input')[0]
+        tiInputBox.focus()
+      }
+    })
+  },
+  methods: {
+    // 防止标签输入框失去焦点校验和开始任务校验重复(连续两次message提示)
+    validateHost: bus.debounce(function () {
+      this.$message.error(this.$t('validate.host'))
+    }, 50),
+    // 防止标签输入框失去焦点校验和开始任务校验重复(连续两次message提示)
+    validateDuplicate: bus.debounce(function () {
+      this.$message.error(this.$t('ping.duplicate') + ' IP')
+    }, 50),
+    // 添加标签之前
+    beforeAddTag ({ tag, addTag }) {
+      if (!ipv4.test(tag.text) && !ipv6.test(tag.text)) {
+        return this.validateHost()
+      }
+      addTag()
+    },
+    // 添加重复的标签
+    addDuplicate () {
+      return this.validateDuplicate()
+    },
+    close () {
+      this.visible = false
+    },
+    // 切换弹框显示隐藏
+    triggerVisible () {
+      if (!this.visible) {
+        this.visible = true
+      } else {
+        this.close()
+      }
+    },
+    // 点击全选
+    checkAllChange (value) {
+      const allId = this.dataCenter.map(item => {
+        return item.id
+      })
+      this.checked = value ? allId : []
+      this.isIndeterminate = false
+    },
+    // 点击单个选中
+    checkedChange (value) {
+      const checkedCount = value.length
+      this.checkAll = checkedCount === this.dataCenter.length
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.dataCenter.length
+    },
+    // 删除选中
+    removeCheckedItem (id, e) {
+      const event = e || window.event
+      if (event && event.stopPropagation) {
+        event.stopPropagation()
+      } else {
+        event.cancelBubble = true
+      }
+      this.checked = this.checked.filter(dcId => dcId !== id)
+    },
+    getCredentialData () {
+      this.$get('snmp/credential', { pageSize: -1 }).then(response => {
+        if (response.code === 200) {
+          this.credentialData = response.data.list
+        }
+      })
+    },
+    // 开始任务
+    startTask () {
+      if (!this.flag) {
+        return false
+      }
+      setTimeout(() => {
+        if (this.ip) {
+          // 校验ip格式
+          if (!ipv4.test(this.ip) && !ipv6.test(this.ip)) {
+            return this.validateHost()
+          }
+          // 判断ip是否重复
+          if (this.tags.some(item => item.text === this.ip)) {
+            return this.validateDuplicate()
+          }
+        } else if (!this.tags.length) {
+          return this.validateHost()
+        }
+        // 表单校验输入内容是否合法
+        this.$refs.discoveryForm.validate((valid) => {
+          if (valid) {
+            this.flag = false
+            this.getId()
+          }
+        })
+      })
+    },
+    // 请求任务id
+    async getId () {
+      this.loading = true
+      console.log(this.discoveryForm.snmpCredentialIds)
+      const ipArr = this.tags.map(item => item.text)
+      const params = {
+        subnetIds: ipArr.join(','),
+        snmpCredentialIds: this.discoveryForm.snmpCredentialIds.join(','),
+        timeout: this.discoveryForm.timeout,
+        retries: this.discoveryForm.retries
+      }
+      this.$get('/tool/ping', params).then(response => {
+        // 清空上一次任务的数据
+        this.done = 0
+        this.total = 0
+        this.process = 0
+        this.tableData = []
+        this.tid = response.data.tid
+        this.isStart = true // 标记正在请求数据中
+        this.flag = true
+        this.timer = setInterval(() => {
+          if (parseInt(this.process) < 100) {
+            this.getData()
+          } else {
+            this.clearTask()
+          }
+        }, 300)
+        // 如果没有数据，loading取消
+        if (!response.data.task.total) {
+          this.loading = false
+        }
+      })
+    },
+    // 请求表格数据
+    getData () {
+      const currentId = this.tid
+      this.$get('/tool/ping/result/' + this.tid).then(response => {
+        if (currentId === this.tid && parseInt(this.process) < 100) {
+          this.done = response.data.task.done
+          this.total = response.data.task.total
+          this.process = response.data.task.process
+          this.tableData.push(...response.data.list)
+          // 收到数据，loading取消
+          if (this.tableData.length) {
+            this.loading = false
+          }
+        }
+      })
+    },
+    // 清除任务
+    async clearTask () {
+      if (!this.flag) {
+        return false
+      }
+      this.flag = false
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = null
+      }
+      await this.$get('/tool/ping/cancel/' + this.tid)
+      this.isStart = false
+      this.flag = true
+      this.loading = false
+    },
+    // 空函数 防止mixins中的函数执行
+    getTableData () { }
+  },
+  // 离开页面的时候触发
+  async beforeRouteLeave (to, from, next) {
+    if (this.tid) {
+      await this.clearTask()
+    }
+    next()
+  }
+}
+</script>
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index ad9542640..d9c2677ca 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -220,6 +220,10 @@ export default new Router({
           path: '/ping',
           component: resolve => require(['@/components/page/tool/ping'], resolve)
         },
+        {
+          path: '/discoveryAsset',
+          component: resolve => require(['@/components/page/tool/assetDiscovery'], resolve)
+        },
         {
           path: '/trace',
           component: resolve => require(['@/components/page/tool/trace'], resolve)

From 763f44ccddac76959f7df56c9d92367790e8015b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 16 May 2023 15:05:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-2825=20fix=EF=BC=9Aproject=20topo=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=9B=BE=E7=89=87=E5=90=8E=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E5=90=8E=20=E8=8A=82=E7=82=B9=E8=BE=B9=E6=A1=86=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/meta2d/js/meta2dMain.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
index d52d11a91..08bf18c94 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -415,12 +415,12 @@ export default {
       }
       if (key === 'image') {
         obj.imageId = pen[key]
-        obj.name = pen.name
+        obj.name = pen.name === 'gif' ? pen.name : 'rectangle'
         obj.icon = ''
       }
       if (key === 'icon') {
         obj.imageId = pen[key]
-        obj.name = pen.name
+        obj.name = 'rectangle'
         obj.image = ''
       }
       getTopology(this.meta2dId).setValue(obj) // 更新pen