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

镜像上架构建资源不展示腾讯内部逻辑 #4318

Merged
merged 11 commits into from
Jun 21, 2021
Merged
8 changes: 0 additions & 8 deletions src/frontend/devops-atomstore/src/components/detailInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@
<img v-if="detail.logoUrl" :src="detail.logoUrl" class="g-progress-image">
</bk-col>
</bk-row>
<bk-row>
<bk-col :span="12" class="g-progress-item">
<span class="g-progress-label">{{ $t('store.适用机器') }} :</span>
<section class="g-progress-content label-list">
<span class="label-card" v-for="(agent, index) in detail.agentTypeScope" :key="index">{{ agent | agentFilter }}</span>
</section>
</bk-col>
</bk-row>
<bk-row>
<bk-col :span="12" class="g-progress-item">
<span class="g-progress-label">{{ $t('store.简介') }} :</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
<span class="detail-label">{{ $t('store.功能标签') }}:</span>
<label-list :label-list="(detail.labelList || []).map(x => x.labelName)"></label-list>
</li>
<li class="detail-item">
<span class="detail-label">{{ $t('store.适用机器') }}:</span>
<label-list :label-list="detail.agentTypeScope" :formatter="agentFilter"></label-list>
</li>
<li class="detail-item">
<span class="detail-label">{{ $t('store.简介') }}:</span>
<span>{{ detail.summary || '--' }}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:key="childPanel.name"
@click="childTabChange(childPanel.name)"
:class="['transition-child-tab', { active: activeChildTab === childPanel.name }]"
>{{ childPanel.label }}</li>
>{{ childPanel.label }}</li>1
irwinsun marked this conversation as resolved.
Show resolved Hide resolved
</ul>
</transition>
<slot></slot>
Expand Down Expand Up @@ -98,13 +98,13 @@
}
/deep/ .bk-tab-header {
background-color: #fff;
height: 6.4vh;
line-height: 6.4vh;
height: 6.4vh !important;
line-height: 6.4vh !important;
background-image: linear-gradient(transparent 6.3vh,#dcdee5 0);
.bk-tab-label-wrapper .bk-tab-label-list {
height: 6.4vh;
height: 6.4vh !important;
.bk-tab-label-item {
line-height: 6.4vh;
line-height: 6.4vh !important;
color: #666;
&::after {
height: 3px;
Expand All @@ -118,8 +118,8 @@
}
}
.bk-tab-header-setting {
height: 6.4vh;
line-height: 6.4vh;
height: 6.4vh !important;
line-height: 6.4vh !important;
}
}
/deep/ .bk-tab-section {
Expand Down
36 changes: 1 addition & 35 deletions src/frontend/devops-atomstore/src/views/edit_image.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
:id="option.categoryCode"
:name="option.categoryName"
:placeholder="$t('store.请选择范畴')"
@click.native="changeShowAgentType(option)"
>
</bk-option>
</bk-select>
Expand All @@ -55,24 +54,6 @@
<bk-form-item :label="$t('store.标签')" property="labelIdList">
<bk-tag-input v-model="form.labelIdList" :list="labelList" display-key="labelName" search-key="labelName" trigger="focus" :placeholder="$t('store.请选择标签')"></bk-tag-input>
</bk-form-item>
<bk-form-item :label="$t('store.适用机器')"
property="agentTypeScope"
:required="true"
:rules="[requireRule]"
ref="agentTypeScope"
v-if="needAgentType"
error-display-type="normal"
>
<bk-select v-model="form.agentTypeScope" searchable multiple show-select-all>
<bk-option v-for="(option, index) in agentTypes"
:key="index"
:id="option.id"
:name="option.name"
:placeholder="$t('store.请选择适用机器')"
>
</bk-option>
</bk-select>
</bk-form-item>
<bk-form-item :label="$t('store.简介')"
property="summary"
:required="true"
Expand Down Expand Up @@ -258,24 +239,17 @@
versionContent: '',
ticketId: '',
projectCode: '',
category: '',
agentTypeScope: []
category: ''
},
docsLink: `${DOCS_URL_PREFIX}/document/6.0/129/7518`,
ticketList: [],
classifys: [],
labelList: [],
categoryList: [],
agentTypes: [
{ name: this.$t('store.Devnet 物理机'), id: 'DOCKER' },
{ name: 'IDC CVM', id: 'IDC' },
{ name: 'DevCloud', id: 'PUBLIC_DEVCLOUD' }
],
imageList: [],
imageVersionList: [],
isLoading: false,
isLoadingTag: false,
needAgentType: false,
originVersion: '',
requireRule: {
required: true,
Expand Down Expand Up @@ -336,11 +310,6 @@
'requestReleaseImage'
]),

changeShowAgentType (option) {
const settings = option.settings || {}
this.needAgentType = settings.needAgentType === 'NEED_AGENT_TYPE_TRUE'
},

submitImage () {
if (this.form.dockerFileType === 'INPUT') this.form.dockerFileContent = this.$refs.codeEditor.getValue()
this.$refs.imageForm.validate().then(() => {
Expand Down Expand Up @@ -416,9 +385,6 @@
this.labelList = labels
this.categoryList = categorys
this.ticketList = ticket.records || []
const currentCategory = categorys.find((category) => (res.category === category.categoryCode)) || {}
const settings = currentCategory.settings || {}
this.needAgentType = settings.needAgentType === 'NEED_AGENT_TYPE_TRUE'

if (this.form.imageRepoName && this.form.imageSourceType === 'BKDEVOPS') {
const imageRepo = this.form.imageRepoName
Expand Down