From ab7accff42f3647aa50296f33b195b8b5f9c36d4 Mon Sep 17 00:00:00 2001
From: vhwweng <1010382269@qq.com>
Date: Thu, 14 Sep 2023 14:52:36 +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         | 328 ++++++++++++++----
 .../CodeLibDetail/basic-setting.vue           |   3 +
 .../src/components/CodeLibDetail/index.vue    |   7 +
 .../CodeLibDetail/trigger-event.vue           |  87 ++---
 .../src/components/CodeLibDialog/Gitlab.vue   |   2 +-
 .../src/components/CodeLibDialog/SVN.vue      |   2 +-
 .../src/components/empty-table-status.vue     |   5 +-
 .../devops-codelib/src/store/actions.js       |  10 +-
 src/frontend/locale/codelib/en-US.json        |  32 +-
 src/frontend/locale/codelib/zh-CN.json        |  31 +-
 10 files changed, 302 insertions(+), 205 deletions(-)

diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
index c5fa9199a96..3704ea687da 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
@@ -7,6 +7,7 @@
         :quick-close="false"
         render-directive="if"
         :show-footer="!isOAUTH"
+        @value-change="handleClose"
     >
         <h3
             slot="header"
@@ -17,7 +18,9 @@
         <bk-form
             :label-width="120"
         >
+            <!-- Github 重置授权 -->
             <bk-form-item
+                v-if="isGithub"
                 :label="$t('codelib.authType')"
                 :required="true"
                 property="authType"
@@ -31,13 +34,52 @@
                     >
                         OAUTH
                     </bk-radio>
+                </bk-radio-group>
+
+                <div class="codelib-oauth" v-if="isOAUTH">
+                    <bk-button
+                        theme="primary"
+                        :loading="isSaveLoading"
+                        @click="openValidate"
+                    >
+                        {{ $t('codelib.oauthCert') }}
+                    </bk-button>
+                    
+                    <div class="oauth-tips">
+                        <p>{{ $t('codelib.如需重置，请先点击按钮授权。') }}</p>
+                        <p>{{ $t('codelib.此授权用于平台和 Github 进行交互，用于如下场景：') }}</p>
+                        <p>1.{{ $t('codelib.回写 Commit statuses 到 Github') }}</p>
+                        <p>2.{{ $t('codelib.流水线中 Checkout 代码') }}</p>
+                        <p>{{ $t('codelib.需拥有代码库 Push 权限') }}</p>
+                    </div>
+                </div>
+            </bk-form-item>
+
+            <!-- Git、 TGit 重置授权 -->
+            <bk-form-item
+                v-if="isGit || isTGit"
+                :label="$t('codelib.authType')"
+                :required="true"
+                property="authType"
+            >
+                <bk-radio-group
+                    v-model="newRepoInfo.authType"
+                >
                     <bk-radio
+                        class="mr20"
+                        value="OAUTH"
+                    >
+                        OAUTH
+                    </bk-radio>
+                    <bk-radio
+                        v-if="!isTGit"
                         class="mr20"
                         value="SSH"
                     >
                         SSH
                     </bk-radio>
                     <bk-radio
+                        v-if="!isTGit"
                         value="HTTP"
                     >
                         {{ $t('codelib.用户名密码+个人token') }}
@@ -47,12 +89,12 @@
                 <div class="codelib-oauth" v-if="isOAUTH">
                     <bk-button
                         theme="primary"
+                        :loading="isSaveLoading"
                         @click="openValidate"
                     >
                         {{ $t('codelib.oauthCert') }}
                     </bk-button>
                     <div
-                        v-if="isGit || isTGit"
                         class="oauth-tips"
                     >
                         <p>{{ $t('codelib.如需重置，请先点击按钮授权。') }}</p>
@@ -62,56 +104,108 @@
                         <p>3.{{ $t('codelib.流水线中 Checkout 代码') }}</p>
                         <p>{{ $t('codelib.需拥有代码库 Devloper 及以上权限，建议使用公共账号授权') }}</p>
                     </div>
