diff --git a/src/frontend/devops-repository/package.json b/src/frontend/devops-repository/package.json index 833f10dd55..fd283d58bb 100644 --- a/src/frontend/devops-repository/package.json +++ b/src/frontend/devops-repository/package.json @@ -14,13 +14,13 @@ "dependencies": { "@blueking/notice-component-vue2": "^2.0.5", "@blueking/sub-saas": "0.0.0-beta.9", - "axios": "^1.7.7", "@vue-office/docx": "^1.6.2", "@vue-office/excel": "^1.7.11", "@vue-office/pdf": "^2.0.2", "@vue/composition-api": "^1.7.2", + "axios": "^1.7.7", "js-cookie": "^2.2.1", - "marked": "^4.0.8", + "marked": "^4.3.0", "qrcode": "^1.5.0", "vue-demi": "^0.14.6", "vue-i18n": "^8.18.1", diff --git a/src/frontend/devops-repository/src/App.vue b/src/frontend/devops-repository/src/App.vue index 2b1cb0f6d5..ac587ba06d 100644 --- a/src/frontend/devops-repository/src/App.vue +++ b/src/frontend/devops-repository/src/App.vue @@ -1,7 +1,7 @@ + + +
+ +
+
+ + diff --git a/src/frontend/devops-repository/src/images/help-document.svg b/src/frontend/devops-repository/src/images/help-document.svg new file mode 100644 index 0000000000..db970f841c --- /dev/null +++ b/src/frontend/devops-repository/src/images/help-document.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/frontend/devops-repository/src/store/index.js b/src/frontend/devops-repository/src/store/index.js index 44764804b3..785109da15 100644 --- a/src/frontend/devops-repository/src/store/index.js +++ b/src/frontend/devops-repository/src/store/index.js @@ -50,7 +50,8 @@ const storeObject = { dependAccessTokenValue: '', // 依赖源仓库的使用指引中用户输入的访问令牌的值 dependInputValue1: '', // 依赖源仓库的使用指引中用户的第一个输入框的值 dependInputValue2: '', // 依赖源仓库的使用指引中用户的第二个输入框的值 - dependInputValue3: '' // 依赖源仓库的使用指引中用户的第三个输入框的值 + dependInputValue3: '', // 依赖源仓库的使用指引中用户的第三个输入框的值 + versionLogs: [] }, getters: { masterNode (state) { @@ -143,6 +144,9 @@ const storeObject = { }, SET_REPO_PERMISSION_LIMIT (state, data) { state.permissionConfig = data + }, + SET_VERSION_LOGS (state, data) { + state.versionLogs = data } }, actions diff --git a/src/frontend/devops-repository/src/utils/versionLogs.js b/src/frontend/devops-repository/src/utils/versionLogs.js new file mode 100644 index 0000000000..79be987ddd --- /dev/null +++ b/src/frontend/devops-repository/src/utils/versionLogs.js @@ -0,0 +1,85 @@ +import cookies from 'js-cookie' + +// js不支持读取文件夹文件,故需先汇总所有版本 +// 标准格式为V版本号_日期.md +const VersionLogs = [ + 'V1.3.16-beta.2.md', + 'V1.3.16-beta.3.md', + 'V1.3.16-beta.4.md', + 'V1.3.16-beta.8.md', + 'V1.3.19-beta.1.md', + 'V1.3.20-beta.5.md', + 'V1.3.20-beta.6.md', + 'V1.3.20-beta.7.md', + 'V1.3.20-beta.10.md', + 'V1.3.21-beta.1.md', + 'V1.3.26-beta.6.md', + 'V1.3.27-alpha.2.md', + 'V1.3.29-beta.1.md', + 'V1.4.1-beta.2.md', + 'V1.4.1-beta.3.md', + 'V1.4.1-beta.4.md', + 'V1.5.1-beta.3.md' +] + +// 返回实际所有版本,同时进行排序 +export async function getTrueVersion () { + const language = cookies.get('blueking_language') || 'zh-cn' + const languagePath = language === 'zh-cn' ? 'cn/' : 'en/' + const realLogs = [] + for (const version of VersionLogs) { + const markdownFilePath = '/ui/versionLogs/' + languagePath + version + const response = await fetch(markdownFilePath) + if (response.ok) { + const data = version.replace('.md', '').split('_', 2) + let time = '' + if (data.length < 2) { + time = '' + } else { + time = data[1] + } + const markdown = await response.text() + const logProperty = { + version: data[0], + time: time, + content: markdown + } + realLogs.push(logProperty) + } + } + return sortLogs(realLogs) +} + +function sortLogs (realLogs) { + return realLogs.sort((version1, version2) => { + const versionArray1 = version1.version.replace('V', '').replace('-', '.').split('.') + const versionArray2 = version2.version.replace('V', '').replace('-', '.').split('.') + const versionLength1 = versionArray1.length + const versionLength2 = versionArray2.length + + // 比较每个版本号的部分 + for (let index = 0; index < Math.min(versionLength1, versionLength2); index++) { + const part1 = isNaN(versionArray1[index]) ? versionArray1[index] : parseInt(versionArray1[index]) + const part2 = isNaN(versionArray2[index]) ? versionArray2[index] : parseInt(versionArray2[index]) + // 如果部分是数字,进行数字比较;否则进行字符串比较 + let comparisonResult + if (typeof part1 === 'number' && typeof part2 === 'number') { + comparisonResult = part2 - part1 // 数字比较 + } else if (typeof part1 === 'string' && typeof part2 === 'string') { + comparisonResult = part2.localeCompare(part1) // 字符串比较 + } else if (typeof part1 === 'number') { + comparisonResult = -1 + } else if (typeof part2 === 'number') { + comparisonResult = 1 + } else { + comparisonResult = part2.localeCompare(part1) + } + + if (comparisonResult !== 0) { + return comparisonResult + } + } + // 如果前面的部分相同,比较长度 + return versionLength2 - versionLength1 + }) +} diff --git a/src/frontend/devops-repository/webpack.config.js b/src/frontend/devops-repository/webpack.config.js index ec263c31da..e369807803 100644 --- a/src/frontend/devops-repository/webpack.config.js +++ b/src/frontend/devops-repository/webpack.config.js @@ -27,7 +27,10 @@ module.exports = (env, argv) => { title: '制品库 | 腾讯蓝鲸智云' }), new CopyWebpackPlugin({ - patterns: [{ from: path.join(__dirname, './static'), to: dist }] + patterns: [ + { from: path.join(__dirname, './static'), to: dist }, + { from: path.join(__dirname, '../../../versionLogs'), to: `${dist}/versionLogs` } + ] }) ] diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json index 3961f9b484..2f7c94d00a 100644 --- a/src/frontend/locale/repository/en-US.json +++ b/src/frontend/locale/repository/en-US.json @@ -893,5 +893,12 @@ "changeSelectAllTip": "Select full data", "selectAllTip": "{0} pieces of total data have been selected,", "clearSelectTip":"Clear selection", - "previewErrorTip": "File Preview Fail" + "previewErrorTip": "File Preview Fail", + "helps": { + "documentation": "Documentation", + "releaseNote": "Release Note", + "feedback": "Feedback", + "openSource": "Open Source" + }, + "currentVersion": "Current" } diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json index 2770b9b588..b73cef6c98 100644 --- a/src/frontend/locale/repository/zh-CN.json +++ b/src/frontend/locale/repository/zh-CN.json @@ -894,5 +894,12 @@ "changeSelectAllTip": "选择全量数据", "selectAllTip": "已选择全量数据{0}条,", "clearSelectTip":"清除选择", - "previewErrorTip": "文件预览失败" + "previewErrorTip": "文件预览失败", + "helps": { + "documentation": "产品文档", + "releaseNote": "版本日志", + "feedback": "问题反馈", + "openSource": "开源社区" + }, + "currentVersion": "当前版本" } diff --git a/versionLogs/cn/V1.3.16-beta.2.md b/versionLogs/cn/V1.3.16-beta.2.md new file mode 100644 index 0000000000..a5a423f48b --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.2.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.2版本更新日志 + + + +### 新增 + +- [ 新增 ] commit-edge模式下支持边缘节点分发 + diff --git a/versionLogs/cn/V1.3.16-beta.3.md b/versionLogs/cn/V1.3.16-beta.3.md new file mode 100644 index 0000000000..f32be6b4b7 --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.3.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 国际化优化 diff --git a/versionLogs/cn/V1.3.16-beta.4.md b/versionLogs/cn/V1.3.16-beta.4.md new file mode 100644 index 0000000000..d5d6ec2566 --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.4.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.4版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复初始化镜像bug + diff --git a/versionLogs/cn/V1.3.16-beta.8.md b/versionLogs/cn/V1.3.16-beta.8.md new file mode 100644 index 0000000000..656b6ed43a --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.8.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.8版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持从apigw调用用户登录态 diff --git a/versionLogs/cn/V1.3.19-beta.1.md b/versionLogs/cn/V1.3.19-beta.1.md new file mode 100644 index 0000000000..2bd757aaf8 --- /dev/null +++ b/versionLogs/cn/V1.3.19-beta.1.md @@ -0,0 +1,8 @@ +# V1.3.19-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持普通用户配置 + diff --git a/versionLogs/cn/V1.3.20-beta.10.md b/versionLogs/cn/V1.3.20-beta.10.md new file mode 100644 index 0000000000..e17f4d7747 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.10.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.10版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 +- [ 优化 ] 修改默认部署模式为sass diff --git a/versionLogs/cn/V1.3.20-beta.5.md b/versionLogs/cn/V1.3.20-beta.5.md new file mode 100644 index 0000000000..771a45b504 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.5.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.5版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持制品一致性存储 + diff --git a/versionLogs/cn/V1.3.20-beta.6.md b/versionLogs/cn/V1.3.20-beta.6.md new file mode 100644 index 0000000000..78c5dda385 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.6.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.6版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复oci拉取镜像bug + diff --git a/versionLogs/cn/V1.3.20-beta.7.md b/versionLogs/cn/V1.3.20-beta.7.md new file mode 100644 index 0000000000..a68e5d8055 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.7.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.7版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持国密存储 + diff --git a/versionLogs/cn/V1.3.21-beta.1.md b/versionLogs/cn/V1.3.21-beta.1.md new file mode 100644 index 0000000000..fa52bad266 --- /dev/null +++ b/versionLogs/cn/V1.3.21-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.21-beta.1版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 \ No newline at end of file diff --git a/versionLogs/cn/V1.3.26-beta.6.md b/versionLogs/cn/V1.3.26-beta.6.md new file mode 100644 index 0000000000..9ede1de4aa --- /dev/null +++ b/versionLogs/cn/V1.3.26-beta.6.md @@ -0,0 +1,14 @@ +# V1.3.26-beta.6版本更新日志 + +### 新增 + +- [ 新增 ] 增加s3服务 +- [ 新增 ] 增加仓库定时清理逻辑 + +### 优化 + +- [ 优化 ] 兼容rbac权限模型 + +### 修复 + +- [ 修复 ] 修复auth对匿名用户校验 \ No newline at end of file diff --git a/versionLogs/cn/V1.3.27-alpha.2.md b/versionLogs/cn/V1.3.27-alpha.2.md new file mode 100644 index 0000000000..852f43a56c --- /dev/null +++ b/versionLogs/cn/V1.3.27-alpha.2.md @@ -0,0 +1,7 @@ +# V1.3.27-alpha.2版本更新日志 + + + +### 新增 + +- [ 新增 ] 增加proxy模式 diff --git a/versionLogs/cn/V1.3.29-beta.1.md b/versionLogs/cn/V1.3.29-beta.1.md new file mode 100644 index 0000000000..2fa9efe0c0 --- /dev/null +++ b/versionLogs/cn/V1.3.29-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.29-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] proxy支持清理本地的文件 diff --git a/versionLogs/cn/V1.4.1-beta.2.md b/versionLogs/cn/V1.4.1-beta.2.md new file mode 100644 index 0000000000..bcef0b26cc --- /dev/null +++ b/versionLogs/cn/V1.4.1-beta.2.md @@ -0,0 +1,11 @@ +# V1.4.1-beta.2版本更新日志 + + + +### 优化 + +- [ 优化 ] 支持跨cos存储复制文件 + +### 修复 + +- [ 修复 ] 修复auth权限校验bug \ No newline at end of file diff --git a/versionLogs/cn/V1.4.1-beta.3.md b/versionLogs/cn/V1.4.1-beta.3.md new file mode 100644 index 0000000000..e25e7a57b1 --- /dev/null +++ b/versionLogs/cn/V1.4.1-beta.3.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 页面产品支持iframe加载模式 diff --git a/versionLogs/cn/V1.4.1-beta.4.md b/versionLogs/cn/V1.4.1-beta.4.md new file mode 100644 index 0000000000..089968c47c --- /dev/null +++ b/versionLogs/cn/V1.4.1-beta.4.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.4版本更新日志 + + + +### 优化 + +- [ 优化 ] artifact-cleanup允许默认执行 diff --git a/versionLogs/cn/V1.5.1-beta.3.md b/versionLogs/cn/V1.5.1-beta.3.md new file mode 100644 index 0000000000..616454da7f --- /dev/null +++ b/versionLogs/cn/V1.5.1-beta.3.md @@ -0,0 +1,15 @@ +# V1.5.1-beta.3版本更新日志 + +### 新增 + +- [ 新增 ] role资源增加pod +- [ 新增 ] 新增加maven服务 +- [ 新增 ] 支持接入蓝鲸消息通知中心 + +### 优化 + +- [ 优化 ] 取消fs-server服务的部署 + +### 修复 + +- [ 修复 ] 修复前端bug diff --git a/versionLogs/en/V1.3.16-beta.2.md b/versionLogs/en/V1.3.16-beta.2.md new file mode 100644 index 0000000000..a5a423f48b --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.2.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.2版本更新日志 + + + +### 新增 + +- [ 新增 ] commit-edge模式下支持边缘节点分发 + diff --git a/versionLogs/en/V1.3.16-beta.3.md b/versionLogs/en/V1.3.16-beta.3.md new file mode 100644 index 0000000000..f32be6b4b7 --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.3.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 国际化优化 diff --git a/versionLogs/en/V1.3.16-beta.4.md b/versionLogs/en/V1.3.16-beta.4.md new file mode 100644 index 0000000000..d5d6ec2566 --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.4.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.4版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复初始化镜像bug + diff --git a/versionLogs/en/V1.3.16-beta.8.md b/versionLogs/en/V1.3.16-beta.8.md new file mode 100644 index 0000000000..656b6ed43a --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.8.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.8版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持从apigw调用用户登录态 diff --git a/versionLogs/en/V1.3.19-beta.1.md b/versionLogs/en/V1.3.19-beta.1.md new file mode 100644 index 0000000000..2bd757aaf8 --- /dev/null +++ b/versionLogs/en/V1.3.19-beta.1.md @@ -0,0 +1,8 @@ +# V1.3.19-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持普通用户配置 + diff --git a/versionLogs/en/V1.3.20-beta.10.md b/versionLogs/en/V1.3.20-beta.10.md new file mode 100644 index 0000000000..e17f4d7747 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.10.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.10版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 +- [ 优化 ] 修改默认部署模式为sass diff --git a/versionLogs/en/V1.3.20-beta.5.md b/versionLogs/en/V1.3.20-beta.5.md new file mode 100644 index 0000000000..771a45b504 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.5.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.5版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持制品一致性存储 + diff --git a/versionLogs/en/V1.3.20-beta.6.md b/versionLogs/en/V1.3.20-beta.6.md new file mode 100644 index 0000000000..78c5dda385 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.6.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.6版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复oci拉取镜像bug + diff --git a/versionLogs/en/V1.3.20-beta.7.md b/versionLogs/en/V1.3.20-beta.7.md new file mode 100644 index 0000000000..a68e5d8055 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.7.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.7版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持国密存储 + diff --git a/versionLogs/en/V1.3.21-beta.1.md b/versionLogs/en/V1.3.21-beta.1.md new file mode 100644 index 0000000000..fa52bad266 --- /dev/null +++ b/versionLogs/en/V1.3.21-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.21-beta.1版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 \ No newline at end of file diff --git a/versionLogs/en/V1.3.26-beta.6.md b/versionLogs/en/V1.3.26-beta.6.md new file mode 100644 index 0000000000..9ede1de4aa --- /dev/null +++ b/versionLogs/en/V1.3.26-beta.6.md @@ -0,0 +1,14 @@ +# V1.3.26-beta.6版本更新日志 + +### 新增 + +- [ 新增 ] 增加s3服务 +- [ 新增 ] 增加仓库定时清理逻辑 + +### 优化 + +- [ 优化 ] 兼容rbac权限模型 + +### 修复 + +- [ 修复 ] 修复auth对匿名用户校验 \ No newline at end of file diff --git a/versionLogs/en/V1.3.27-alpha.2.md b/versionLogs/en/V1.3.27-alpha.2.md new file mode 100644 index 0000000000..852f43a56c --- /dev/null +++ b/versionLogs/en/V1.3.27-alpha.2.md @@ -0,0 +1,7 @@ +# V1.3.27-alpha.2版本更新日志 + + + +### 新增 + +- [ 新增 ] 增加proxy模式 diff --git a/versionLogs/en/V1.3.29-beta.1.md b/versionLogs/en/V1.3.29-beta.1.md new file mode 100644 index 0000000000..2fa9efe0c0 --- /dev/null +++ b/versionLogs/en/V1.3.29-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.29-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] proxy支持清理本地的文件 diff --git a/versionLogs/en/V1.4.1-beta.2.md b/versionLogs/en/V1.4.1-beta.2.md new file mode 100644 index 0000000000..bcef0b26cc --- /dev/null +++ b/versionLogs/en/V1.4.1-beta.2.md @@ -0,0 +1,11 @@ +# V1.4.1-beta.2版本更新日志 + + + +### 优化 + +- [ 优化 ] 支持跨cos存储复制文件 + +### 修复 + +- [ 修复 ] 修复auth权限校验bug \ No newline at end of file diff --git a/versionLogs/en/V1.4.1-beta.3.md b/versionLogs/en/V1.4.1-beta.3.md new file mode 100644 index 0000000000..e25e7a57b1 --- /dev/null +++ b/versionLogs/en/V1.4.1-beta.3.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 页面产品支持iframe加载模式 diff --git a/versionLogs/en/V1.4.1-beta.4.md b/versionLogs/en/V1.4.1-beta.4.md new file mode 100644 index 0000000000..089968c47c --- /dev/null +++ b/versionLogs/en/V1.4.1-beta.4.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.4版本更新日志 + + + +### 优化 + +- [ 优化 ] artifact-cleanup允许默认执行 diff --git a/versionLogs/en/V1.5.1-beta.3.md b/versionLogs/en/V1.5.1-beta.3.md new file mode 100644 index 0000000000..616454da7f --- /dev/null +++ b/versionLogs/en/V1.5.1-beta.3.md @@ -0,0 +1,15 @@ +# V1.5.1-beta.3版本更新日志 + +### 新增 + +- [ 新增 ] role资源增加pod +- [ 新增 ] 新增加maven服务 +- [ 新增 ] 支持接入蓝鲸消息通知中心 + +### 优化 + +- [ 优化 ] 取消fs-server服务的部署 + +### 修复 + +- [ 修复 ] 修复前端bug