From d9c0998a8a655d2710a56471d82b23ad60b372e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E4=BF=8A=E5=B4=8E=5Bjunqigu=5D?=
 <junqigu@canway.net>
Date: Wed, 24 Jan 2024 15:23:58 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E5=8F=8A?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E5=8F=91=E8=AE=A1=E5=88=92=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95=E5=88=86=E5=8F=91=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=20#1675?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/planManage/createPlan/index.vue | 48 +++++++++++++++++--
 .../src/views/planManage/planLog.vue          | 32 +++++++++----
 src/frontend/locale/repository/en-US.json     |  8 +++-
 src/frontend/locale/repository/zh-CN.json     |  8 +++-
 4 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue b/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue
index 7decf1060a..7c541360a2 100644
--- a/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue
+++ b/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue
@@ -119,6 +119,21 @@
                     :disabled="disabled">
                 </bk-input>
             </bk-form-item>
+            <bk-form-item>
+                <bk-checkbox v-model="planForm.record" :disabled="disabled">{{ $t('planRecordAllLog') }}</bk-checkbox>
+            </bk-form-item>
+            <bk-form-item property="recordReserveDays" error-display-type="normal">
+                <span>{{ $t('planLogReserveDays') }}</span>
+                <bk-input
+                    v-model="planForm.recordReserveDays"
+                    class="ml10 w180"
+                    type="number"
+                    :max="60"
+                    :min="1"
+                    :disabled="disabled"
+                    :placeholder="$t('planRecordReserveDaysInfo')">
+                </bk-input>
+            </bk-form-item>
             <bk-form-item v-if="!disabled">
                 <bk-button @click="$emit('close')">{{$t('cancel')}}</bk-button>
                 <bk-button class="ml10" theme="primary" :loading="planForm.loading" @click="save">{{$t('confirm')}}</bk-button>
@@ -168,7 +183,9 @@
                     remoteClusterIds: [],
                     creator: '',
                     created_time: '',
-                    description: ''
+                    description: '',
+                    record: true,
+                    recordReserveDays: 30
                 },
                 rules: {
                     name: [
@@ -218,6 +235,23 @@
                             message: this.$t('pleaseSelect') + this.$t('space') + this.$t('targetNode'),
                             trigger: 'blur'
                         }
+                    ],
+                    recordReserveDays: [
+                        {
+                            required: true,
+                            message: this.$t('planRecordReserveDaysInfo'),
+                            trigger: 'blur'
+                        },
+                        {
+                            validator: (value) => {
+                                if (!Number(value) && isNaN(value)) {
+                                    this.planForm.recordReserveDays = ''
+                                }
+                                return !isNaN(value)
+                            },
+                            message: this.$t('planRecordReserveDaysInfo'),
+                            trigger: 'blur'
+                        }
                     ]
                 },
                 replicaTaskObjects: []
@@ -289,7 +323,9 @@
                             conflictStrategy,
                             executionStrategy,
                             executionPlan: { executeTime, cronExpression }
-                        }
+                        },
+                        record,
+                        recordReserveDays
                     },
                     objects
                 }) => {
@@ -312,7 +348,9 @@
                         remoteClusterIds: this.checkClusterExist(remoteClusters.map(v => v.id)),
                         description,
                         createdBy,
-                        createdDate
+                        createdDate,
+                        record,
+                        recordReserveDays
                     }
                     this.replicaTaskObjects = objects
                 }).finally(() => {
@@ -376,7 +414,9 @@
                     },
                     remoteClusterIds: this.planForm.remoteClusterIds,
                     enabled: true,
-                    description: this.planForm.description
+                    description: this.planForm.description,
+                    record: this.planForm.record,
+                    recordReserveDays: Number(this.planForm.recordReserveDays)
                 }
                 const request = this.routeName === 'createPlan'
                     ? this.createPlan({ body })