-                    <div
-                        v-else-if="isGithub"
-                        class="oauth-tips"
-                    >
-                        <p>{{ $t('codelib.如需重置，请先点击按钮授权。') }}</p>
-                        <p>{{ $t('codelib.此授权用于平台和 Github 进行交互，用于如下场景：') }}</p>
-                        <p>1.{{ $t('codelib.回写 Commit statuses 到 Github') }}</p>
-                        <p>2.{{ $t('codelib.流水线中 Checkout 代码') }}</p>
-                        <p>{{ $t('codelib.需拥有代码库 Push 权限') }}</p>
-                    </div>
                 </div>
             </bk-form-item>
+
+            <!-- Gitlab 重置授权 -->
             <bk-form-item
-                v-if="!isOAUTH"
-                :label="$t('codelib.codelibCredential')"
+                v-if="isGitLab"
+                :label="$t('codelib.authType')"
                 :required="true"
-                property="credentialId"
+                property="authType"
             >
-                <bk-select
-                    v-model="newRepoInfo.credentialId"
-                    :loading="isLoadingTickets"
-                    searchable
-                    :clearable="false"
-                    name="credentialId"
-                    class="codelib-credential-selector"
-                    :placeholder="$t('codelib.credentialPlaceholder')"
-                    @toggle="getTickets"
+                <bk-radio-group
+                    v-model="newRepoInfo.authType"
                 >
-                    <bk-option
-                        v-for="(option, index) in tickets"
-                        :key="option.credentialId"
-                        :id="option.credentialId"
-                        :name="option.credentialId">
-                        <span>
-                            {{option.credentialId}}
-                        </span>
-                        <i
-                            class="devops-icon icon-edit2 cre-icon"
-                            @click.stop="goToEditCre(index)"
-                        >
-                        </i>
-                    </bk-option>
-                </bk-select>
-                <span
-                    class="text-link"
-                    @click="addCredential"
+                    <bk-radio
+                        class="mr20"
+                        value="SSH"
+                    >
+                        SSH
+                    </bk-radio>
+                    <bk-radio
+                        value="HTTP"
+                    >
+                        {{ $t('codelib.访问令牌') }}
+                    </bk-radio>
+                </bk-radio-group>
+            </bk-form-item>
+            <!-- SVN 重置授权 -->
+            <bk-form-item
+                v-if="isSvn"
+                :label="$t('codelib.authType')"
+                :required="true"
+                property="svnType"
+            >
+                <bk-radio-group
+                    v-model="newRepoInfo.svnType"
                 >
-                    {{ $t('codelib.new') }}
-                </span>
+                    <bk-radio
+                        class="mr20"
+                        value="ssh"
+                    >
+                        SSH
+                    </bk-radio>
+                    <bk-radio
+                        value="http"
+                    >
+                        {{ $t('codelib.用户名密码') }}
+                    </bk-radio>
+                </bk-radio-group>
             </bk-form-item>
+            <template
+                v-if="!isOAUTH">
+                <bk-form-item
+                    :label="$t('codelib.address')"
+                    :required="true"
+                    property="url"
+                    error-display-type="normal"
+                >
+                    <bk-input
+                        v-model.trim="newRepoInfo.url"
+                        :disabled="!isSvn"
+                    >
+                    </bk-input>
+                </bk-form-item>
+                <bk-form-item
+                    v-if="!isOAUTH"
+                    :label="$t('codelib.codelibCredential')"
+                    :required="true"
+                    property="credentialId"
+                >
+                    <bk-select
+                        v-model="newRepoInfo.credentialId"
+                        :loading="isLoadingTickets"
+                        searchable
+                        :clearable="false"
+                        name="credentialId"
+                        class="codelib-credential-selector"
+                        :placeholder="$t('codelib.credentialPlaceholder')"
+                        @toggle="getTickets"
+                    >
+                        <bk-option
+                            v-for="(option, index) in tickets"
+                            :key="option.credentialId"
+                            :id="option.credentialId"
+                            :name="option.credentialId">
+                            <span>
+                                {{option.credentialId}}
+                            </span>
+                            <i
+                                class="devops-icon icon-edit2 cre-icon"
+                                @click.stop="goToEditCre(index)"
+                            >
+                            </i>
+                        </bk-option>
+                    </bk-select>
+                    <span
+                        class="text-link"
+                        @click="addCredential"
+                    >
+                        {{ $t('codelib.new') }}
+                    </span>
+                </bk-form-item>
+            </template>
         </bk-form>
         <footer slot="footer">
             <bk-button
