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.

Sign up for GitHub

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

fix：全局配置：BK_SHARED_RES_URL 未设置时，不应该发起请求 & 应用列表tooltips鼠标悬浮问题修复 #1652

Merged
merged 2 commits into from
Oct 11, 2024
Merged

fix：全局配置：BK_SHARED_RES_URL 未设置时，不应该发起请求 & 应用列表tooltips鼠标悬浮问题修复 #1652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7a7c6
fix: 应用列表tooltips鼠标悬浮问题修复
leafage-collb Oct 11, 2024
16f2970
fix: 全局配置：BK_SHARED_RES_URL 未设置时，不应该发起请求
leafage-collb Oct 11, 2024
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
4 changes: 3 additions & 1 deletion webfe/package_vue/src/common/platform-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ export default async function (vm) {
};

try {
const config = await getPlatformConfig(url, defaults);
const config = window.BK_SHARED_RES_URL
? await getPlatformConfig(url, defaults)
: await getPlatformConfig(defaults);
applyPlatformConfig(config);
} catch (error) {
applyPlatformConfig(defaults);
Expand Down
25 changes: 21 additions & 4 deletions webfe/package_vue/src/views/dev-center/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,10 @@
<template v-if="row.application.is_active">
<div
v-if="userFeature.CNATIVE_MGRLEGACY && !noMigrationNeededStatus.includes(row.migration_status?.status)"
v-bk-tooltips="{ content: row.application.type === 'cloud_native' ? $t('查看迁移进度') : $t('点击可迁移为云原生应用') }"
v-bk-tooltips="{
content: row.application.type === 'cloud_native' ? $t('查看迁移进度') : $t('点击可迁移为云原生应用'),
allowHTML: true,
}"
class="migration-wrapper"
@click.stop="showAppMigrationDialog(row.application)"
>
Expand Down Expand Up @@ -422,7 +425,11 @@
<i class="paasng-icon paasng-keys cloud-icon" />
</bk-button>
<span
v-bk-tooltips.top="{ content: $t('应用未设置访问路径'), disabled: row.market_config.source_tp_url }"
v-bk-tooltips.top="{
content: $t('应用未设置访问路径'),
disabled: row.market_config.source_tp_url,
allowHTML: true,
}"
class="link-btn-cls right-text"
>
<bk-button
Expand All @@ -448,7 +455,12 @@
@click="visitLink(row, 'stag')"
>
<template v-if="!row.application.deploy_info.stag.deployed">
<span v-bk-tooltips="$t('应用未部署，不能访问')">
<span
v-bk-tooltips="{
content: $t('应用未部署，不能访问'),
placement: 'top',
allowHTML: true,
}">
{{ $t('访问预发布环境') }} <i class="paasng-icon paasng-external-link" />
</span>
</template>
Expand All @@ -466,7 +478,12 @@
@click="visitLink(row, 'prod')"
>
<template v-if="!row.application.deploy_info.prod.deployed">
<span v-bk-tooltips="$t('应用未部署，不能访问')">
<span
v-bk-tooltips="{
content: $t('应用未部署，不能访问'),
placement: 'top',
allowHTML: true,
}">
{{ $t('访问生产环境') }} <i class="paasng-icon paasng-external-link" />
</span>
</template>
Expand Down