Skip to content

Commit

Permalink
资源列表样式优化
Browse files Browse the repository at this point in the history
  • Loading branch information
shaohq committed Mar 26, 2022
1 parent 3fce8e5 commit c22a963
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 10 deletions.
19 changes: 18 additions & 1 deletion docs/.vuepress/comp/kuboard-spray/ResourceDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</el-form-item>
<div class="package_info">
<template v-for="(value, key) in item.params">
<el-form-item :label="key" label-width="280px" v-if="value.indexOf('{{') < 0" :key="key + 'addons' + index">
<el-form-item :label="key" label-width="280px" v-if="(value + '').indexOf('{{') < 0" :key="key + 'addons' + index">
<template #label>
<div style="font-size: 12px">{{key}}</div>
</template>
Expand Down Expand Up @@ -144,6 +144,23 @@ export default {
}
</script>

<style lang="css">
.app_form_mini .el-form-item {
margin-bottom: 0px !important;
}
.app_form_mini .el-form-item__label {
padding: 0px !important;
line-height: 28px !important;
font-size: 13px;
}
.app_form_mini .el-form-item__content {
line-height: 28px !important;
font-size: 13px;
}
</style>

<style scoped lang="css">
.package_title {
font-weight: bolder;
Expand Down
24 changes: 15 additions & 9 deletions docs/.vuepress/comp/kuboard-spray/Resources.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<div v-if="arch === '-arm64'" class="type">ARM 架构</div>
<div v-else class="type">AMD 架构</div>
<div class="contentList" v-if="mergedPackageList">
<el-table :data="mergedPackageList">
<el-table-column prop="version" label="版 本"></el-table-column>
<el-table-column prop="package.data.kubespray_version" label="kubespray"></el-table-column>
<el-table-column prop="package.data.kubernetes.kube_version" label="kubernetes"></el-table-column>
<el-table-column prop="package.data.container_engine" label="容器引擎">
<el-table :data="mergedPackageList" class="kubaordspray_resource_packages">
<el-table-column prop="version" label="版 本" width="120px"></el-table-column>
<!-- <el-table-column prop="package.data.kubespray_version" label="kubespray"></el-table-column> -->
<el-table-column prop="package.data.kubernetes.kube_version" label="kubernetes" width="100px"></el-table-column>
<el-table-column prop="package.data.container_engine" label="容器引擎" width="150px">
<template slot-scope="scope">
<div v-if="scope.row.package" style="margin-bottom: -10px;">
<div v-for="(engine, key) in scope.row.package.data.container_engine" :key="`c${scope.index}_${key}`">
Expand All @@ -22,19 +22,19 @@
</div>
</template>
</el-table-column>
<el-table-column prop="package.metadata.supported_os" label="操作系统">
<el-table-column prop="package.metadata.supported_os" label="操作系统" width="320px">
<template #default="data">
<div v-if="data.row.package" style="margin-bottom: -10px;">
<div v-if="data.row.package" style="margin-bottom: -5px; ">
<div v-for="(os, key) in data.row.package.metadata.supported_os" :key="`os${data.index}_${key}`">
<el-tag style="margin-bottom: 10px;">
<el-tag style="margin-bottom: 5px;">
{{ os.distribution }}<span
v-for="(v, i) in os.versions" :key="key + 'v' + i">_{{v}}</span>
</el-tag>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="package.metadata.kuboard_spray_version.min" label="KuboardSpray最低版本"></el-table-column>
<el-table-column prop="package.metadata.kuboard_spray_version.min" label="KuboardSpray最低版本" width="170px"></el-table-column>
<el-table-column label="操 作">
<template #default="data">
<el-button type="primary" @click="showVersion(data.row)">离线导入</el-button>
Expand Down Expand Up @@ -161,6 +161,12 @@ export default {
padding: 0px !important;
}
.kubaordspray_resource_packages.el-table th {
color: #007af5;
background-color: #ecf5ff;
font-size: 13px;
}
</style>

<style scoped lang="css">
Expand Down

0 comments on commit c22a963

Please sign in to comment.