Merge branch 'master-20251023-tag' into test1024

# Conflicts:
#	src/views/tag/TagManage.vue
This commit is contained in:
670788339
2025-11-03 16:12:49 +08:00

View File

@@ -19,6 +19,7 @@
placeholder="请选择热点标签状态" placeholder="请选择热点标签状态"
:options="hotOptions" :options="hotOptions"
allowClear allowClear
class="centered-select"
></a-select> ></a-select>
</div> </div>
<div class="select"> <div class="select">
@@ -27,6 +28,7 @@
placeholder="请选择前台公共显示状态" placeholder="请选择前台公共显示状态"
:options="hotOptions" :options="hotOptions"
allowClear allowClear
class="centered-select"
></a-select> ></a-select>
</div> </div>
<div class="button-group"> <div class="button-group">
@@ -113,10 +115,10 @@
</a-table> </a-table>
<div class="tableBox"> <div class="tableBox">
<!-- <div class="pagination-info" style="margin-bottom: 10px; text-align: center; color: #666;">
{{ tableDataTotal }} 条记录
</div>-->
<div class="pa"> <div class="pa">
<!-- <div class="pagination-info" style="margin-bottom: 10px; text-align: center; color: #666;">
{{ tableDataTotal }} 条记录
</div>-->
<a-pagination <a-pagination
v-if="tableDataTotal > 0" v-if="tableDataTotal > 0"
:showSizeChanger="false" :showSizeChanger="false"
@@ -207,9 +209,9 @@
</a-table> </a-table>
<div class="course-pagination"> <div class="course-pagination">
<!-- <div class="pagination-info" style="margin-bottom: 10px; text-align: center; color: #666;">--> <!-- <div class="pagination-info" style="margin-bottom: 10px; text-align: center; color: #666;">
<!-- {{ courseTableTotal }} 条记录--> {{ courseTableTotal }} 条记录
<!-- </div>--> </div>-->
<a-pagination <a-pagination
v-if="courseTableTotal > 0" v-if="courseTableTotal > 0"
:showSizeChanger="false" :showSizeChanger="false"
@@ -292,14 +294,14 @@ export default {
sorter: true sorter: true
}, },
{ {
title: "前台公共显示", title: "公共标签",
dataIndex: "isPublic", dataIndex: "isPublic",
key: "isPublic", key: "isPublic",
width: 150, width: 150,
align: "center" align: "center"
}, },
{ {
title: "热点标签展示", title: "课程库热点标签",
dataIndex: "isHot", dataIndex: "isHot",
key: "isHot", key: "isHot",
width: 150, width: 150,
@@ -1338,4 +1340,26 @@ export default {
} }
} }
} }
:deep(.centered-select .ant-select-selector) {
display: flex;
align-items: center;
height: 32px;
}
:deep(.centered-select .ant-select-selection-item),
:deep(.centered-select .ant-select-selection-placeholder) {
display: flex;
align-items: center;
line-height: 1;
}
:deep(.centered-select .ant-select-clear),
:deep(.centered-select .ant-select-arrow) {
display: flex;
align-items: center;
justify-content: center;
top: 50%;
transform: translateY(-50%);
}
</style> </style>