From e9dd18c0d89a31bdae303fbaaab06ef48bc27baf Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 21 May 2021 16:34:22 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-656=20fix:=20=E7=A9=BF=E6=A2=AD=E6=A1=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/nzTransfer.vue      |  8 ++++--
 .../rightBox/asset/assetBatchEditBox.vue      | 25 ++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/nzTransfer.vue b/nezha-fronted/src/components/common/nzTransfer.vue
index 7f47bde4e..e26607982 100644
--- a/nezha-fronted/src/components/common/nzTransfer.vue
+++ b/nezha-fronted/src/components/common/nzTransfer.vue
@@ -39,6 +39,7 @@
       </div>
       <div class="box__footer">
         <el-pagination
+          @current-change="pageNoChange"
           :current-page.sync="selectablePage.pageNo"
           :page-size="selectablePage.pageSize"
           :total="selectablePage.total"
@@ -46,7 +47,7 @@
           small
         >
           <template>
-            <el-input ref="jumpInput" v-model="selectablePage.pageNo" class="jump-input" @change="selectableChange" @keyup.enter.native="selectableChange"/>
+            <el-input ref="jumpInput" v-model.number="selectablePage.pageNo" class="jump-input" @change="selectableChange" @keyup.enter.native="selectableChange"/>
             <span class="jump-pages">/&nbsp{{selectablePage.pages}}</span>
           </template>
         </el-pagination>
@@ -172,11 +173,14 @@ export default {
       this.$emit('search', this.searchLabel, this.selectablePage)
     },
     selectableChange (current) { // 左侧table翻页
-      this.selectablePage.pageNo = current
+      // this.selectablePage.pageNo = current
       this.$emit('search', this.searchLabel, this.selectablePage)
     },
     selectedChange (current) { // 右侧table翻页
 
+    },
+    pageNoChange (val) {
+      this.$emit('pageNo', val)
     },
     selectableSelectionChange (val) { // 左侧选项变化
       this.selectableSelection = val
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
index 36131bc1a..b5e7f2613 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
@@ -189,11 +189,13 @@
           <!-- 选择资产，穿梭框 -->
           <div class="form__sub-title">{{$t('overall.select')}}</div>
           <nz-transfer ref="transfer"
+                       style="margin-bottom: 20px;"
                        :page-obj="transfer.pageObj"
                        :search-msg="transfer.searchMsg"
                        :table-data="transfer.tableData"
-                       style="margin-bottom: 20px;"
                        :tableTitle="transfer.tableTitle"
+                       @pageNo="pageNoChange"
+                       @search="search"
                        @leftToRight="addAsset"
                        @rightToLeft="removeAsset">
             <template v-slot:title>Selected</template>
@@ -269,7 +271,6 @@ export default {
         selectedData: [],
         searchLabel: {},
         searchMsg: { // 给搜索框子组件传递的信息
-          zheze_none: true,
           searchLabelList: [
             {
               id: 1,
@@ -386,13 +387,22 @@ export default {
         this.labelCascShow = true
       })
     },
+    pageNoChange (val) {
+      this.transfer.pageObj.pageNo = val
+      this.getTableData()
+    },
     getTableData () {
       this.$refs.transfer.startLoading()
-      this.$get(this.url, { ...this.transfer.searchLabel, ...this.transfer.pageObj }).then(response => {
+      const searchLabel = { ...this.transfer.searchLabel }
+      if (this.editData.editType === assetConstants.editTypeData.account) {
+        searchLabel.authProtocol = this.editData.authProtocol
+      }
+      this.$get(this.url, { ...searchLabel, ...this.transfer.pageObj }).then(response => {
         this.$refs.transfer.endLoading()
         if (response.code === 200) {
           this.transfer.tableData = response.data.list
           this.transfer.pageObj.total = response.data.total
+          this.transfer.pageObj.pages = response.data.pages
         }
       })
     },
@@ -412,6 +422,15 @@ export default {
   },
   mounted () {
     this.getTableData()
+  },
+  watch: {
+    'editData.authProtocol': {
+      immediate: true,
+      deep: true,
+      handler (n) {
+        this.getTableData()
+      }
+    }
   }
 }
 </script>