diff --git a/src/frontend/devops-repository/src/views/planManage/planLog.vue b/src/frontend/devops-repository/src/views/planManage/planLog.vue
index 482516f144..9e00567ec0 100644
--- a/src/frontend/devops-repository/src/views/planManage/planLog.vue
+++ b/src/frontend/devops-repository/src/views/planManage/planLog.vue
@@ -122,16 +122,28 @@
                 })
             },
             showLogDetailHandler ({ id }) {
-                this.$router.push({
-                    name: 'logDetail',
-                    params: {
-                        ...this.$route.params,
-                        logId: id
-                    },
-                    query: {
-                        planName: this.planData.name
-                    }
-                })
+                // 历史的分发计划，后端接口返回的record字段为null，后端开发原话：record为true与null表示同一个意思，都是记录所有的分发日志
+                if (this.planData?.record || this.planData.record === null) {
+                    this.$router.push({
+                        name: 'logDetail',
+                        params: {
+                            ...this.$route.params,
+                            logId: id
+                        },
+                        query: {
+                            planName: this.planData.name
+                        }
+                    })
+                } else {
+                    // 不记录日志详情，此时直接弹窗警告
+                    const name = this.planData.name
+                    this.$bkMessage({
+                        message: this.$t('planTaskLogInfo', { name }),
+                        theme: 'warning',
+                        limit: 1,
+                        offsetY: 50
+                    })
+                }
             }
         }
     }
diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json
index 4bf2fd56b4..532bbfaa01 100644
--- a/src/frontend/locale/repository/en-US.json
+++ b/src/frontend/locale/repository/en-US.json
@@ -651,7 +651,7 @@
     "runningStatus":"Running status",
     "startExecutionTime":"Starting time",
     "endExecutionTime":"End Time",
-    "planLogTitle":"{name} execution log",
+    "planLogTitle":"{name} execution task record",
     "usedQuotaCapacity":"Quota capacity used by the repository",
     "nodeTypeEnum": {
         "CENTER": "center",
@@ -829,5 +829,9 @@
     "roleName":"Name",
     "addUserGroupTitle":"Create UserGroup",
     "editUserGroupTitle": "Edit UserGroup",
-    "associatedUseGroup": "UserGroup"
+    "associatedUseGroup": "UserGroup",
+    "planRecordAllLog":"Record all distribution logs",
+    "planLogReserveDays":"Log retention days (within 60 days)",
+    "planRecordReserveDaysInfo":"Please enter a number between 1-60",
+    "planTaskLogInfo":"[{name}] distribution plan does not select to record all distribution logs, and task log details cannot be viewed."
 }
diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json
index 33776fedef..85ec5fbf7b 100644
--- a/src/frontend/locale/repository/zh-CN.json
+++ b/src/frontend/locale/repository/zh-CN.json
@@ -657,7 +657,7 @@
     "runningStatus":"运行状态",
     "startExecutionTime":"开始执行时间",
     "endExecutionTime":"结束执行时间",
-    "planLogTitle":"{name} 执行日志",
+    "planLogTitle":"{name} 执行任务记录",
     "nodeTypeEnum": {
         "CENTER": "中心节点",
         "EDGE": "边缘节点",
@@ -830,5 +830,9 @@
     "roleName":"用户组名称",
     "addUserGroupTitle":"创建用户组",
     "editUserGroupTitle": "编辑用户组",
-    "associatedUseGroup": "关联用户组"
+    "associatedUseGroup": "关联用户组",
+    "planRecordAllLog":"记录所有分发日志",
+    "planLogReserveDays":"日志保留天数(60天内)",
+    "planRecordReserveDaysInfo":"请输入 1-60 之间的数字",
+    "planTaskLogInfo":"[{name}] 分发计划未选择记录所有分发日志，无法查看任务日志详情"
 }

From 0283c29ecd6703f73c1dfcfdd037f1a62045b7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E4=BF=8A=E5=B4=8E=5Bjunqigu=5D?=
 <junqigu@canway.net>
Date: Thu, 25 Jan 2024 15:04:14 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=88=B6=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E5=8F=91=E7=9A=84=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=E5=B9=B6=E4=BF=AE=E6=94=B9=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=20#1675?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/actions/nodeManage.js           | 13 ++-
 .../devops-repository/src/store/publicEnum.js | 15 ++++
 .../src/views/planManage/logDetail.vue        | 87 +++++++++++++++----
 src/frontend/locale/repository/en-US.json     | 13 ++-
 src/frontend/locale/repository/zh-CN.json     | 13 ++-
 5 files changed, 119 insertions(+), 22 deletions(-)

diff --git a/src/frontend/devops-repository/src/store/actions/nodeManage.js b/src/frontend/devops-repository/src/store/actions/nodeManage.js
index 3930d64727..3d2196ac91 100644
--- a/src/frontend/devops-repository/src/store/actions/nodeManage.js
+++ b/src/frontend/devops-repository/src/store/actions/nodeManage.js
@@ -129,7 +129,7 @@ export default {
         )
     },
     // 计划执行日志制品详情
