From 9a92c898cdfe767dea820a2fd88034cfc246f3d2 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Tue, 16 Jul 2024 11:10:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B=E8=A6=86=E7=9B=96=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=90=9C=E7=B4=A2=20=20--bug=3D118561540=20#=20Review?=
 =?UTF-8?q?ed,=20transaction=20id:=2012190?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/src/pages/task/TaskList/index.vue | 29 ++++++++++++-------
 .../TemplateList/ImportYamlTplDialog.vue      | 19 +++++++-----
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/frontend/desktop/src/pages/task/TaskList/index.vue b/frontend/desktop/src/pages/task/TaskList/index.vue
index c7678bbb33..4f78f48e6e 100644
--- a/frontend/desktop/src/pages/task/TaskList/index.vue
+++ b/frontend/desktop/src/pages/task/TaskList/index.vue
@@ -165,18 +165,21 @@
                                 </NoData>
                             </div>
                         </bk-table>
-                        <bk-pagination
+                        <div
+                            v-if="countLoading || listLoading || pagination.count"
                             class="bk-table-pagination-wrapper"
-                            v-bkloading="{ isLoading: countLoading || listLoading, zIndex: 100 }"
-                            size="small"
-                            v-bind="pagination"
-                            :location="'left'"
-                            :align="'right'"
-                            :show-limit="true"
-                            :show-total-count="true"
-                            @change="onPageChange"
-                            @limit-change="onPageLimitChange">
-                        </bk-pagination>
+                            v-bkloading="{ isLoading: countLoading || listLoading, zIndex: 100 }">
+                            <bk-pagination
+                                size="small"
+                                v-bind="pagination"
+                                :location="'left'"
+                                :align="'right'"
+                                :show-limit="true"
+                                :show-total-count="true"
+                                @change="onPageChange"
+                                @limit-change="onPageLimitChange">
+                            </bk-pagination>
+                        </div>
                     </div>
                 </div>
             </skeleton>
@@ -1224,6 +1227,10 @@
         margin-left: 16px;
     }
 }
+.bk-table-pagination-wrapper {
+    height: 64px;
+    border: 1px solid #dfe0e5;
+}
 </style>
 <style lang="scss">
 .task-status-popover {
diff --git a/frontend/desktop/src/pages/template/TemplateList/ImportYamlTplDialog.vue b/frontend/desktop/src/pages/template/TemplateList/ImportYamlTplDialog.vue
index 81f09318e3..a810c9ee82 100644
--- a/frontend/desktop/src/pages/template/TemplateList/ImportYamlTplDialog.vue
+++ b/frontend/desktop/src/pages/template/TemplateList/ImportYamlTplDialog.vue
@@ -123,7 +123,7 @@
                             </div>
                         </bk-table-column>
                         <bk-table-column :label="$t('是否覆盖已有子流程（实验功能，请谨慎使用并选择正确的流程）')" :width="400" :render-header="renderTableHeader">
-                            <template slot-scope="{ row }">
+                            <template slot-scope="{ row, $index }">
                                 <div class="tpl-overrider-select">
                                     <bk-select
                                         style="width: 180px;"
@@ -147,6 +147,7 @@
                                         enable-scroll-load
                                         :scroll-loading="{ isLoading: scrollLoading }"
                                         :remote-method="onCommonTplSearch"
+                                        @toggle="subFlowIndex = $index"
                                         @clear="onClearRefer(row)"
                                         @selected="onSelectRefer(row, $event)"
                                         @scroll-end="onSelectScrollLoad(row)">
@@ -251,6 +252,8 @@
                 importPending: false,
                 tplLoading: false,
                 scrollLoading: false,
+                flowName: '',
+                subFlowIndex: 0,
                 topFlowPagination: {
                     current: 1,
                     count: 0
@@ -397,8 +400,10 @@
             // 公共模板下拉框搜索
             handleCommonTplSearch (val) {
                 this.commonPagination.current = 1
-                this.commonFlowName = val
-                const params = this.getQueryData(true)
+                this.flowName = val
+                const row = this.subFlowList[this.subFlowIndex]
+                const isCommon = this.common || row?.refer === 'useCommonExisting'
+                const params = this.getQueryData(isCommon)
                 this.getTemplateData(params)
             },
             // 下拉框滚动加载
@@ -419,13 +424,11 @@
                     }
                 }
             },
-            getQueryData (common = undefined) {
-                let tplName, offset, projectId
+            getQueryData (common = this.common) {
+                let offset, projectId
                 if (common) {
-                    tplName = this.commonFlowName
                     offset = (this.commonPagination.current - 1) * this.commonPagination.limit
                 } else {
-                    tplName = this.flowName
                     offset = (this.pagination.current - 1) * this.pagination.limit
                     projectId = this.project_id
                 }
@@ -434,7 +437,7 @@
                     common,
                     offset,
                     limit: 15,
-                    pipeline_template__name__icontains: tplName || undefined
+                    pipeline_template__name__icontains: this.flowName || undefined
                 }
                 return data
             },