Skip to content

Commit

Permalink
fix: V7.2 外发前整体特性验收修复 (#1500)
Browse files Browse the repository at this point in the history
  • Loading branch information
leafage-collb authored Aug 7, 2024
1 parent 7ac4800 commit 1b13673
Show file tree
Hide file tree
Showing 14 changed files with 239 additions and 356 deletions.
7 changes: 5 additions & 2 deletions webfe/package_vue/src/components/authentication-info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</span>
</template>
</bk-table-column>
<bk-table-column :label="$t('操作')" :width="120">
<bk-table-column :label="$t('操作')" :width="localLanguage === 'en' ? 150 : 120">
<template slot-scope="props">
<a
v-bk-tooltips.light="disabledTooltipsConfig"
Expand Down Expand Up @@ -287,7 +287,7 @@
:disabled="!option.enabled"
>
<span>{{ option.bk_app_secret }}</span>
({{ option.enabled ? $t('创建时间:') + smartTime(option.created_at, 'smartShorten') : $t('已禁用') }})
({{ option.enabled ? `${$t('创建时间')}: ` + smartTime(option.created_at, 'smartShorten') : $t('已禁用') }})
</bk-option>
<div
slot="extension"
Expand Down Expand Up @@ -426,6 +426,9 @@ export default {
isPluginDev() {
return this.$route.path.includes('/plugin-center');
},
localLanguage() {
return this.$store.state.localLanguage;
},
},
watch: {
appCode() {
Expand Down
34 changes: 17 additions & 17 deletions webfe/package_vue/src/components/log-version.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<span
v-if="index === current"
class="item-current"
>{{ $t('当前版本') }}</span>
>{{ $t('当前版本-label') }}</span>
</li>
</ul>
</div>
Expand All @@ -49,26 +49,26 @@ import { marked } from 'marked';
export default {
name: 'LogVersion',
props: {
dialogShow: Boolean
dialogShow: Boolean,
},
data () {
data() {
return {
show: false,
current: 0,
active: 0,
logList: [],
loading: false,
contactLoading: false
contactLoading: false,
};
},
computed: {
currentLog () {
currentLog() {
return marked(this.logList[this.active]?.detail || '');
}
},
},
watch: {
dialogShow: {
async handler (v) {
async handler(v) {
this.show = v;
if (v) {
this.loading = true;
Expand All @@ -79,37 +79,37 @@ export default {
this.loading = false;
}
},
immediate: true
}
immediate: true,
},
},
beforeDestroy () {
beforeDestroy() {
this.show = false;
this.$emit('update:dialogShow', false);
},
methods: {
handleValueChange (v) {
handleValueChange(v) {
this.$emit('update:dialogShow', v);
},
// 查看log详情
async handleItemClick (index = 0, curEvent) {
async handleItemClick(index = 0, curEvent) {
this.loading = true;
this.active = index;
setTimeout(() => {
this.loading = false;
}, 20);
},
async getVersionLogsList () {
async getVersionLogsList() {
try {
const data = await this.$store.dispatch('getVersionLog');
return data.map(item => ({ title: item.version, date: item.date, detail: item.content }));
} catch (e) {
this.$paasMessage({
theme: 'error',
message: e.detail || this.$t('接口异常')
message: e.detail || this.$t('接口异常'),
});
}
}
}
},
},
};
</script>
Expand Down Expand Up @@ -202,7 +202,7 @@ export default {
</style>
<style lang="scss">
.detail-container{
font-size: 14px;
color: #313238;
h1,
Expand Down
57 changes: 32 additions & 25 deletions webfe/package_vue/src/components/paas-header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
ext-cls="top-bar-popover"
placement="bottom"
:arrow="false"
offset="0, 10"
offset="0, 5"
trigger="mouseenter"
:tippy-options="{ 'hideOnClick': false }"
>
Expand All @@ -159,16 +159,12 @@
<template #content>
<ul class="monitor-navigation-admin">
<li
class="nav-item"
@click="switchLanguage('zh-cn')"
v-for="item in languageList"
:class="['nav-item', { active: item.id === localLanguage }]"
@click="switchLanguage(item.id)"
:key="item.id"
>
<i class="bk-icon icon-chinese lang-icon" />{{ $t('中文') }}
</li>
<li
class="nav-item"
@click="switchLanguage('en')"
>
<i class="bk-icon icon-english lang-icon" />{{ $t('英文') }}
<i :class="['bk-icon', 'lang-icon', item.icon]" />{{ item.text }}
</li>
</ul>
</template>
Expand All @@ -177,7 +173,7 @@
theme="light navigation-message"
ext-cls="top-bar-popover"
:arrow="false"
offset="-20, 10"
offset="-20, 5"
placement="bottom-start"
:tippy-options="{ 'hideOnClick': false }"
>
Expand Down Expand Up @@ -230,7 +226,7 @@
theme="light navigation-message"
ext-cls="top-bar-popover"
:arrow="false"
offset="30, 18"
offset="30, 13"
placement="bottom-start"
:tippy-options="{ 'hideOnClick': false }"
>
Expand Down Expand Up @@ -417,6 +413,10 @@ export default {
// eslint-disable-next-line comma-dangle
link: this.GLOBAL.LINK.APIGW_INDEX,
navText: '',
languageList: [
{ icon: 'icon-chinese', id: 'zh-cn', text: this.$t('中文') },
{ icon: 'icon-english', id: 'en', text: this.$t('英文') },
],
};
},
computed: {
Expand Down Expand Up @@ -1344,13 +1344,15 @@ export default {
}
</style>
<style lang="scss">
.top-bar-popover .tippy-backdrop {
background: transparent !important;
}
.top-bar-popover .tippy-content {
box-shadow:0 2px 6px 0 rgba(0,0,0,0.10) !important;
border: 1px solid #DCDEE5;
.top-bar-popover {
.tippy-tooltip.light-theme {
box-shadow: 0 0 6px 0 #dcdee5 !important;
padding:0;
}
.tippy-content {
box-shadow: 0 2px 6px 0 rgba(0,0,0,0.10) !important;
border-radius: 2px;
}
}
.top-bar-wrapper .header-mind{
color:#768197;
Expand Down Expand Up @@ -1489,19 +1491,24 @@ border-color:#F0F1F5;
a {
color: #63656E;
}
&.active {
background-color: #eaf3ff;
color: #3a84ff;
a {
color: #3a84ff;
}
}
}
.monitor-navigation-admin .nav-item .lang-icon{
font-size:18px;
margin-right:6px;
}
.monitor-navigation-admin .nav-item:hover{
cursor:pointer;
background: #F5F7FA;
}
.tippy-popper .tippy-tooltip.navigation-message-theme{
padding:0;
border-radius:0;
-webkit-box-shadow:none;
box-shadow:none;
background-color: #eaf3ff;
color: #3a84ff;
a {
color: #3a84ff;
}
}
</style>
Loading

0 comments on commit 1b13673

Please sign in to comment.