-    getPlanLogPackageList (_, { id, status, packageName, repoName, clusterName, path, current = 1, limit = 10 }) {
+    getPlanLogPackageList (_, { id, status, artifactName, repoName, clusterName, current = 1, limit = 10 }) {
         return Vue.prototype.$ajax.get(
             `${prefix}/task/record/detail/page/${id}`,
             {
@@ -137,12 +137,17 @@ export default {
                     pageNumber: current,
                     pageSize: limit,
                     status: status || undefined,
-                    packageName: packageName || undefined,
+                    artifactName: artifactName || undefined,
                     repoName: repoName || undefined,
-                    clusterName: clusterName || undefined,
-                    path: path || undefined
+                    clusterName: clusterName || undefined
                 }
             }
         )
+    },
+    // 计划执行任务总览
+    getPlanLogDetailOverview (_, { id }) {
+        return Vue.prototype.$ajax.get(
+            `${prefix}/task/record/overview/${id}`
+        )
     }
 }
diff --git a/src/frontend/devops-repository/src/store/publicEnum.js b/src/frontend/devops-repository/src/store/publicEnum.js
index c576bc722e..bafa7a59f3 100644
--- a/src/frontend/devops-repository/src/store/publicEnum.js
+++ b/src/frontend/devops-repository/src/store/publicEnum.js
@@ -153,3 +153,18 @@ export const specialRepoEnum = [
     'report',
     'custom'
 ]
+
+// 分发计划的任务日志详情页数量显示
+export const planLogEnum = {
+    total: '同步总数量',
+    success: '成功数量',
+    failed: '失败数量',
+    conflict: '冲突数量'
+}
+
+// 分发计划冲突策略
+export const conflictStrategyEnum = {
+    SKIP: '跳过冲突',
+    OVERWRITE: '替换制品',
+    FAST_FAIL: '终止同步'
+}
diff --git a/src/frontend/devops-repository/src/views/planManage/logDetail.vue b/src/frontend/devops-repository/src/views/planManage/logDetail.vue
index e53a15edce..362f114928 100644
--- a/src/frontend/devops-repository/src/views/planManage/logDetail.vue
+++ b/src/frontend/devops-repository/src/views/planManage/logDetail.vue
@@ -1,6 +1,22 @@
 <template>
     <main class="log-detail-container" v-bkloading="{ isLoading }">
         <div class="mr20 mt10 log-package-seach flex-align-center">
+            <div v-if="showOverviewCount" class="flex-align-center ml20" style="margin-right:auto;">
+                <div v-for="(value,key) in countList" :key="key" class="mr30 ">
+                    <span>
+                        {{$t(`planLogEnum.${key}`)}}
+                    </span>
+                    <span>: </span>
+                    <span class="log-count"
+                        v-bk-tooltips="{
+                            content: $t(`planLogEnum.${key}`) + ': ' + value,
+                            placements: ['top'],
+                            disabled: ((value + '').length || 0) < 6
+                        }">
+                        {{value}}
+                    </span>
+                </div>
+            </div>
             <bk-search-select
                 class="search-group"
                 clearable
@@ -40,28 +56,34 @@
                     <span class="ml5">{{ row.localRepoName }}</span>
                 </template>
             </bk-table-column>
+            <bk-table-column :label="$t('artifactName')" show-overflow-tooltip>
+                <template #default="{ row }">{{ row.artifactName || row.packageKey || row.path || '/' }}</template>
+            </bk-table-column>
+            <bk-table-column :label="$t('version')" show-overflow-tooltip>
+                <template #default="{ row }">{{ row.version || (row.versions || ['/']).join('、') }}</template>
+            </bk-table-column>
             <bk-table-column :label="$t('syncStatus')" width="90">
                 <template #default="{ row }">
                     <div class="status-sign" :class="row.status" :data-name="$t(`asyncPlanStatusEnum.${row.status}`) || $t('notExecuted')"></div>
                 </template>
             </bk-table-column>
