From 61972c047230a01bdd45403a6cb976c1aea694ce Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 18 Mar 2022 16:23:41 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1690=20feat=20:=20IPAM=20IP=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BC=80=E9=A5=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/IpDetails.vue       | 40 ++++++++++++++++---
 .../common/popBox/topToolMoreOptions.vue      |  4 ++
 .../common/rightBox/ipDetailsBox.vue          |  3 --
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
index 7ae3cebba..8f4e1b096 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
@@ -14,6 +14,35 @@
       @changeTab="changeTab"
     >
       <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
+      <template v-slot:top-tool-right>
+        <button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipam')" class="top-tool-btn margin-r-10"
+                type="button" @click="add">
+          <i class="nz-icon-create-square nz-icon"></i>
+        </button>
+        <top-tool-more-options
+          :delete-objs="batchDeleteObjs"
+          ref="export"
+          id="ipam-ip"
+          :params="searchLabel"
+          :permissions="{
+                  import: 'ipam_add',
+                  export: 'ipam_edit'
+                }"
+          class="top-tool-export margin-r-10"
+          export-file-name="ipam"
+          export-url="/ipam/ip/export"
+          import-url="/ipam/ip/import"
+          @afterImport="getTableData"
+        >
+          <template v-slot:before>
+            <div>
+              <el-dropdown-item>
+                <delete-button :type="'link'" :title="$t('overall.batchDel')" v-has="'ipam_delete'" id="account-list-batch-delete" :api="url" :delete-objs="batchDeleteObjs" @after="getTableData" @before="delFlag=true"></delete-button>
+              </el-dropdown-item>
+            </div>
+          </template>
+        </top-tool-more-options>
+      </template>
       <template v-slot>
         <ip-details-table
           ref="dataTable"
@@ -33,11 +62,6 @@
           @selectionChange="selectionChange"
         ></ip-details-table>
       </template>
-      <template v-slot:top-tool-right>
-        <button id="ipam-ip" class="top-tool-btn margin-r-10 margin-l-10" @click.stop="add">
-          <i class="nz-icon nz-icon-create-square"></i>
-        </button>
-      </template>
       <template v-slot:pagination>
         <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
       </template>
@@ -55,13 +79,17 @@ import subDataListMixin from '@/components/common/mixin/subDataList'
 import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin'
 import ipDetailsTable from '@/components/common/table/settings/ipDetailsTable'
 import ipDetailsBox from '@/components/common/rightBox/ipDetailsBox'
+import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions'
+import deleteButton from '@/components/common/deleteButton'
 export default {
   name: 'IpDetails',
   mixins: [dataListMixin, subDataListMixin, detailViewRightMixin],
   components: {
     nzBottomDataList,
     ipDetailsTable,
-    ipDetailsBox
+    ipDetailsBox,
+    topToolMoreOptions,
+    deleteButton
   },
   data () {
     return {
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 567087b2e..74d450187 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -215,6 +215,8 @@ export default {
         url = '/dc/cancelImport'
       } else if (this.importUrl.indexOf('/ipam/subnet') > -1) {
         url = '/ipam/subnet/cancelImport'
+      } else if (this.importUrl.indexOf('/ipam/ip') > -1) {
+        url = '/ipam/ip/cancelImport'
       }
       this.$delete(url + '?seq=' + this.importResult.seq).then(response => {
         if (response.code == 200) {
@@ -310,6 +312,8 @@ export default {
         url = '/dc/template'
       } else if (this.importUrl.indexOf('/ipam/subnet') > -1) {
         url = '/ipam/subnet/template'
+      } else if (this.importUrl.indexOf('/ipam/ip') > -1) {
+        url = ' /ipam/ip/template'
       }
       if (!url) {
         console.error('no interface support')
diff --git a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue
index b60f2b339..95cb5637c 100644
--- a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue
@@ -20,9 +20,6 @@
           <el-form-item label="MAC" prop="mac">
             <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipDetails.mac" size="small"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('config.ipamip.asset')" prop="asset">
-            <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipDetails.asset.name" size="small"></el-input>
-          </el-form-item>
           <el-form-item :label="$t('overall.state')" prop="state">
             <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipDetails.state" size="small"></el-input>
           </el-form-item>