From 06ab8bf5501bcd1cebc2642a95a14cf658289c08 Mon Sep 17 00:00:00 2001
From: vhwweng <1010382269@qq.com>
Date: Mon, 9 Oct 2023 11:04:33 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BB=A3=E7=A0=81=E5=BA=93?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E6=9C=9F=E5=8A=9F=E8=83=BD=E7=82=B9?=
 =?UTF-8?q?=20#9347?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CodeLibDetail/ResetAuthDialog.vue         | 23 +++++-
 .../CodeLibDetail/timeline-collapse.vue       | 70 +++++++++++++------
 .../src/components/CodeLibDialog/Gitlab.vue   |  2 +-
 .../src/components/CodeLibDialog/P4.vue       |  2 +-
 .../src/components/CodeLibDialog/SVN.vue      |  2 +-
 .../src/components/CodeLibDialog/index.vue    | 16 ++++-
 .../src/components/status-icon.vue            |  2 +-
 .../devops-codelib/src/config/index.js        |  2 +-
 .../devops-codelib/src/views/Index.vue        |  5 +-
 src/frontend/locale/codelib/en-US.json        |  5 +-
 src/frontend/locale/codelib/zh-CN.json        |  3 +-
 11 files changed, 93 insertions(+), 39 deletions(-)

diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
index 955b5fe8428..db0e3232b2b 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
@@ -16,7 +16,9 @@
             {{ $t('codelib.resetAuth') }}
         </h3>
         <bk-form
+            ref="form"
             :label-width="120"
+            :rules="rules"
         >
             <!-- Github 重置授权 -->
             <bk-form-item
@@ -179,6 +181,7 @@
                     :label="$t('codelib.codelibCredential')"
                     :required="true"
                     property="credentialId"
+                    error-display-type="normal"
                 >
                     <bk-select
                         v-model="newRepoInfo.credentialId"
@@ -195,7 +198,7 @@
                             :key="option.credentialId"
                             :id="option.credentialId"
                             :name="option.credentialId">
-                            <span>
+                            <span :title="option.credentialId">
                                 {{option.credentialId}}
                             </span>
                             <i
@@ -269,7 +272,16 @@
                 isSaveLoading: false,
                 isLoadingTickets: false,
                 newRepoInfo: {},
-                cacheRepoInfo: {}
+                cacheRepoInfo: {},
+                rules: {
+                    credentialId: [
+                        {
+                            required: true,
+                            message: this.$t('codelib.请选择凭证'),
+                            trigger: 'blur'
+                        }
+                    ]
+                }
             }
         },
         computed: {
@@ -512,7 +524,10 @@
             },
             handleConfirm () {
                 if (this.isOAUTH) return
-                this.handleUpdateRepo()
+                this.$refs.form.validate().then(() => {
+                    console.log(12321)
+                    this.handleUpdateRepo()
+                })
             },
             handleClose (val) {
                 if (!val) {
@@ -542,4 +557,6 @@
             color: #979BA5;
         }
     }
+    .codelib-credential-selector {
+    }
 </style>
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/timeline-collapse.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/timeline-collapse.vue
index da27a86bd96..c84629f6b26 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/timeline-collapse.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/timeline-collapse.vue
@@ -13,9 +13,9 @@
                             'collapse-item-header': true,
                             'active': activeIndex === index
                         }" @click="handleShowDetail(item, index)">
-                        <div>
-                            <StatusIcon :status="item.total === item.success ? 'normal' : 'error'"></StatusIcon>
-                            <span v-html="item.eventDesc"></span>
+                        <div class="title">
+                            <StatusIcon class="icon" :status="item.total === item.success ? 'normal' : 'error'"></StatusIcon>
+                            <span class="desc" :title="item.eventDesc" v-html="item.eventDesc"></span>
                             <span class="trigger-time">
                                 {{ new Date(item.eventTime).toLocaleString().split('.').join('-') }}
                             </span>