-            <template v-if="logDetail.replicaType === 'REAL_TIME' || logDetail.replicaObjectType !== 'REPOSITORY'">
-                <bk-table-column :label="$t('artifactName') + '/' + $t('filePath')" show-overflow-tooltip>
-                    <template #default="{ row }">{{ row.packageKey || row.path || '/' }}</template>
-                </bk-table-column>
-                <bk-table-column :label="$t('version')" show-overflow-tooltip>
-                    <template #default="{ row }">{{ (row.versions || ['/']).join('、') }}</template>
-                </bk-table-column>
-            </template>
+            <bk-table-column :label="$t('conflictStrategy')" width="150">
+                <template #default="{ row }">
+                    <span>{{row.conflictStrategy ? $t(`conflictStrategyEnum.${row.conflictStrategy}`) : '/'}}</span>
+                </template>
+            </bk-table-column>
             <bk-table-column :label="$t('startTime')" width="150">
                 <template #default="{ row }">{{formatDate(row.startTime)}}</template>
             </bk-table-column>
             <bk-table-column :label="$t('endTime')" width="150">
                 <template #default="{ row }">{{formatDate(row.endTime)}}</template>
             </bk-table-column>
-            <bk-table-column :label="$t('successNum')" prop="success"></bk-table-column>
-            <bk-table-column :label="$t('skipNum')" prop="skip"></bk-table-column>
-            <bk-table-column :label="$t('failNum')" prop="failed"></bk-table-column>
+            <!-- 历史数据因为统计数量不存在，需要显示之前的成功数量等字段 -->
+            <template v-if="!showOverviewCount">
+                <bk-table-column :label="$t('successNum')" prop="success"></bk-table-column>
+                <bk-table-column :label="$t('skipNum')" prop="skip"></bk-table-column>
+                <bk-table-column :label="$t('failNum')" prop="failed"></bk-table-column>
+            </template>
             <bk-table-column :label="$t('note')" show-overflow-tooltip>
                 <template #default="{ row }">{{row.errorReason || '/'}}</template>
             </bk-table-column>
@@ -83,12 +105,13 @@
 <script>
     import { mapGetters, mapActions } from 'vuex'
     import { formatDate } from '@repository/utils'
-    import { asyncPlanStatusEnum } from '@repository/store/publicEnum'
+    import { asyncPlanStatusEnum, planLogEnum } from '@repository/store/publicEnum'
     export default {
         name: 'logDetail',
         data () {
             return {
                 asyncPlanStatusEnum,
+                planLogEnum,
                 isLoading: false,
                 logDetail: {},
                 pkgList: [],
@@ -99,7 +122,16 @@
                     current: 1,
                     limit: 20,
                     limitList: [10, 20, 40]
-                }
+                },
+                // 分发计划日志详情的同步数量
+                countList: {
+                    total: 0,
+                    success: 0,
+                    failed: 0,
+                    conflict: 0
+                },
+                // 是否需要显示日志详情的同步数量相关字段
+                showOverviewCount: false
             }
         },
         computed: {
@@ -111,8 +143,7 @@
                 return [
                     { name: this.$t('nodeName'), id: 'clusterName' },
                     { name: this.$t('repoName'), id: 'repoName' },
-                    ...(this.logDetail.replicaObjectType === 'PACKAGE' ? [{ name: this.$t('artifactName'), id: 'packageName' }] : []),
-                    ...(this.logDetail.replicaObjectType === 'PATH' ? [{ name: this.$t('filePath'), id: 'path' }] : [])
+                    { name: this.$t('artifactName'), id: 'artifactName' }
                 ]
             }
         },
@@ -132,10 +163,11 @@
                     })
                 }
             })
+            this.getPlanLogCountList()
         },
         methods: {
             formatDate,
-            ...mapActions(['getPlanLogDetail', 'getPlanLogPackageList']),
+            ...mapActions(['getPlanLogDetail', 'getPlanLogPackageList', 'getPlanLogDetailOverview']),
             handlerPaginationChange ({ current = 1, limit = this.pagination.limit } = {}) {
                 this.pagination.current = current
                 this.pagination.limit = limit
@@ -182,6 +214,19 @@
                     target[item.id] = item.values[0].id
                     return target
                 }, {})
+            },
+            // 获取当前分发计划执行记录中同步数量相关参数展示数据
+            getPlanLogCountList () {
+                this.getPlanLogDetailOverview({ id: this.logId }).then((res) => {
+                    // 只有在后端接口返回的数据有值时才需要展示，后端接口没有返回时则表明可能是历史数据，历史数据不展示
+                    if (res) {
+                        this.showOverviewCount = true
+                        this.countList = {
+                            total: (res?.success || 0) + (res?.failed || 0),
+                            ...res
+                        }
+                    }
+                })
             }
         }
     }
