Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

镜像应用支持绑定源码仓库、最近操作-云原生应用“后退”按钮无法正常工作修复 #1165

Merged
merged 6 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions webfe/package_vue/src/language/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -2518,4 +2518,7 @@ export default {
'自定义日志采集/清洗规则、日志导出等功能需要部署“蓝鲸日志平台”,由蓝鲸日志平台提供。': 'Customizing log collection/cleansing rules, log export, and other features require the deployment of "Blue Whale Log Platform," provided by the Blue Whale Log Platform.',
'由小写字母组成,长度小于 16 个字符': 'Consists of lowercase letters and is less than 16 characters long',
部署前置条件检查中: 'Pre-deployment condition check in progress',
'源码仓库仅用于 Homepage 运维开发分数统计,请瑞雪填写': 'The source code repository is solely for Homepage operation and development score statistics',
立即绑定: 'Bind Now',
暂未绑定源码信息: 'Source code information not bound yet',
};
3 changes: 3 additions & 0 deletions webfe/package_vue/src/language/lang/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -2660,4 +2660,7 @@ export default {
'自定义日志采集/清洗规则、日志导出等功能需要部署“蓝鲸日志平台”,由蓝鲸日志平台提供。': '自定义日志采集/清洗规则、日志导出等功能需要部署“蓝鲸日志平台”,由蓝鲸日志平台提供。',
'由小写字母组成,长度小于 16 个字符': '由小写字母组成,长度小于 16 个字符',
部署前置条件检查中: '部署前置条件检查中',
'源码仓库仅用于 Homepage 运维开发分数统计,请瑞雪填写': '源码仓库仅用于 Homepage 运维开发分数统计,请瑞雪填写',
立即绑定: '立即绑定',
暂未绑定源码信息: '暂未绑定源码信息',
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
</div>
<div :class="['select-wrapper', { 'en': localLanguage === 'en' }]">
<bk-select
v-bk-tooltips.top="{
content: curSelectedType,
disabled: localLanguage !== 'en'
}"
v-model="typeValue"
:clearable="false"
@selected="handleSelect"
Expand Down Expand Up @@ -41,6 +45,10 @@
</div>
<div :class="['select-wrapper', { 'en': localLanguage === 'en' }]">
<bk-select
v-bk-tooltips.top="{
content: curSelectedStatus,
disabled: localLanguage !== 'en'
}"
v-model="statusValue"
clearable
@selected="handleStatusSelect"
Expand Down Expand Up @@ -144,7 +152,11 @@
<template v-if="isComponentApi">
{{ props.row.system_name }}
<template v-if="!!props.row.tag">
<span :class="[{ inner: [$t('内部版'), $t('互娱外部版')].includes(props.row.tag) }, { clound: [$t('上云版'), $t('互娱外部上云版')].includes(props.row.tag) }]">
<span
:class="[
{ inner: [$t('内部版'), $t('互娱外部版')].includes(props.row.tag) },
{ clound: [$t('上云版'), $t('互娱外部上云版')].includes(props.row.tag) }
]">
{{ props.row.tag }}
</span>
</template>
Expand Down Expand Up @@ -547,6 +559,12 @@ export default {
localLanguage() {
return this.$store.state.localLanguage;
},
curSelectedType() {
return this.typeList.find(v => v.id === this.typeValue)?.name;
},
curSelectedStatus() {
return this.statusList.find(v => v.id === this.statusValue)?.name;
},
},
watch: {
'$route'() {
Expand Down Expand Up @@ -781,7 +799,7 @@ export default {
.select-wrapper {
width: 98px;
&.en {
width: 118px;
width: 130px;
}
}
.set-ml {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
<div class="quality-right">
<p>
{{$t('最近检查时间:')}}{{codeDetails.lastAnalysisTime || '--'}}
<i class="paasng-icon paasng-process-file ml5"
<span
class="code-detail-icon"
v-if="codeDetails.detailUrl"
@click="handleToDetail(codeDetails.detailUrl)"
/>
>
<i class="paasng-icon paasng-process-file ml5" />
{{ $t('查看详情') }}
</span>
</p>
</div>
</section>
Expand Down Expand Up @@ -48,8 +52,7 @@
<li
v-for="(item, index) in codeDetails.lastAnalysisResultList"
:key="index"
class="item"
@click="handleToDetail(item.defectUrl)">
class="item">
<p>{{item.displayName}}</p>
<div class="container">
<span class="number">{{item.defectCount}}</span>
Expand All @@ -74,8 +77,8 @@ export default {
props: {
codeDetails: {
type: Object,
default: () => {}
}
default: () => {},
},
},

computed: {
Expand All @@ -101,7 +104,7 @@ export default {
margin-right: 8px !important;
}
}

.code-inspection {
.card-item {
display: flex;
Expand Down Expand Up @@ -142,6 +145,14 @@ export default {
margin: 24px 0;
}

.code-detail-icon {
cursor: pointer;
color: #3a84ff;
i {
font-size: 14px;
}
}

.quality-star {
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -194,7 +205,6 @@ export default {
border-radius: 2px;
margin-right: 8px;
margin-bottom: 8px;
cursor: pointer;

&:nth-child(3n) {
margin-right: 0;
Expand Down
Loading