@@ -26,23 +26,26 @@
                                 ({{ item.success }}/{{ item.total }})
                             </span>
                         </div>
-                        <bk-icon
-                            :class="{
-                                'right-shape': true,
-                                'right-down': activeIndex === index
-                            }"
-                            svg
-                            type="angle-right"
-                            width="24"
-                            height="24"
-                        />
-                        <a
-                            v-if="activeIndex === index"
-                            class="one-click-trigger"
-                            @click.stop="handleReplayAll(item.eventId)"
-                        >
-                            {{ $t('codelib.一键重新触发') }}
-                        </a>
+                        <div class="header-right">
+                            <a
+                                v-if="activeIndex === index"
+                                class="one-click-trigger"
+                                @click.stop="handleReplayAll(item.eventId)"
+                            >
+                                {{ $t('codelib.一键重新触发') }}
+                            </a>
+                            <bk-icon
+                                :class="{
+                                    'right-shape': true,
+                                    'right-down': activeIndex === index
+                                }"
+                                svg
+                                type="angle-right"
+                                width="24"
+                                height="24"
+                            />
+                        </div>
+                        
                     </div>
                     <div
                         class="trigger-list-table"
@@ -67,7 +70,7 @@
                                         <div class="cell">
                                             <div v-for="i in detail.reasonDetailList" :key="i">
                                                 <StatusIcon :status="detail.status"></StatusIcon>
-                                                <span style="color: red;">{{ detail.reason }}</span>  |
+                                                <span style="color: red;">TRIGGER_NOT_MATCH</span>  |
                                                 <span>{{ i }}</span>
                                             </div>
                                         </div>
@@ -247,10 +250,29 @@
             &.active {
                 background-color: #E1ECFF;
             }