@@ -196,5 +241,15 @@
             min-width: 250px;
         }
     }
+    .log-count {
+        font-size: 14px;
+        font-weight: bold;
+        max-width: 50px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        display: inline-block;
+        vertical-align: middle;
+    }
 }
 </style>
diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json
index 532bbfaa01..c57fe5252b 100644
--- a/src/frontend/locale/repository/en-US.json
+++ b/src/frontend/locale/repository/en-US.json
@@ -833,5 +833,16 @@
     "planRecordAllLog":"Record all distribution logs",
     "planLogReserveDays":"Log retention days (within 60 days)",
     "planRecordReserveDaysInfo":"Please enter a number between 1-60",
-    "planTaskLogInfo":"[{name}] distribution plan does not select to record all distribution logs, and task log details cannot be viewed."
+    "planTaskLogInfo":"[{name}] distribution plan does not select to record all distribution logs, and task log details cannot be viewed.",
+    "planLogEnum" :{
+        "total": "Total number of syncs",
+        "success": "Number of successes",
+        "failed": "Number of failures",
+        "conflict": "Number of conflicts"
+    },
+    "conflictStrategyEnum": {
+        "SKIP": "Skip conflicts",
+        "OVERWRITE": "Replacement artifacts",
+        "FAST_FAIL": "Terminate synchronization"
+    }
 }
diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json
index 85ec5fbf7b..66938d7d54 100644
--- a/src/frontend/locale/repository/zh-CN.json
+++ b/src/frontend/locale/repository/zh-CN.json
@@ -834,5 +834,16 @@
     "planRecordAllLog":"记录所有分发日志",
     "planLogReserveDays":"日志保留天数(60天内)",
     "planRecordReserveDaysInfo":"请输入 1-60 之间的数字",
-    "planTaskLogInfo":"[{name}] 分发计划未选择记录所有分发日志，无法查看任务日志详情"
+    "planTaskLogInfo":"[{name}] 分发计划未选择记录所有分发日志，无法查看任务日志详情",
+    "planLogEnum" : {
+        "total": "同步总数量",
+        "success": "成功数量",
+        "failed": "失败数量",
+        "conflict": "冲突数量"
+    },
+    "conflictStrategyEnum": {
+        "SKIP": "跳过冲突",
+        "OVERWRITE": "替换制品",
+        "FAST_FAIL": "终止同步"
+    }
 }

From 332c701e2664aaa9f55aaf71fe1ca74baaee69a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E4=BF=8A=E5=B4=8E=5Bjunqigu=5D?=
 <junqigu@canway.net>
Date: Thu, 25 Jan 2024 15:48:15 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=88=86=E5=8F=91=E8=AE=A1=E5=88=92=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E6=97=B6=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=A4=84=E7=90=86=E8=AE=B0=E5=BD=95=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9A=84=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20#1675?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/planManage/createPlan/index.vue                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue b/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue
index 7c541360a2..73d480b9f9 100644
--- a/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue
+++ b/src/frontend/devops-repository/src/views/planManage/createPlan/index.vue
@@ -349,8 +349,8 @@
                         description,
                         createdBy,
                         createdDate,
-                        record,
-                        recordReserveDays
+                        record: record || true,
+                        recordReserveDays: recordReserveDays || 60
                     }
                     this.replicaTaskObjects = objects
                 }).finally(() => {

From 825b330522bcba116644b73e164cba39ceae3d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E4=BF=8A=E5=B4=8E=5Bjunqigu=5D?=
 <junqigu@canway.net>
Date: Thu, 25 Jan 2024 16:03:32 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E5=88=86=E5=8F=91=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C=E6=97=A5=E5=BF=97=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20#1675?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/planManage/planLog.vue          | 147 +++++++++++-------
 src/frontend/locale/repository/en-US.json     |   4 +-
 src/frontend/locale/repository/zh-CN.json     |   4 +-
 3 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/src/frontend/devops-repository/src/views/planManage/planLog.vue b/src/frontend/devops-repository/src/views/planManage/planLog.vue
index 9e00567ec0..e45481822e 100644
--- a/src/frontend/devops-repository/src/views/planManage/planLog.vue
+++ b/src/frontend/devops-repository/src/views/planManage/planLog.vue
@@ -1,57 +1,75 @@
 <template>
-    <bk-sideslider :is-show.sync="showSideslider" :quick-close="true" :width="850" :title="$t('planLogTitle', { name: planData.name })">
-        <template #content>
-            <div class="plan-detail-container" v-bkloading="{ isLoading }">
-                <bk-radio-group
-                    v-if="planData.replicaType !== 'REAL_TIME'"
-                    class="mt10 pr20"
-                    style="text-align: right;"
-                    v-model="status"
-                    @change="handlerPaginationChange()">
-                    <bk-radio class="ml50" value="">{{ $t('total') }}</bk-radio>
-                    <bk-radio class="ml50" value="SUCCESS">{{ $t('asyncPlanStatusEnum.SUCCESS') }}</bk-radio>
-                    <bk-radio class="ml50" value="FAILED">{{ $t('asyncPlanStatusEnum.FAILED') }}</bk-radio>
-                </bk-radio-group>
-                <bk-table
-                    class="mt10"
-                    :height="planData.replicaType !== 'REAL_TIME' ? 'calc(100% - 90px)' : 'calc(100% - 60px)'"
-                    :data="logList"
-                    :outer-border="false"
-                    :row-border="false"
-                    :row-style="{ cursor: 'pointer' }"
-                    size="small"
-                    @row-click="showLogDetailHandler">
-                    <bk-table-column type="index" :label="$t('NO')" width="70"></bk-table-column>
-                    <bk-table-column :label="$t('runningStatus')" width="110">
-                        <template #default="{ row }">
-                            <span class="repo-tag" :class="row.status">{{$t(`asyncPlanStatusEnum.${row.status}`) || $t('notExecuted')}}</span>
-                        </template>
-                    </bk-table-column>
-                    <bk-table-column :label="$t('startExecutionTime')" width="150">
-                        <template #default="{ row }">{{formatDate(row.startTime)}}</template>
-                    </bk-table-column>
-                    <bk-table-column v-if="planData.replicaType !== 'REAL_TIME'" :label="$t('endExecutionTime')" width="150">
-                        <template #default="{ row }">{{formatDate(row.endTime)}}</template>
-                    </bk-table-column>
-                    <bk-table-column :label="$t('note')" show-overflow-tooltip>
-                        <template #default="{ row }">{{row.errorReason || '/'}}</template>
-                    </bk-table-column>
-                </bk-table>
-                <bk-pagination
-                    class="p10"
-                    size="small"
-                    align="right"
-                    show-total-count
-                    @change="current => handlerPaginationChange({ current })"
-                    @limit-change="limit => handlerPaginationChange({ limit })"
-                    :current.sync="pagination.current"
-                    :limit="pagination.limit"
-                    :count="pagination.count"
-                    :limit-list="pagination.limitList">
-                </bk-pagination>
-            </div>
-        </template>
-    </bk-sideslider>
+    <div>
+        <bk-sideslider :is-show.sync="showSideslider" :quick-close="true" :width="600" :title="$t('planLogTitle', { name: planData.name })">
+            <template #content>
+                <div class="plan-detail-container" v-bkloading="{ isLoading }">
+                    <bk-radio-group
+                        v-if="planData.replicaType !== 'REAL_TIME'"
+                        class="mt10 pr20"
+                        style="text-align: right;"
+                        v-model="status"
+                        @change="handlerPaginationChange()">
+                        <bk-radio class="ml50" value="">{{ $t('total') }}</bk-radio>
+                        <bk-radio class="ml50" value="SUCCESS">{{ $t('asyncPlanStatusEnum.SUCCESS') }}</bk-radio>
+                        <bk-radio class="ml50" value="FAILED">{{ $t('asyncPlanStatusEnum.FAILED') }}</bk-radio>
+                    </bk-radio-group>
+                    <bk-table
+                        class="mt10"
+                        :height="planData.replicaType !== 'REAL_TIME' ? 'calc(100% - 90px)' : 'calc(100% - 60px)'"
+                        :data="logList"
+                        :outer-border="false"
+                        :row-border="false"
+                        :row-style="{ cursor: 'pointer' }"
+                        size="small"
+                        :empty-text="$t('planLogEmptyTitle')"
+                        @row-click="showLogDetailHandler">
+                        <bk-table-column type="index" :label="$t('NO')" width="70"></bk-table-column>
+                        <bk-table-column :label="$t('runningStatus')" width="110">
+                            <template #default="{ row }">
+                                <span class="repo-tag" :class="row.status">{{$t(`asyncPlanStatusEnum.${row.status}`) || $t('notExecuted')}}</span>
+                            </template>
+                        </bk-table-column>
+                        <bk-table-column :label="$t('startExecutionTime')" width="150">
+                            <template #default="{ row }">{{formatDate(row.startTime)}}</template>
+                        </bk-table-column>
+                        <bk-table-column v-if="planData.replicaType !== 'REAL_TIME'" :label="$t('endExecutionTime')" width="150">
+                            <template #default="{ row }">{{formatDate(row.endTime)}}</template>
+                        </bk-table-column>
+                        <bk-table-column :label="$t('planLogErrorReason')" width="120">
+                            <template #default="{ row }">
+                                <bk-button v-if="row.errorReason" style="width:80%;" text theme="primary" @click.stop="openErrorDetail(row)">{{$t('view')}}</bk-button>
+                                <span v-else>/</span>
+                            </template>
+                        </bk-table-column>
+                    </bk-table>
+                    <bk-pagination
+                        class="p10"
+                        size="small"
+                        align="right"
+                        show-total-count
+                        @change="current => handlerPaginationChange({ current })"
+                        @limit-change="limit => handlerPaginationChange({ limit })"
+                        :current.sync="pagination.current"
+                        :limit="pagination.limit"
+                        :count="pagination.count"
+                        :limit-list="pagination.limitList">
+                    </bk-pagination>
+                </div>
+            </template>
+        </bk-sideslider>
+        <canway-dialog
+            v-model="errorDialog.show"
+            width="450"
+            height-num="380"
+            :title="$t('planLogErrorReason')"
+            :show-footer="false"
+            @cancel="closeErrorDialog">
+            <div class="error-dialog-info">{{errorDialog.reason}}</div>
+            <template #footer>
+                <bk-button @click="closeErrorDialog">{{$t('close')}}</bk-button>
+            </template>
+        </canway-dialog>
+    </div>
 </template>
 <script>
     import { formatDate } from '@repository/utils'
@@ -81,6 +99,10 @@
                     current: 1,
                     limit: 20,
                     limitList: [10, 20, 40]
+                },
+                errorDialog: {
+                    show: false,
+                    reason: ''
                 }
             }
         },