@@ -132,6 +226,7 @@
 </template>
 
 <script>
+    import _ from 'lodash'
     import {
         mapState,
         mapActions
@@ -153,6 +248,9 @@
                 type: String,
                 default: ''
             },
+            isP4: Boolean,
+            isSvn: Boolean,
+            isGitLab: Boolean,
             isTGit: Boolean,
             isGit: Boolean,
             isGithub: Boolean,
@@ -163,7 +261,8 @@
                 isShow: false,
                 isSaveLoading: false,
                 isLoadingTickets: false,
-                newRepoInfo: {}
+                newRepoInfo: {},
+                cacheRepoInfo: {}
             }
         },
         computed: {
@@ -173,16 +272,13 @@
             isOAUTH () {
                 return this.newRepoInfo.authType === 'OAUTH'
             },
-            isSSH () {
-                return this.newRepoInfo.authType === 'SSH'
-            },
             projectId () {
                 return this.$route.params.projectId
             },
 
             codelibTypeName () {
-                return this.repoInfo && this.repoInfo['@type']
-                    ? this.repoInfo['@type']
+                return this.newRepoInfo && this.newRepoInfo['@type']
+                    ? this.newRepoInfo['@type']
                     : ''
             },
 
@@ -193,27 +289,109 @@
                 return (
                     getCodelibConfig(
                         this.codelibTypeName,
-                        this.curRepo.svnType,
-                        this.curRepo.authType
+                        this.newRepoInfo.svnType,
+                        this.newRepoInfo.authType
                     ) || {}
                 )
+            },
+            credentialList () {
+                return this.tickets || []
             }
         },
         watch: {
-            repoInfo (val) {
-                this.newRepoInfo = {
-                    ...this.newRepoInfo,
-                    ...val
+            isShow (val) {
+                if (val) {
+                    if (!this.isOAUTH) this.getTickets()
                 }
             },
-            curRepo (val) {
-                this.newRepoInfo = {
-                    ...this.newRepoInfo,
-                    ...val
-                }
+            repoInfo: {
+                handler (val) {
+                    this.newRepoInfo = {
+                        ...this.newRepoInfo,
+                        ...val
+                    }
+                    this.cacheRepoInfo = _.cloneDeep(this.newRepoInfo)
+                },
+                deep: true,
+                immediate: true
             },
-            credentialTypes () {
-                if (!this.isOAUTH) this.getTickets(true)
+            curRepo: {
+                handler (val) {
+                    this.newRepoInfo = {
+                        ...this.newRepoInfo,
+                        ...val
+                    }
+                    this.cacheRepoInfo = _.cloneDeep(this.newRepoInfo)
+                },
+                deep: true,
+                immediate: true
+            },
+            'newRepoInfo.authType': {
+                handler (val) {
+                    if (val === this.cacheRepoInfo.authType) {
+                        this.newRepoInfo.url = this.cacheRepoInfo.url
+                        this.newRepoInfo.credentialId = this.cacheRepoInfo.credentialId
+                        return
+                    }
+                    if (this.isGitLab) {
+                        if (val === 'HTTP' && this.cacheRepoInfo.authType === 'SSH') {
+                            const { url } = this.newRepoInfo
+                            this.newRepoInfo.url = `https://${url.split('@')[1].replace(':', '/')}`
+                            this.newRepoInfo.credentialId = ''
+                        }
+
+                        if (val === 'SSH' && this.cacheRepoInfo.authType === 'HTTP') {
+                            const { url } = this.newRepoInfo
+                            this.newRepoInfo.url = `git@${url.split('://')[1].replace('.com/', '.com:')}`
+                            this.newRepoInfo.credentialId = ''
+                        }
+                    }
+
+                    if (this.isGit) {
+                        if (['OAUTH', 'HTTP'].includes(val) && this.cacheRepoInfo.authType === 'SSH') {
+                            const { url } = this.newRepoInfo
+                            this.newRepoInfo.url = url.replace('com:', 'com/').replace('git@', 'https://')
+                            this.newRepoInfo.credentialId = ''
+                        }
+                        if (val === 'SSH' && this.cacheRepoInfo.authType === 'OAUTH') {
+                            const { url } = this.newRepoInfo
+                            this.newRepoInfo.url = url.replace('com/', 'com:').replace('https://', 'git@')
+                            this.newRepoInfo.credentialId = ''
+                        }
+
+                        if (val === 'HTTP' && this.cacheRepoInfo.authType === 'OAUTH') {
+                            this.newRepoInfo.url = this.cacheRepoInfo.url
+                            this.newRepoInfo.credentialId = ''
+                        }
+
+                        // 老数据存在http开头的仓库处理
+                        if (val === 'OAUTH' && this.cacheRepoInfo.authType === 'HTTP') {
+                            const { url } = this.newRepoInfo
+                            if (url.startsWith('http://')) {
+                                this.newRepoInfo.url = url.replace.replace('http://', 'https://')
+                            }
+                        }
+                    }
+                },
+                deep: true
+            },
+            'newRepoInfo.svnType': {
+                handler (val) {
+                    if (this.isSvn) {
+                        if (val === this.cacheRepoInfo.svnType) {
+                            this.newRepoInfo.url = this.cacheRepoInfo.url
+                            this.newRepoInfo.credentialId = this.cacheRepoInfo.credentialId
+                            return
+                        }
+                        const { url } = this.newRepoInfo
+                        const urlArr = url.split('://')
+                        this.newRepoInfo.url = val === 'ssh'
+                            ? `svn+ssh://${urlArr[1]}`
+                            : `https://${urlArr[1]}`
+                        this.newRepoInfo.credentialId = ''
+                    }
+                },
+                deep: true
             }
         },
         methods: {
@@ -277,16 +455,14 @@
                 }
             },
 
-            async getTickets (val) {
-                if (val) {
-                    const { projectId, credentialTypes } = this
-                    this.isLoadingTickets = true
-                    await this.requestTickets({
-                        projectId,
-                        credentialTypes
-                    })
-                    this.isLoadingTickets = false
-                }
+            async getTickets () {
+                const { projectId, credentialTypes } = this
+                this.isLoadingTickets = true
+                await this.requestTickets({
+                    projectId,
+                    credentialTypes
+                })
+                this.isLoadingTickets = false
             },
 
             goToEditCre (index) {
@@ -330,6 +506,14 @@
             handleConfirm () {
                 if (this.isOAUTH) return
                 this.handleUpdateRepo()
+            },
+            handleClose (val) {
+                if (!val) {
+                    this.newRepoInfo = {
+                        ...this.newRepoInfo,
+                        ...this.cacheRepoInfo
+                    }
+                }
             }
         }
     }
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/basic-setting.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/basic-setting.vue
index ebfd57229e7..440c6a91b95 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/basic-setting.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/basic-setting.vue
@@ -234,6 +234,9 @@
             :cur-repo="curRepo"
             :repo-info="repoInfo"
             :type="type"
+            :is-p4="isP4"
+            :is-svn="isSvn"
+            :is-git-lab="isGitLab"
             :is-t-git="isTGit"
             :is-git="isGit"
             :is-github="isGithub"
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue
index 21b02a41d5d..4c5d18aec28 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/index.vue
@@ -56,12 +56,19 @@
                     size="16"
                 />
                 <a
+                    v-if="repoInfo.url && repoInfo.url.startsWith('http')"
                     class="codelib-address"
                     v-bk-overflow-tips
                     @click="handleToRepo(repoInfo.url)"
                 >
                     {{ repoInfo.url }}
                 </a>
+                <p
+                    v-else
+                    class="codelib-address"
+                >
+                    {{ repoInfo.url }}
+                </p>
                 <span @click="handleCopy">
                     <Icon
                         name="copy2"
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue
index 909e69b7da8..edfb21f2e6b 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger-event.vue
@@ -49,6 +49,7 @@
             :type="isSearch ? 'search-empty' : 'empty'"
             @clear="resetFilter"
         />
+        {{ scmType}}
     </section>
 </template>
 <script>
@@ -83,7 +84,8 @@
                 catchRepoId: '',
                 isLoadingMore: false,
                 hasLoadEnd: false,
-                pageLoading: false
+                pageLoading: false,
+                isInitTime: true
             }
         },
         computed: {
@@ -96,67 +98,6 @@
             triggerType () {
                 return this.curRepo.type || ''
             },
-            // triggerTypeList () {
-            //     return [
-            //         { name: this.$t('codelib.手动触发'), id: 'MANUAL' },
-            //         { name: this.$t('codelib.定时触发'), id: 'TIME_TRIGGER' },
-            //         { name: this.$t('codelib.服务触发'), id: 'SERVICE' },
-            //         { name: this.$t('codelib.流水线触发'), id: 'PIPELINE' },
-            //         { name: this.$t('codelib.远程触发'), id: 'REMOTE' }
-            //     ]
-            // },
-            // eventTypeList () {
-            //     const listMap = {
-            //         GITHUB: [
-            //             { name: this.$t('codelib.创建Branch/Tag事件'), id: 'CREATE' },
-            //             { name: this.$t('codelib.PR事件'), id: 'PULL_REQUEST' }
-            //         ],
-            //         CODE_SVN: [
-            //             { name: this.$t('codelib.POST_COMMIT事件'), id: 'POST_COMMIT' },
-            //             { name: this.$t('codelib.LOCK_COMMIT事件'), id: 'LOCK_COMMIT' },
-            //             { name: this.$t('codelib.PRE_COMMIT事件'), id: 'PRE_COMMIT' }
-            //         ],
-            //         CODE_GIT: [
-            //             { name: this.$t('codelib.推送事件'), id: 'PUSH' },
-            //             { name: this.$t('codelib.标签推送事件'), id: 'TAG_PUSH' },
-            //             { name: this.$t('codelib.合并请求事件'), id: 'MERGE_REQUEST' },
-            //             { name: this.$t('codelib.议题事件'), id: 'ISSUES' },
-            //             { name: this.$t('codelib.评论事件'), id: 'NOTE' },
-            //             { name: this.$t('codelib.评审事件'), id: 'REVIEW' }
-            //         ],
-            //         CODE_GITLAB: [
-            //             { name: this.$t('codelib.推送事件'), id: 'PUSH' },
-            //             { name: this.$t('codelib.标签推送事件'), id: 'TAG_PUSH' },
-            //             { name: this.$t('codelib.合并请求事件'), id: 'MERGE_REQUEST' },
-            //             { name: this.$t('codelib.议题事件'), id: 'ISSUES' },
-            //             { name: this.$t('codelib.评论事件'), id: 'NOTE' },
-            //             { name: this.$t('codelib.评审事件'), id: 'REVIEW' }
-            //         ],
-            //         CODE_TGIT: [
-            //             { name: this.$t('codelib.推送事件'), id: 'PUSH' },
-            //             { name: this.$t('codelib.标签推送事件'), id: 'TAG_PUSH' },
-            //             { name: this.$t('codelib.合并请求事件'), id: 'MERGE_REQUEST' },
-            //             { name: this.$t('codelib.议题事件'), id: 'ISSUES' },
-            //             { name: this.$t('codelib.评论事件'), id: 'NOTE' },
-            //             { name: this.$t('codelib.评审事件'), id: 'REVIEW' }
-            //         ],
-            //         CODE_P4: [
-            //             { name: this.$t('codelib.CHANGE_COMMIT事件'), id: 'CHANGE_COMMIT' },
-            //             { name: this.$t('codelib.PUSH_SUBMIT事件'), id: '.PUSH_SUBMIT' },
-            //             { name: this.$t('codelib.CHANGE_CONTENT事件'), id: 'CHANGE_CONTENT' },
-            //             { name: this.$t('codelib.CHANGE_SUBMIT事件'), id: 'CHANGE_SUBMIT' },
-            //             { name: this.$t('codelib.PUSH_CONTENT事件'), id: 'PUSH_CONTENT' },
-            //             { name: this.$t('codelib.PUSH_COMMIT事件'), id: 'PUSH_COMMIT' },
-            //             { name: this.$t('codelib.FIX_ADD事件'), id: 'FIX_ADD' },
-            //             { name: this.$t('codelib.FIX_DELETE事件'), id: 'FIX_DELETE' },
-            //             { name: this.$t('codelib.FORM_COMMIT事件'), id: 'FORM_COMMIT' },
-            //             { name: this.$t('codelib.SHELVE_COMMIT事件'), id: 'SHELVE_COMMIT' },
-            //             { name: this.$t('codelib.SHELVE_DELETE事件'), id: 'SHELVE_DELETE' },
-            //             { name: this.$t('codelib.SHELVE_SUBMIT事件'), id: 'SHELVE_SUBMIT' }
-            //         ]
-            //     }
-            //     return listMap[this.triggerType] || []
-            // },
             searchList () {
                 const list = [
                     {
@@ -183,6 +124,9 @@
                 })
             },
             isSearch () {
+                if (this.isInitTime) {
+                    return false
+                }
                 return this.daterange[0] || this.searchValue.length
             }
         },
@@ -191,16 +135,19 @@
                 await this.resetFilter()
                 this.catchRepoId = id
             },