+            .title {
+                display: flex;
+                flex: 1;
+                overflow: hidden;
+                align-items: center;
+            }
+            .icon {
+                flex-shrink: 0;
+            }
+            .desc {
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
+        .header-right {
+            display: flex;
+            align-items: center;
+            flex-shrink: 0;
+            margin-left: 50px;
             .one-click-trigger {
-                position: absolute;
-                right: 60px;
                 font-size: 12px;
+                margin-right: 20px;
             }
         }
         .right-shape {
@@ -262,9 +284,11 @@
         .trigger-time {
             padding-left: 8px;
             color: #979BA5;
+            flex-shrink: 0;
         }
         .success-num {
             padding-left: 24px;
+            flex-shrink: 0;
             &.red {
                 color: red;
             }
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue
index c3f275fc70a..f43c9c59446 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue
@@ -78,7 +78,7 @@
                     :key="option.credentialId"
                     :id="option.credentialId"
                     :name="option.credentialId">
-                    <span>
+                    <span :title="option.credentialId">
                         {{option.credentialId}}
                     </span>
                     <i
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/P4.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/P4.vue
index fecffea3523..d2032ea3a96 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDialog/P4.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDialog/P4.vue
@@ -53,7 +53,7 @@
                     :key="option.credentialId"
                     :id="option.credentialId"
                     :name="option.credentialId">
-                    <span>
+                    <span :title="option.credentialId">
                         {{option.credentialId}}
                     </span>
                     <i
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
index 92d98815c84..be7aec06d5c 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
@@ -78,7 +78,7 @@
                     :key="option.credentialId"
                     :id="option.credentialId"
                     :name="option.credentialId">
-                    <span>
+                    <span :title="option.credentialId">
                         {{option.credentialId}}
                     </span>
                     <i
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/index.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/index.vue
index 9a77af9824d..7501063d08f 100755
--- a/src/frontend/devops-codelib/src/components/CodeLibDialog/index.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDialog/index.vue
@@ -349,9 +349,19 @@
             margin-right: 30px;
         }
     }
-    .cre-icon {
-        float: right;
-        margin-top: 10px;
+    .bk-option-content {
+        display: flex;
+        span {
+            display: inline-block;
+            width: 92%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+        .cre-icon {
+            position: absolute;
+            right: 15px;
+            margin-top: 10px;
+        }
     }
     .flex-content {
         display: flex;
diff --git a/src/frontend/devops-codelib/src/components/status-icon.vue b/src/frontend/devops-codelib/src/components/status-icon.vue
index ddce73ab192..797fa84c2af 100644
--- a/src/frontend/devops-codelib/src/components/status-icon.vue
+++ b/src/frontend/devops-codelib/src/components/status-icon.vue
@@ -17,7 +17,7 @@
                     success: 'green',
                     error: 'red',
                     normal: 'gray',
-                    succeed: 'gray',
+                    succeed: 'green',
                     failed: 'red'
                 })
             }
diff --git a/src/frontend/devops-codelib/src/config/index.js b/src/frontend/devops-codelib/src/config/index.js
index ed9c4231226..86460d47764 100755
--- a/src/frontend/devops-codelib/src/config/index.js
+++ b/src/frontend/devops-codelib/src/config/index.js
@@ -98,7 +98,7 @@ export const codelibConfig = {
     gitlab_http: {
         credentialTypes: 'ACCESSTOKEN',
         addType: 'ACCESSTOKEN',
-        label: 'Gitlab',
+        label: 'GitLab',
         typeName: 'codeGitLab'
     },
     tgit: {
diff --git a/src/frontend/devops-codelib/src/views/Index.vue b/src/frontend/devops-codelib/src/views/Index.vue
index 97439e37579..a3b40a4cffa 100755
--- a/src/frontend/devops-codelib/src/views/Index.vue
+++ b/src/frontend/devops-codelib/src/views/Index.vue
@@ -236,14 +236,15 @@
             },
 
             clearAliasName () {
-                if (this.aliasName === '') this.refreshCodelibList()
+                if (this.aliasName === '') {
+                    this.refreshCodelibList()
+                }
             },
 
             switchPage (page, pageSize) {
                 const { projectId } = this
                 this.refreshCodelibList(projectId, page, pageSize)
             },
-
             async refreshCodelibList (
                 projectId = this.projectId,
                 page = this.startPage,
diff --git a/src/frontend/locale/codelib/en-US.json b/src/frontend/locale/codelib/en-US.json
index 466a872dcad..7da2fc06628 100644
--- a/src/frontend/locale/codelib/en-US.json
+++ b/src/frontend/locale/codelib/en-US.json
@@ -125,7 +125,7 @@
     "关闭 PAC 模式失败": "关闭 PAC 模式失败",
     "检测到默认分支仍存在ci 文件目录，关闭 PAC 模式后该目录下的文件修改将": "检测到默认分支仍存在.ci 文件目录，关闭 PAC 模式后该目录下的文件修改将",
     "不再同步到蓝盾流水线": "不再同步到蓝盾流水线",
-    "请先将目录": "请先将目录",
+    "请先将目录": "请先将目录", 
     "改名或删除": "改名或删除",
     "后重试，避免项目其他成员进行无效的YAML 文件修改": "后重试，避免项目其他成员进行无效的YAML 文件修改",
     "。": ".",
@@ -155,5 +155,6 @@
     "事件": "事件",
     "流水线数量": "流水线数量",
     "操作": "Actions",
-    "访问令牌": "Access Token"
+    "访问令牌": "Access Token",
+    "请选择凭证": "请选择凭证"
 }
diff --git a/src/frontend/locale/codelib/zh-CN.json b/src/frontend/locale/codelib/zh-CN.json
index 31f8ba5dbc5..79023a2d8f9 100644
--- a/src/frontend/locale/codelib/zh-CN.json
+++ b/src/frontend/locale/codelib/zh-CN.json
@@ -159,5 +159,6 @@
   "事件": "事件",
   "流水线数量": "流水线数量",
   "操作": "操作",
-  "访问令牌": "访问令牌"
+  "访问令牌": "访问令牌",
+  "请选择凭证": "请选择凭证"
 }
\ No newline at end of file