@@ -144,6 +166,20 @@
                         offsetY: 50
                     })
                 }
+            },
+            openErrorDetail (row) {
+                // 因为后端接口涉及改动较大，且不好实现，后端在分发异常的时候错误信息会始终携带指定字符串 “部分数据同步失败”，所以产品同学说前端针对这几个指定字符串的国际化做特殊处理
+                const errorReason = (this.currentLanguage === 'zh-cn' ? '部分数据同步失败' : 'Partial data synchronization failed') + row.errorReason.split('部分数据同步失败')?.[1] || ''
+                this.errorDialog = {
+                    show: true,
+                    reason: errorReason
+                }
+            },
+            closeErrorDialog () {
+                this.errorDialog = {
+                    show: false,
+                    reason: ''
+                }
             }
         }
     }
@@ -152,4 +188,9 @@
 .plan-detail-container {
     height: 100%;
 }
+.error-dialog-info{
+    max-height: 250px;
+    overflow-y: auto;
+    word-break: break-all;
+}
 </style>
diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json
index c57fe5252b..56eee3977c 100644
--- a/src/frontend/locale/repository/en-US.json
+++ b/src/frontend/locale/repository/en-US.json
@@ -844,5 +844,7 @@
         "SKIP": "Skip conflicts",
         "OVERWRITE": "Replacement artifacts",
         "FAST_FAIL": "Terminate synchronization"
-    }
+    },
+    "planLogErrorReason":"Error reason",
+    "planLogEmptyTitle":"There is no data or the data has been cleared after exceeding the maximum retention days."
 }
diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json
index 66938d7d54..4b970cda36 100644
--- a/src/frontend/locale/repository/zh-CN.json
+++ b/src/frontend/locale/repository/zh-CN.json
@@ -845,5 +845,7 @@
         "SKIP": "跳过冲突",
         "OVERWRITE": "替换制品",
         "FAST_FAIL": "终止同步"
