Unverified Commit c6a2eb43 authored by hito's avatar hito Committed by GitHub
Browse files

fix: 私有化版本未开启容器服务界面没有获取CMDB业务的问题 & helm操作菜单下拉样式调整 (#1259)

* fix: 修复未开启容器时没有获取CMDB业务的问题 & helm 操作下拉样式修复

* fix: hidden  Mesos tips
parent 177bb8be
Showing with 13 additions and 16 deletions
+13 -16
......@@ -257,14 +257,9 @@
this.isUserBKService = project.kind !== 0
if (!this.isUserBKService) {
this.checkUser()
// IEG 项目,只有内部版才判断是否是 IEG 项目
if (String(project.bg_id) !== '956') {
this.isIEGProject = false
} else {
await this.fetchCCList()
if (project.cc_app_id !== 0) {
this.ccKey = project.cc_app_id
}
await this.fetchCCList()
if (project.cc_app_id !== 0) {
this.ccKey = project.cc_app_id
}
}
}
......
......@@ -93,15 +93,17 @@
id: 1,
name: 'K8S',
desc: this.$t('k8s容器编排引擎')
},
{
}
]
if (this.$INTERNAL) {
this.kindList.push({
id: 2,
name: 'Mesos',
desc: this.$t('基于mesos框架自研的容器编排引擎'),
disabled: true,
tips: `${this.$t('如需使用,请联系')}<a href="${this.PROJECT_CONFIG.doc.contact}" style="color: #3a84ff" target="">${this.$t('【蓝鲸容器助手】')}</a>`
}
]
})
}
this.guideList = [
{
id: 'binding',
......
......@@ -507,7 +507,7 @@
.biz-namespace {
padding: 0 20px;
overflow: auto;
overflow-x: auto;
}
/* 自适应 */
......
......@@ -51,7 +51,7 @@
</symbol>
</svg>
<div class="biz-namespace" style="margin-bottom: 150px;" v-bkloading="{ isLoading: isPageLoading }">
<div class="biz-namespace" style="padding-bottom: 100px;" v-bkloading="{ isLoading: isPageLoading }">
<table class="bk-table biz-templateset-table mb20">
<thead>
<tr>
......
......@@ -63,9 +63,9 @@
<div class="bk-form-content" style="margin-left:160px;">
<bk-radio-group v-model="kind" @change="changeKind" :key="kind" style="display: inline-block; width: 155px; vertical-align: center;">
<bk-radio :value="1" :disabled="!canFormEdit">K8S</bk-radio>
<bk-radio :value="2" disabled>Mesos</bk-radio>
<bk-radio :value="2" disabled v-if="$INTERNAL">Mesos</bk-radio>
</bk-radio-group>
<bcs-popover :delay="500" placement="top" :key="kind" style="vertical-align: center;">
<bcs-popover :delay="500" placement="top" :key="kind" style="vertical-align: center;" v-if="$INTERNAL">
<i class="bcs-icon bcs-icon-info-circle" style="position: relative; top: 2px;"></i>
<template slot="content">
<p style="width: 230px;text-align: left; white-space: normal;word-break: break-all;font-weight: 400;">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment