Skip to content

Commit

Permalink
fix: 验收问题修复 (#93)
Browse files Browse the repository at this point in the history
  • Loading branch information
@leafage-collb
leafage-collb authored Jul 17, 2023
1 parent 13b69d1 commit 8943150
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
11 changes: 5 additions & 6 deletions src/dashboard-front/src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -984,12 +984,11 @@
},
goPage (routeName) {
if (routeName) {
this.$router.push({
name: routeName,
params: {
id: routeName === 'index' ? '' : this.apigwId
}
})
const route = { name: routeName }
if (!['index', 'apigwAccess'].includes(routeName)) {
route.params = this.apigwId
}
this.$router.push(route)
}
},
dropdownShow () {
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard-front/src/components/create-version/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<bk-dialog
v-model="versionDialogConf.visiable"
theme="primary"
:width="620"
:width="670"
:mask-close="false"
:header-position="'left'"
:title="versionDialogConf.title"
Expand All @@ -11,7 +11,7 @@
@cancel="handleCancel">
<bk-form
class="mt20 mb10"
style="width: 540px;"
style="width: 590px;"
:label-width="100"
:model="versionParams"
:rules="rules"
Expand All @@ -33,7 +33,7 @@
<template slot="tip">
<div class="ag-alert" style="line-height: 1;">
<i class="apigateway-icon icon-ag-info"></i>
&nbsp;{{ $t('版本号须符合 Semver 规范，例如：1.0.0') }}
&nbsp;{{ $t('版本号须符合 Semver 规范，例如：1.1.1，1.1.1-alpha.1') }}
</div>
</template>
</bk-form-item>
Expand Down
5 changes: 2 additions & 3 deletions src/dashboard-front/src/language/lang/en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,11 +754,10 @@ export default {
"请先生成资源版本，再生成SDK": "Please generate the resource version first, and then generate the SDK",
"生成的语言": "Language",
"由数字、小写字母、中折线(-)、点号(.)组成，长度小于32个字符": "Consists of numbers, lowercase letters, hyphens(-), dots(.), length less than 32",
"为空则由网关自动生成版本号，自定义版本号推荐遵从": "If empty, version is automatically generated, and custom version should follow ",
"为空则由网关自动生成版本号，自定义版本号推荐遵从 Semver 规范，例如：1.1.1，1.1.1-alpha.1": "If empty, version is automatically generated, and custom version should follow Semver, e.g. 1.1.1, 1.1.1-alpha.1",
"若选择，则网关所有资源写入到SDK；否则，仅公开的资源写入到SDK": "If checked, all resources are written to the SDK; otherwise, only public resources are written to the SDK",
"发布到源": "Distribute",
"由数字、字母、中折线（-）、点号（.）组成，长度小于32个字符，符合 Semver 规范": "Consists of numbers, letters, hyphens(-), dots(.), length less than 32, and follows Semver",
"Semver 规范": "Semver",
"生成成功！": "Generated!",
"SDK 版本号": "SDK Version",
"由字母、数字、连接符（-）、下划线（_）组成，首字符必须是字母，长度小于20个字符": "Consists of letters, numbers, hyphens (-), underscores (_), first character must be a letter, length less than 20",
Expand Down Expand Up @@ -1091,7 +1090,7 @@ export default {
"发布前，可在": "Before publishing, you can in",
"检查网关环境的环境变量、代理配置是否正确": "check whether stage variables and backend service are correct",
"编辑网关": "Edit Gateway",
"版本号须符合 Semver 规范，例如：1.0.0": "The version must comply with the Semver specification, e.g. 1.0.0",
"版本号须符合 Semver 规范，例如：1.1.1，1.1.1-alpha.1": "The version must comply with the Semver specification, e.g. 1.1.1, 1.1.1-alpha.1",
"关闭": "Close",
"标签最多只能选择10个": "Tags can only select up to 10",
"确认删除网关【{name}】？": "Confirm to delete gateway [{name}]?",
Expand Down
5 changes: 2 additions & 3 deletions src/dashboard-front/src/language/lang/zh.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,11 +754,10 @@ export default {
"请先生成资源版本，再生成SDK": "请先生成资源版本，再生成SDK",
"生成的语言": "生成的语言",
"由数字、小写字母、中折线(-)、点号(.)组成，长度小于32个字符": "由数字、小写字母、中折线(-)、点号(.)组成，长度小于32个字符",
"为空则由网关自动生成版本号，自定义版本号推荐遵从": "为空则由网关自动生成版本号，自定义版本号推荐遵从",
"为空则由网关自动生成版本号，自定义版本号推荐遵从 Semver 规范，例如：1.1.1，1.1.1-alpha.1": "为空则由网关自动生成版本号，自定义版本号推荐遵从 Semver 规范，例如：1.1.1，1.1.1-alpha.1",
"若选择，则网关所有资源写入到SDK；否则，仅公开的资源写入到SDK": "若选择，则网关所有资源写入到SDK；否则，仅公开的资源写入到SDK",
"发布到源": "发布到源",
"由数字、字母、中折线（-）、点号（.）组成，长度小于32个字符，符合 Semver 规范": "由数字、字母、中折线（-）、点号（.）组成，长度小于32个字符，符合 Semver 规范",
"Semver 规范": "Semver 规范",
"生成成功！": "生成成功！",
"SDK 版本号": "SDK 版本号",
"由字母、数字、连接符（-）、下划线（_）组成，首字符必须是字母，长度小于20个字符": "由字母、数字、连接符（-）、下划线（_）组成，首字符必须是字母，长度小于20个字符",
Expand Down Expand Up @@ -1091,7 +1090,7 @@ export default {
"发布前，可在": "发布前，可在",
"检查网关环境的环境变量、代理配置是否正确": "检查网关环境的环境变量、代理配置是否正确",
"编辑网关": "编辑网关",
"版本号须符合 Semver 规范，例如：1.0.0": "版本号须符合 Semver 规范，例如：1.0.0",
"版本号须符合 Semver 规范，例如：1.1.1，1.1.1-alpha.1": "版本号须符合 Semver 规范，例如：1.1.1，1.1.1-alpha.1",
"关闭": "关闭",
"标签最多只能选择10个": "标签最多只能选择10个",
"确认删除网关【{name}】？": "确认删除网关【{name}】？",
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard-front/src/views/base/info.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<template v-if="curApigw.is_public">
{{curApigw.docs_url}}
<i class="apigateway-icon icon-ag-document ml15 copy-btn" @click="handleCopy(curApigw.docs_url)"></i>
<a :href="curApigw.docs_url" target="_blank"><i class="apigateway-icon icon-ag-jump ml5"></i></a>
<!-- <a :href="curApigw.docs_url" target="_blank"><i class="apigateway-icon icon-ag-jump ml5"></i></a> -->
</template>
<template v-else>
<span style="color: #dcdee5;"> {{ $t('网关未公开，不提供在线 API 文档') }} </span>
Expand Down
3 changes: 1 addition & 2 deletions src/dashboard-front/src/views/sdk/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@
>
</bk-input>
<p class="ag-tip mt5">
<i class="apigateway-icon icon-ag-info"></i> {{ $t('为空则由网关自动生成版本号，自定义版本号推荐遵从') }}
&nbsp;{{ $t('Semver 规范') }}
<i class="apigateway-icon icon-ag-info"></i> {{ $t('为空则由网关自动生成版本号，自定义版本号推荐遵从 Semver 规范，例如：1.1.1，1.1.1-alpha.1') }}
</p>
</bk-form-item>
<bk-form-item
Expand Down

0 comments on commit 8943150

Please sign in to comment.