-    }
+    },
+    "planLogErrorReason":"异常原因",
+    "planLogEmptyTitle":"暂无数据或数据已超过最大保留天数被清除"
 }

From 395349f4e138684a1c5e6a20de5be9b62dfa1149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E4=BF=8A=E5=B4=8E=5Bjunqigu=5D?=
 <junqigu@canway.net>
Date: Thu, 25 Jan 2024 16:35:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E5=88=B6=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E5=8F=91=E7=9A=84=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=A4=A7=E5=B0=8F=E5=8F=8A?=
 =?UTF-8?q?sha256=E5=AD=97=E6=AE=B5=20#1675?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-repository/src/views/planManage/logDetail.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/frontend/devops-repository/src/views/planManage/logDetail.vue b/src/frontend/devops-repository/src/views/planManage/logDetail.vue
index 362f114928..0f8ee3dd87 100644
--- a/src/frontend/devops-repository/src/views/planManage/logDetail.vue
+++ b/src/frontend/devops-repository/src/views/planManage/logDetail.vue
@@ -62,6 +62,12 @@
             <bk-table-column :label="$t('version')" show-overflow-tooltip>
                 <template #default="{ row }">{{ row.version || (row.versions || ['/']).join('、') }}</template>
             </bk-table-column>
+            <bk-table-column :label="$t('size')" show-overflow-tooltip>
+                <template #default="{ row }">{{ row.size ? convertFileSize(row.size > 0 ? row.size : 0 ) : '/'}}</template>
+            </bk-table-column>
+            <bk-table-column label="sha256" show-overflow-tooltip>
+                <template #default="{ row }">{{ row.sha256 || '/' }}</template>
+            </bk-table-column>
             <bk-table-column :label="$t('syncStatus')" width="90">
                 <template #default="{ row }">
                     <div class="status-sign" :class="row.status" :data-name="$t(`asyncPlanStatusEnum.${row.status}`) || $t('notExecuted')"></div>
@@ -104,7 +110,7 @@
 </template>
 <script>
     import { mapGetters, mapActions } from 'vuex'
-    import { formatDate } from '@repository/utils'
+    import { formatDate, convertFileSize } from '@repository/utils'
     import { asyncPlanStatusEnum, planLogEnum } from '@repository/store/publicEnum'
     export default {
         name: 'logDetail',
@@ -167,6 +173,7 @@
         },
         methods: {
             formatDate,
+            convertFileSize,
             ...mapActions(['getPlanLogDetail', 'getPlanLogPackageList', 'getPlanLogDetailOverview']),
             handlerPaginationChange ({ current = 1, limit = this.pagination.limit } = {}) {
                 this.pagination.current = current

From 8454ad6b7c43855a30f7bf6907ae8d0244d98324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E4=BF=8A=E5=B4=8E=5Bjunqigu=5D?=
 <junqigu@canway.net>
Date: Thu, 25 Jan 2024 16:37:37 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E5=88=B6=E5=93=81=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8C=85=E5=B1=91=E5=B1=95=E7=A4=BA=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=81=97=E6=BC=8F=E8=A1=A5=E5=85=85=20#1675?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/locale/repository/en-US.json | 3 ++-
 src/frontend/locale/repository/zh-CN.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json
index 56eee3977c..5d83e1871f 100644
--- a/src/frontend/locale/repository/en-US.json
+++ b/src/frontend/locale/repository/en-US.json
@@ -846,5 +846,6 @@
         "FAST_FAIL": "Terminate synchronization"
     },
     "planLogErrorReason":"Error reason",
-    "planLogEmptyTitle":"There is no data or the data has been cleared after exceeding the maximum retention days."
+    "planLogEmptyTitle":"There is no data or the data has been cleared after exceeding the maximum retention days.",
+    "logDetail":"Log detail"
 }
diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json
index 4b970cda36..7ce1420223 100644
--- a/src/frontend/locale/repository/zh-CN.json
+++ b/src/frontend/locale/repository/zh-CN.json
@@ -847,5 +847,6 @@
         "FAST_FAIL": "终止同步"
     },
     "planLogErrorReason":"异常原因",
-    "planLogEmptyTitle":"暂无数据或数据已超过最大保留天数被清除"
+    "planLogEmptyTitle":"暂无数据或数据已超过最大保留天数被清除",
+    "logDetail":"日志详情"
 }