-            daterange () {
+            daterange (newVal, oldVal) {
+                if (oldVal[0]) this.isInitTime = false
                 this.page = 1
                 this.hasLoadEnd = false
                 this.eventList = []
                 this.timelineMap = {}
+                console.log(this.catchRepoId === this.repoId, 'this.catchRepoId === this.repoId')
                 if (this.catchRepoId === this.repoId) {
                     this.getListData()
                 }
             },
-            searchValue () {
+            searchValue (newVal, oldVal) {
+                this.isInitTime = false
                 this.page = 1
                 this.hasLoadEnd = false
                 this.eventList = []
@@ -215,6 +162,10 @@
             this.getEventTypeList()
             this.getTriggerTypeList()
             this.getListData()
+            const endTime = new Date()
+            const startTime = new Date()
+            startTime.setTime(startTime.getTime() - 3600 * 1000 * 24 * 7)
+            this.daterange = [startTime, endTime]
         },
         methods: {
             ...mapActions('codelib', [
@@ -223,7 +174,9 @@
                 'fetchTriggerType'
             ]),
             getEventTypeList () {
-                this.fetchEventType().then(res => {
+                this.fetchEventType({
+                    scmType: this.triggerType
+                }).then(res => {
                     this.eventTypeList = res.map(i => {
                         return {
                             ...i,
@@ -267,8 +220,8 @@
                     pageSize: this.pageSize,
                     ...params,
                     triggerType: params.triggerType || this.triggerType,
-                    startTimeEndTime: daterange[0],
-                    endTimeStartTime: daterange[1]
+                    startTime: daterange[0],
+                    endTime: daterange[1]
                 }).then(res => {
                     this.eventList = [...this.eventList, ...res.records]
                     this.timelineMap = {}
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue
index 1990492e59e..b63e8a2c5ab 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDialog/Gitlab.vue
@@ -23,7 +23,7 @@
                 <bk-radio
                     value="HTTP"
                 >
-                    {{ $t('codelib.用户名密码+个人token') }}
+                    {{ $t('codelib.访问令牌') }}
                 </bk-radio>
             </bk-radio-group>
 
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
index 39656fb3cf1..56663a102b8 100644
--- a/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
+++ b/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
@@ -22,7 +22,7 @@
                 <bk-radio
                     value="http"
                 >
-                    {{ $t('codelib.用户名密码+个人token') }}
+                    {{ $t('codelib.用户名密码') }}
                 </bk-radio>
             </bk-radio-group>
         </bk-form-item>
diff --git a/src/frontend/devops-codelib/src/components/empty-table-status.vue b/src/frontend/devops-codelib/src/components/empty-table-status.vue
index e439083959f..f1bbe0b0bdc 100644
--- a/src/frontend/devops-codelib/src/components/empty-table-status.vue
+++ b/src/frontend/devops-codelib/src/components/empty-table-status.vue
@@ -35,7 +35,10 @@
     }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+    ::v-deep .bk-exception-img.part-img {
+        margin-top: 200px;
+    }
     .empty-tips {
         margin-top: 8px;
         font-size: 12px;
diff --git a/src/frontend/devops-codelib/src/store/actions.js b/src/frontend/devops-codelib/src/store/actions.js
index ca2f05e24b7..9a57a8afa07 100755
--- a/src/frontend/devops-codelib/src/store/actions.js
+++ b/src/frontend/devops-codelib/src/store/actions.js
@@ -441,10 +441,10 @@ const actions = {
         eventType = '',
         triggerUser = '',
         pipelineName = '',
-        startTimeEndTime = '',
-        endTimeStartTime = ''
+        startTime = '',
+        endTime = ''
     }) {
-        return vue.$ajax.get(`${PROCESS_API_URL_PREFIX}/user/trigger/event/${projectId}/${repositoryHashId}/listRepoTriggerEvent?page=${page}&pageSize=${pageSize}&triggerType=${triggerType}&eventType=${eventType}&triggerUser=${triggerUser}&pipelineName=${pipelineName}&startTimeEndTime=${startTimeEndTime}&endTimeStartTime=${endTimeStartTime}`)
+        return vue.$ajax.get(`${PROCESS_API_URL_PREFIX}/user/trigger/event/${projectId}/${repositoryHashId}/listRepoTriggerEvent?page=${page}&pageSize=${pageSize}&triggerType=${triggerType}&eventType=${eventType}&triggerUser=${triggerUser}&pipelineName=${pipelineName}&startTime=${startTime}&endTime=${endTime}`)
     },
 
     /**
@@ -481,8 +481,8 @@ const actions = {
      * 获取事件类型
      */
 
-    fetchEventType ({ commit }) {
-        return vue.$ajax.get(`${PROCESS_API_URL_PREFIX}/user/trigger/event/listEventType`)
+    fetchEventType ({ commit }, { scmType }) {
+        return vue.$ajax.get(`${PROCESS_API_URL_PREFIX}/user/trigger/event/listEventType?scmType=${scmType}`)
     },
 
     /**
diff --git a/src/frontend/locale/codelib/en-US.json b/src/frontend/locale/codelib/en-US.json
index c94ee2421b4..466a872dcad 100644
--- a/src/frontend/locale/codelib/en-US.json
+++ b/src/frontend/locale/codelib/en-US.json
@@ -5,6 +5,7 @@
     "linkCodelibLabel": "Link {0} Repositories",
     "typeCodelib": "{0} Repositories",
     "link": "link",
+    "linkRepo": "Link {0} Repositories",
     "codelibDesc": "Code Repositories service can link your existed SVN and GIT repositories to CI，which will be a pipeline's materials",
     "laodingTitle": "Loading repositories list",
     "aliasNamePlaceholder": "Input alias name and press Enter for search",
@@ -147,39 +148,12 @@
     "触发器类型/事件类型/触发人/流水线名称": "触发器类型/事件类型/触发人/流水线名称",
     "加载更多": "Load More",
     "到底啦": "End",
-    "手动触发": "手动触发",
-    "定时触发": "定时触发",
-    "服务触发": "服务触发",
-    "流水线触发": "流水线触发",
-    "远程触发": "远程触发",
-    "创建Branch/Tag事件": "创建Branch/Tag事件",
-    "PR事件": "PR事件",
-    "POST_COMMIT事件": "POST_COMMIT事件",
-    "LOCK_COMMIT事件": "LOCK_COMMIT事件",
-    "PRE_COMMIT事件": "PRE_COMMIT事件",
-    "推送事件": "推送事件",
-    "标签推送事件": "标签推送事件",
-    "合并请求事件": "合并请求事件",
-    "议题事件": "议题事件",
-    "评论事件": "评论事件",
-    "评审事件": "评审事件",
-    "CHANGE_COMMIT事件": "CHANGE_COMMIT事件",
-    "PUSH_SUBMIT事件": "PUSH_SUBMIT事件",
-    "CHANGE_CONTENT事件": "CHANGE_CONTENT事件",
-    "CHANGE_SUBMIT事件": "CHANGE_SUBMIT事件",
-    "PUSH_CONTENT事件": "PUSH_CONTENT事件",
-    "PUSH_COMMIT事件": "PUSH_COMMIT事件",
-    "FIX_ADD事件": "FIX_ADD事件",
-    "FIX_DELETE事件": "FIX_DELETE事件",
-    "FORM_COMMIT事件": "FORM_COMMIT事件",
-    "SHELVE_COMMIT事件": "SHELVE_COMMIT事件",
-    "SHELVE_DELETE事件": "SHELVE_DELETE事件",
-    "SHELVE_SUBMIT事件": "SHELVE_SUBMIT事件",
     "一键重新触发": "一键重新触发",
     "重新触发": "重新触发",
     "触发成功": "触发成功",
     "触发器类型/事件类型": "触发器类型/事件类型",
     "事件": "事件",
     "流水线数量": "流水线数量",
-    "操作": "操作"
+    "操作": "Actions",
+    "访问令牌": "Access Token"
 }
diff --git a/src/frontend/locale/codelib/zh-CN.json b/src/frontend/locale/codelib/zh-CN.json
index e5fc2ff9aa2..31f8ba5dbc5 100644
--- a/src/frontend/locale/codelib/zh-CN.json
+++ b/src/frontend/locale/codelib/zh-CN.json
@@ -152,39 +152,12 @@
   "触发器类型/事件类型/触发人/流水线名称": "触发器类型/事件类型/触发人/流水线名称",
   "加载更多": "加载更多",
   "到底啦": "到底啦",
-  "手动触发": "手动触发",
-  "定时触发": "定时触发",
-  "服务触发": "服务触发",
-  "流水线触发": "流水线触发",
-  "远程触发": "远程触发",
-  "创建Branch/Tag事件": "创建Branch/Tag事件",
-  "PR事件": "PR事件",
-  "POST_COMMIT事件": "POST_COMMIT事件",
-  "LOCK_COMMIT事件": "LOCK_COMMIT事件",
-  "PRE_COMMIT事件": "PRE_COMMIT事件",
-  "推送事件": "推送事件",
-  "标签推送事件": "标签推送事件",
-  "合并请求事件": "合并请求事件",
-  "议题事件": "议题事件",
-  "评论事件": "评论事件",
-  "评审事件": "评审事件",
-  "CHANGE_COMMIT事件": "CHANGE_COMMIT事件",
-  "PUSH_SUBMIT事件": "PUSH_SUBMIT事件",
-  "CHANGE_CONTENT事件": "CHANGE_CONTENT事件",
-  "CHANGE_SUBMIT事件": "CHANGE_SUBMIT事件",
-  "PUSH_CONTENT事件": "PUSH_CONTENT事件",
-  "PUSH_COMMIT事件": "PUSH_COMMIT事件",
-  "FIX_ADD事件": "FIX_ADD事件",
-  "FIX_DELETE事件": "FIX_DELETE事件",
-  "FORM_COMMIT事件": "FORM_COMMIT事件",
-  "SHELVE_COMMIT事件": "SHELVE_COMMIT事件",
-  "SHELVE_DELETE事件": "SHELVE_DELETE事件",
-  "SHELVE_SUBMIT事件": "SHELVE_SUBMIT事件",
   "一键重新触发": "一键重新触发",
   "重新触发": "重新触发",
   "触发成功": "触发成功",
   "触发器类型/事件类型": "触发器类型/事件类型",
   "事件": "事件",
   "流水线数量": "流水线数量",
-  "操作": "操作"
+  "操作": "操作",
+  "访问令牌": "访问令牌"
 }
\ No newline at end of file