From bc1313a6ff3780d79d683012179ba41daa897df4 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Mon, 21 Oct 2024 16:04:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=89=88=E6=9C=AC=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=20#2670?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/devops-repository/src/App.vue | 4 +- .../src/components/Header/index.vue | 9 ++-- .../src/components/VersionLog/index.vue | 6 ++- .../src/utils/versionLogs.js | 43 ++++++++++--------- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/frontend/devops-repository/src/App.vue b/src/frontend/devops-repository/src/App.vue index ac587ba06d..8249216a87 100644 --- a/src/frontend/devops-repository/src/App.vue +++ b/src/frontend/devops-repository/src/App.vue @@ -17,7 +17,7 @@ import Login from '@repository/components/Login' import cookies from 'js-cookie' import { mapActions } from 'vuex' - import { getTrueVersion } from '@repository/utils/versionLogs' + import { getTrueVersions } from '@repository/utils/versionLogs' export default { components: { NoticeComponent, Header, Login }, mixins: [mixin], @@ -36,7 +36,7 @@ username && this.SET_USER_INFO({ username }) this.getPermissionDialogConfig() const hasShowLog = cookies.get('hasShowLog') || '' - const logs = await getTrueVersion() + const logs = await getTrueVersions() if (logs.length > 0 && !this.ciMode && !this.isSubSaas) { this.$store.commit('SET_VERSION_LOGS', logs) if (hasShowLog !== logs[0].version) { diff --git a/src/frontend/devops-repository/src/components/Header/index.vue b/src/frontend/devops-repository/src/components/Header/index.vue index e5c1844c57..10a8e2a73e 100644 --- a/src/frontend/devops-repository/src/components/Header/index.vue +++ b/src/frontend/devops-repository/src/components/Header/index.vue @@ -106,6 +106,7 @@ import { mapState, mapActions } from 'vuex' import cookies from 'js-cookie' import VersionLog from '@repository/components/VersionLog' + import { getVersionContext } from '@repository/utils/versionLogs' export default { name: 'BkrepoHeader', components: { VersionLog, User, projectInfoDialog }, @@ -223,7 +224,7 @@ name: 'projectManage' }) }, - clickHelps (id) { + async clickHelps (id) { const languagePath = this.language === 'zh-cn' ? 'ZH' : 'EN' const url = DOC_URL + '/markdown/' + languagePath + '/Devops/3.0/UserGuide/intro/README.md' switch (id) { @@ -234,7 +235,7 @@ if (this.versionLogs.length > 0) { this.$refs.versionLogDialog.show = true this.$refs.versionLogDialog.versionLogs = this.versionLogs - this.$refs.versionLogDialog.markdown = this.versionLogs[0].content + this.$refs.versionLogDialog.markdown = await getVersionContext(this.versionLogs[0].version) } break case 'feedback': @@ -244,11 +245,11 @@ window.open('https://github.com/TencentBlueKing/bk-repo', '_blank') } }, - showVersionLogs () { + async showVersionLogs () { if (this.versionLogs.length > 0) { this.$refs.versionLogDialog.show = true this.$refs.versionLogDialog.versionLogs = this.versionLogs - this.$refs.versionLogDialog.markdown = this.versionLogs[0].content + this.$refs.versionLogDialog.markdown = await getVersionContext(this.versionLogs[0].version) } } } diff --git a/src/frontend/devops-repository/src/components/VersionLog/index.vue b/src/frontend/devops-repository/src/components/VersionLog/index.vue index db9cbf6588..cfa85717dd 100644 --- a/src/frontend/devops-repository/src/components/VersionLog/index.vue +++ b/src/frontend/devops-repository/src/components/VersionLog/index.vue @@ -33,6 +33,7 @@