From 701aa2b13c74ba7b43932b8a473d071958725195 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Tue, 24 Sep 2024 16:32:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=94=AF=E6=8C=81co?= =?UTF-8?q?nan=E4=BB=93=E5=BA=93=20#2601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-repository/src/images/conan.svg | 10 ++ .../src/store/actions/repoCommon.js | 3 +- .../devops-repository/src/store/index.js | 3 +- .../devops-repository/src/store/publicEnum.js | 6 +- .../src/views/repoCommon/repoGuideMixin.js | 125 +++++++++++++++++- src/frontend/locale/repository/en-US.json | 7 +- src/frontend/locale/repository/zh-CN.json | 5 +- 7 files changed, 148 insertions(+), 11 deletions(-) create mode 100644 src/frontend/devops-repository/src/images/conan.svg diff --git a/src/frontend/devops-repository/src/images/conan.svg b/src/frontend/devops-repository/src/images/conan.svg new file mode 100644 index 0000000000..d73def2412 --- /dev/null +++ b/src/frontend/devops-repository/src/images/conan.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/frontend/devops-repository/src/store/actions/repoCommon.js b/src/frontend/devops-repository/src/store/actions/repoCommon.js index 9ea863cc9c..7ac5134e0d 100644 --- a/src/frontend/devops-repository/src/store/actions/repoCommon.js +++ b/src/frontend/devops-repository/src/store/actions/repoCommon.js @@ -168,7 +168,8 @@ export default { const urlMap = { docker: 'docker/ext/addr', npm: 'npm/ext/address', - helm: 'helm/ext/address' + helm: 'helm/ext/address', + conan: 'conan/ext/address' } if (!urlMap[repoType] || state.domain[repoType]) return Vue.prototype.$ajax.get( diff --git a/src/frontend/devops-repository/src/store/index.js b/src/frontend/devops-repository/src/store/index.js index 44764804b3..4fb49da252 100644 --- a/src/frontend/devops-repository/src/store/index.js +++ b/src/frontend/devops-repository/src/store/index.js @@ -44,7 +44,8 @@ const storeObject = { domain: { docker: '', npm: '', - helm: '' + helm: '', + conan: '' }, clusterList: [], dependAccessTokenValue: '', // 依赖源仓库的使用指引中用户输入的访问令牌的值 diff --git a/src/frontend/devops-repository/src/store/publicEnum.js b/src/frontend/devops-repository/src/store/publicEnum.js index c576bc722e..17fbe26c1e 100644 --- a/src/frontend/devops-repository/src/store/publicEnum.js +++ b/src/frontend/devops-repository/src/store/publicEnum.js @@ -6,7 +6,8 @@ export const repoEnum = MODE_CONFIG === 'ci' { label: 'Helm', value: 'helm' }, { label: 'Docker', value: 'docker' }, // { label: 'Rds', value: 'rds' }, - { label: 'Nuget', value: 'nuget' } + { label: 'Nuget', value: 'nuget' }, + { label: 'Conan', value: 'conan' } ] : [ { label: 'Generic', value: 'generic' }, @@ -20,7 +21,8 @@ export const repoEnum = MODE_CONFIG === 'ci' { label: 'Composer', value: 'composer' }, { label: 'Rpm', value: 'rpm' }, { label: 'Git', value: 'git' }, - { label: 'Nuget', value: 'nuget' } + { label: 'Nuget', value: 'nuget' }, + { label: 'Conan', value: 'conan' } ] // 文件类型 diff --git a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js index 892e610b94..70b3a88b0a 100644 --- a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js +++ b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js @@ -184,7 +184,7 @@ export default { title: this.$t('npmCreditGuideSubTitle1'), optionType: 'setCredentials', main: [ - + { subTitle: this.$t('npmCreditGuideSubTitle3'), codeList: [ @@ -761,7 +761,7 @@ export default { { subTitle: this.$t('helmInstallGuideSubTitle2'), codeList: [ - 'helm repo update' + 'helm repo update ' ] }, { @@ -873,7 +873,6 @@ export default { }, pypiGuide () { return [ - { title: this.$t('pypiCreditGuideSubTitle1'), optionType: 'setCredentials', @@ -1160,6 +1159,126 @@ export default { ] }] }, + conanGuide () { + return [ + { + title: this.$t('setCredentials'), + optionType: 'setCredentials', + main: [ + { + subTitle: this.$t('conanCreditGuideSubTitle1'), + codeList: [ + `conan remote add ${this.repoName} ${this.domain.conan}/${this.projectId}/${this.repoName}` + + ] + }, + { + subTitle: this.$t('conanCreditGuideSubTitle2'), + codeList: [ + `conan user add -p ${this.accessToken} -r ${this.repoName} ${this.userName}` + ] + }, + { + subTitle: this.$t('conanCreditGuideSubTitle3'), + codeList: [ + `conan remote login -p ${this.accessToken} ${this.repoName} ${this.userName}` + ] + } + ] + }, + { + title: this.$t('push'), + optionType: 'push', + inputBoxList: [ + { + key: 'dependInputValue1', // vux中存储的变量名 + label: this.$t('artifactName'), // 输入框左侧label文案 + placeholder: this.$t('artifactNamePlaceholder'), // 输入框提示文案 + methodFunctionName: 'SET_DEPEND_INPUT_VALUE1' // vuex中mutations中的方法名 + }, + { + key: 'dependInputValue2', // vux中存储的变量名 + label: this.$t('artifactVersion'), // 输入框左侧label文案 + placeholder: this.$t('packageVersionPlaceholder'), // 输入框提示文案 + methodFunctionName: 'SET_DEPEND_INPUT_VALUE2' // vuex中mutations中的方法名 + } + ], + main: [ + { + subTitle: this.$t('pushGuideSubTitle'), + codeList: [ + `conan upload ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel} -r=${this.repoName}` + ] + } + ] + }, + { + title: this.$t('pull'), + optionType: 'pull', + inputBoxList: [ + { + key: 'dependInputValue1', // vux中存储的变量名 + label: this.$t('artifactName'), // 输入框左侧label文案 + placeholder: this.$t('artifactNamePlaceholder'), // 输入框提示文案 + methodFunctionName: 'SET_DEPEND_INPUT_VALUE1' // vuex中mutations中的方法名 + }, + { + key: 'dependInputValue2', // vux中存储的变量名 + label: this.$t('artifactVersion'), // 输入框左侧label文案 + placeholder: this.$t('packageVersionPlaceholder'), // 输入框提示文案 + methodFunctionName: 'SET_DEPEND_INPUT_VALUE2' // vuex中mutations中的方法名 + } + ], + main: [ + { + subTitle: this.$t('helmPullGuideSubTitle'), + codeList: [ + `conan install ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel}@ -r ${this.repoName}` + ] + } + ] + } + ] + }, + conanInstall () { + return [ + { + main: [ + { + subTitle: this.$t('conanCreditGuideSubTitle1'), + codeList: [ + `conan remote add ${this.repoName} ${this.domain.conan}/${this.projectId}/${this.repoName}` + + ] + }, + { + subTitle: this.$t('conanCreditGuideSubTitle2'), + codeList: [ + `conan user add -p -r ${this.repoName} ${this.userName}` + ] + }, + { + subTitle: this.$t('conanCreditGuideSubTitle3'), + codeList: [ + `conan remote login -p ${this.repoName} ${this.userName}` + ] + }, + { + subTitle: this.$t('helmPullGuideSubTitle'), + codeList: [ + `conan install ${this.packageName}/${this.versionLabel}@ -r ${this.repoName}` + ] + }, + { + subTitle: this.$t('pushGuideSubTitle'), + codeList: [ + `conan upload ${this.packageName}/${this.versionLabel} -r=${this.repoName}` + ] + } + ] + } + ] + }, articleGuide () { return this[`${guideMap[this.repoType] || this.repoType}Guide`] }, diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json index 3961f9b484..6cff0c1fc2 100644 --- a/src/frontend/locale/repository/en-US.json +++ b/src/frontend/locale/repository/en-US.json @@ -778,8 +778,6 @@ "relatedUsers":"Related Users", "assetUserTip": "Please start with g_", "createGroupToken": "Create Token", - "inFolderSearchPlaceholder":"Please enter a file/folder name to search", - "folderDirectory":"Folder directory", "batchDownload":"Batch download", "noFilenameErrorInfo":"Sorry, the server got the file name abnormally, please try again later", "batchDownloadBackTypeErrorInfo":"Batch download of files failed, please try again later", @@ -893,5 +891,8 @@ "changeSelectAllTip": "Select full data", "selectAllTip": "{0} pieces of total data have been selected，", "clearSelectTip":"Clear selection", - "previewErrorTip": "File Preview Fail" + "previewErrorTip": "File Preview Fail", + "conanCreditGuideSubTitle1":"1. Execute the following command on the command line to configure remote artifact repository", + "conanCreditGuideSubTitle2":"2、Execute the following command on the command line to configure artifact repository credentials(conan1.x)", + "conanCreditGuideSubTitle3":"2、Execute the following command on the command line to configure artifact repository credentials(conan2.x)" } diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json index 2770b9b588..ce80362fe5 100644 --- a/src/frontend/locale/repository/zh-CN.json +++ b/src/frontend/locale/repository/zh-CN.json @@ -894,5 +894,8 @@ "changeSelectAllTip": "选择全量数据", "selectAllTip": "已选择全量数据{0}条，", "clearSelectTip":"清除选择", - "previewErrorTip": "文件预览失败" + "previewErrorTip": "文件预览失败", + "conanCreditGuideSubTitle1":"1、在命令行执行以下命令配置远程仓库", + "conanCreditGuideSubTitle2":"2、在命令行执行以下命令配置制品仓库凭据(conan1.x)", + "conanCreditGuideSubTitle3":"2、在命令行执行以下命令配置制品仓库凭据(conan2.x)" } From 0ee82f844be5e1cacf8640d1784a057b45780ccf Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Thu, 10 Oct 2024 14:29:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=94=AF=E6=8C=81co?= =?UTF-8?q?nan=E4=BB=93=E5=BA=93=20#2601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-repository/src/views/repoCommon/repoGuideMixin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js index 70b3a88b0a..17c9015945 100644 --- a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js +++ b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js @@ -1207,7 +1207,7 @@ export default { { subTitle: this.$t('pushGuideSubTitle'), codeList: [ - `conan upload ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel} -r=${this.repoName}` + `conan upload ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel} -r ${this.repoName}` ] } ] @@ -1272,7 +1272,7 @@ export default { { subTitle: this.$t('pushGuideSubTitle'), codeList: [ - `conan upload ${this.packageName}/${this.versionLabel} -r=${this.repoName}` + `conan upload ${this.packageName}/${this.versionLabel} -r ${this.repoName}` ] } ] From c0939d0666542a8c375afb3452b6e5b11782474a Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Thu, 10 Oct 2024 16:33:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=94=AF=E6=8C=81co?= =?UTF-8?q?nan=E4=BB=93=E5=BA=93=20#2601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/repoCommon/repoGuideMixin.js | 18 +++--------------- src/frontend/locale/repository/en-US.json | 2 +- src/frontend/locale/repository/zh-CN.json | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js index 17c9015945..32d58bce10 100644 --- a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js +++ b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js @@ -1177,12 +1177,6 @@ export default { codeList: [ `conan user add -p ${this.accessToken} -r ${this.repoName} ${this.userName}` ] - }, - { - subTitle: this.$t('conanCreditGuideSubTitle3'), - codeList: [ - `conan remote login -p ${this.accessToken} ${this.repoName} ${this.userName}` - ] } ] }, @@ -1205,7 +1199,7 @@ export default { ], main: [ { - subTitle: this.$t('pushGuideSubTitle'), + subTitle: this.$t('pushGuideSubTitle') + '(conan1.x)', codeList: [ `conan upload ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel} -r ${this.repoName}` ] @@ -1258,19 +1252,13 @@ export default { ] }, { - subTitle: this.$t('conanCreditGuideSubTitle3'), - codeList: [ - `conan remote login -p ${this.repoName} ${this.userName}` - ] - }, - { - subTitle: this.$t('helmPullGuideSubTitle'), + subTitle: this.$t('conanPullGuideSubTitle'), codeList: [ `conan install ${this.packageName}/${this.versionLabel}@ -r ${this.repoName}` ] }, { - subTitle: this.$t('pushGuideSubTitle'), + subTitle: this.$t('pushGuideSubTitle') + '(conan1.x)', codeList: [ `conan upload ${this.packageName}/${this.versionLabel} -r ${this.repoName}` ] diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json index 6cff0c1fc2..8064c9948d 100644 --- a/src/frontend/locale/repository/en-US.json +++ b/src/frontend/locale/repository/en-US.json @@ -894,5 +894,5 @@ "previewErrorTip": "File Preview Fail", "conanCreditGuideSubTitle1":"1. Execute the following command on the command line to configure remote artifact repository", "conanCreditGuideSubTitle2":"2、Execute the following command on the command line to configure artifact repository credentials(conan1.x)", - "conanCreditGuideSubTitle3":"2、Execute the following command on the command line to configure artifact repository credentials(conan2.x)" + "conanPullGuideSubTitle":"Please execute the following command on the command line to pull(conan1.x)：" } diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json index ce80362fe5..6803bbc0a4 100644 --- a/src/frontend/locale/repository/zh-CN.json +++ b/src/frontend/locale/repository/zh-CN.json @@ -897,5 +897,5 @@ "previewErrorTip": "文件预览失败", "conanCreditGuideSubTitle1":"1、在命令行执行以下命令配置远程仓库", "conanCreditGuideSubTitle2":"2、在命令行执行以下命令配置制品仓库凭据(conan1.x)", - "conanCreditGuideSubTitle3":"2、在命令行执行以下命令配置制品仓库凭据(conan2.x)" + "conanPullGuideSubTitle":"请在命令行执行以下命令进行拉取(conan1.x)：" } From 5ff5a05c7e6089988b5c5c92ccc07b2bb2de27fc Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Sat, 12 Oct 2024 17:26:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=94=AF=E6=8C=81co?= =?UTF-8?q?nan=E4=BB=93=E5=BA=93=20#2601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/repoCommon/repoGuideMixin.js | 32 ++++++------------- src/frontend/locale/repository/en-US.json | 1 + src/frontend/locale/repository/zh-CN.json | 1 + 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js index 32d58bce10..10b97fbcfb 100644 --- a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js +++ b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js @@ -1175,7 +1175,7 @@ export default { { subTitle: this.$t('conanCreditGuideSubTitle2'), codeList: [ - `conan user add -p ${this.accessToken} -r ${this.repoName} ${this.userName}` + `conan user -p ${this.accessToken} -r ${this.repoName} ${this.userName}` ] } ] @@ -1186,22 +1186,16 @@ export default { inputBoxList: [ { key: 'dependInputValue1', // vux中存储的变量名 - label: this.$t('artifactName'), // 输入框左侧label文案 - placeholder: this.$t('artifactNamePlaceholder'), // 输入框提示文案 + label: 'RECIPE', // 输入框左侧label文案 + placeholder: this.$t('conanRecipePlaceholder'), // 输入框提示文案 methodFunctionName: 'SET_DEPEND_INPUT_VALUE1' // vuex中mutations中的方法名 - }, - { - key: 'dependInputValue2', // vux中存储的变量名 - label: this.$t('artifactVersion'), // 输入框左侧label文案 - placeholder: this.$t('packageVersionPlaceholder'), // 输入框提示文案 - methodFunctionName: 'SET_DEPEND_INPUT_VALUE2' // vuex中mutations中的方法名 } ], main: [ { subTitle: this.$t('pushGuideSubTitle') + '(conan1.x)', codeList: [ - `conan upload ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel} -r ${this.repoName}` + `conan upload ${this.dependInputValue1} -r ${this.repoName}` ] } ] @@ -1212,22 +1206,16 @@ export default { inputBoxList: [ { key: 'dependInputValue1', // vux中存储的变量名 - label: this.$t('artifactName'), // 输入框左侧label文案 - placeholder: this.$t('artifactNamePlaceholder'), // 输入框提示文案 + label: 'RECIPE', // 输入框左侧label文案 + placeholder: this.$t('conanRecipePlaceholder'), // 输入框提示文案 methodFunctionName: 'SET_DEPEND_INPUT_VALUE1' // vuex中mutations中的方法名 - }, - { - key: 'dependInputValue2', // vux中存储的变量名 - label: this.$t('artifactVersion'), // 输入框左侧label文案 - placeholder: this.$t('packageVersionPlaceholder'), // 输入框提示文案 - methodFunctionName: 'SET_DEPEND_INPUT_VALUE2' // vuex中mutations中的方法名 } ], main: [ { subTitle: this.$t('helmPullGuideSubTitle'), codeList: [ - `conan install ${this.dependInputValue1 || this.packageName}/${this.dependInputValue2 || this.versionLabel}@ -r ${this.repoName}` + `conan install ${this.dependInputValue1} -r ${this.repoName}` ] } ] @@ -1248,19 +1236,19 @@ export default { { subTitle: this.$t('conanCreditGuideSubTitle2'), codeList: [ - `conan user add -p -r ${this.repoName} ${this.userName}` + `conan user -p -r ${this.repoName} ${this.userName}` ] }, { subTitle: this.$t('conanPullGuideSubTitle'), codeList: [ - `conan install ${this.packageName}/${this.versionLabel}@ -r ${this.repoName}` + `conan install ${this.packageName.split('@', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[1]} -r ${this.repoName}` ] }, { subTitle: this.$t('pushGuideSubTitle') + '(conan1.x)', codeList: [ - `conan upload ${this.packageName}/${this.versionLabel} -r ${this.repoName}` + `conan upload ${this.packageName.split('@', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[1]} -r ${this.repoName}` ] } ] diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json index 8064c9948d..27f9b6c302 100644 --- a/src/frontend/locale/repository/en-US.json +++ b/src/frontend/locale/repository/en-US.json @@ -894,5 +894,6 @@ "previewErrorTip": "File Preview Fail", "conanCreditGuideSubTitle1":"1. Execute the following command on the command line to configure remote artifact repository", "conanCreditGuideSubTitle2":"2、Execute the following command on the command line to configure artifact repository credentials(conan1.x)", + "conanRecipePlaceholder":"The format of RECIPE is /VERSION>@/CHANNEL>", "conanPullGuideSubTitle":"Please execute the following command on the command line to pull(conan1.x)：" } diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json index 6803bbc0a4..b9b1a6e76e 100644 --- a/src/frontend/locale/repository/zh-CN.json +++ b/src/frontend/locale/repository/zh-CN.json @@ -897,5 +897,6 @@ "previewErrorTip": "文件预览失败", "conanCreditGuideSubTitle1":"1、在命令行执行以下命令配置远程仓库", "conanCreditGuideSubTitle2":"2、在命令行执行以下命令配置制品仓库凭据(conan1.x)", + "conanRecipePlaceholder":"RECIPE的格式为/VERSION>@/CHANNEL>", "conanPullGuideSubTitle":"请在命令行执行以下命令进行拉取(conan1.x)：" } From 441bf8254d07a7f6cedb8c3020816b5df2222f56 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Sat, 12 Oct 2024 17:57:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=94=AF=E6=8C=81co?= =?UTF-8?q?nan=E4=BB=93=E5=BA=93=20#2601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-repository/src/views/repoCommon/repoGuideMixin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js index 10b97fbcfb..204d0182ee 100644 --- a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js +++ b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js @@ -1242,13 +1242,13 @@ export default { { subTitle: this.$t('conanPullGuideSubTitle'), codeList: [ - `conan install ${this.packageName.split('@', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[1]} -r ${this.repoName}` + `conan install ${this.packageName.split('@', 2)[1].split('/', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[0]}${this.packageName.split('@', 2)[1].split('/', 2)[1]} -r ${this.repoName}` ] }, { subTitle: this.$t('pushGuideSubTitle') + '(conan1.x)', codeList: [ - `conan upload ${this.packageName.split('@', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[1]} -r ${this.repoName}` + `conan upload ${this.packageName.split('@', 2)[1].split('/', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[0]}${this.packageName.split('@', 2)[1].split('/', 2)[1]} -r ${this.repoName}` ] } ] From 7b3c22581e3234944e87bee9688dbc1481270c4c Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Sat, 12 Oct 2024 18:07:17 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E6=94=AF=E6=8C=81co?= =?UTF-8?q?nan=E4=BB=93=E5=BA=93=20#2601?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-repository/src/views/repoCommon/repoGuideMixin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js index 204d0182ee..3f93293212 100644 --- a/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js +++ b/src/frontend/devops-repository/src/views/repoCommon/repoGuideMixin.js @@ -1242,13 +1242,13 @@ export default { { subTitle: this.$t('conanPullGuideSubTitle'), codeList: [ - `conan install ${this.packageName.split('@', 2)[1].split('/', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[0]}${this.packageName.split('@', 2)[1].split('/', 2)[1]} -r ${this.repoName}` + `conan install ${this.packageName.split('@', 2)[1].split('/', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[0]}/${this.packageName.split('@', 2)[1].split('/', 2)[1]} -r ${this.repoName}` ] }, { subTitle: this.$t('pushGuideSubTitle') + '(conan1.x)', codeList: [ - `conan upload ${this.packageName.split('@', 2)[1].split('/', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[0]}${this.packageName.split('@', 2)[1].split('/', 2)[1]} -r ${this.repoName}` + `conan upload ${this.packageName.split('@', 2)[1].split('/', 2)[0]}/${this.versionLabel}@${this.packageName.split('@', 2)[0]}/${this.packageName.split('@', 2)[1].split('/', 2)[1]} -r ${this.repoName}` ] } ]