dashboard-shell-shell 3.0.5-order.2 → 3.0.5-order.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -643,7 +643,7 @@ export default {
|
|
|
643
643
|
<!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
|
|
644
644
|
<div class="center-self">
|
|
645
645
|
|
|
646
|
-
<configurationApps
|
|
646
|
+
<configurationApps v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" style="margin-left: 10px;"/>
|
|
647
647
|
|
|
648
648
|
<!-- <header-page-action-menu v-if="showPageActions" /> -->
|
|
649
649
|
|
|
@@ -71,7 +71,7 @@ export default {
|
|
|
71
71
|
role="link"
|
|
72
72
|
:aria-label="`${t('nav.ariaLabel.configurationApps')} ${ a.label }`"
|
|
73
73
|
>
|
|
74
|
-
<img class="headerIcon_img" :src="require(
|
|
74
|
+
<img class="headerIcon_img" :src="require(`@shell/assets/images/headerIcon/${a.value}.svg`)" alt="" srcset="">
|
|
75
75
|
</router-link>
|
|
76
76
|
</template>
|
|
77
77
|
<template #dropdownCollection>
|
package/package.json
CHANGED
package/pages/auth/login.vue
CHANGED
|
@@ -70,7 +70,7 @@ export default {
|
|
|
70
70
|
},
|
|
71
71
|
|
|
72
72
|
computed: {
|
|
73
|
-
...mapGetters(['isSingleProduct']),
|
|
73
|
+
...mapGetters(['isSingleProduct', 'isRancherInHarvester', 'isMultiCluster']),
|
|
74
74
|
...mapGetters({ t: 'i18n/t', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
|
|
75
75
|
|
|
76
76
|
loggedOutSuccessMsg() {
|
|
@@ -307,12 +307,16 @@ export default {
|
|
|
307
307
|
$plugin: this.$store.$plugin
|
|
308
308
|
});
|
|
309
309
|
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
310
|
+
let routerParmas = 'index'
|
|
311
|
+
|
|
312
|
+
if (this.isRancherInHarvester || this.isMultiCluster || !this.isSingleProduct){
|
|
313
|
+
routerParmas = {
|
|
314
|
+
name: 'c-cluster-product-resource',
|
|
315
|
+
params: {
|
|
316
|
+
cluster: BLANK_CLUSTER,
|
|
317
|
+
product: 'manager',
|
|
318
|
+
resource: CAPI.RANCHER_CLUSTER
|
|
319
|
+
}
|
|
316
320
|
}
|
|
317
321
|
}
|
|
318
322
|
|