Skip to content

Commit 7492bdb

Browse files
committed
Update padding and button spacing
1 parent 1707cfb commit 7492bdb

3 files changed

Lines changed: 33 additions & 24 deletions

File tree

www/src/components/layout/Layout.vue

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -331,41 +331,29 @@ onBeforeUnmount(() => {
331331
.layout-content {
332332
flex: 1;
333333
min-height: 0;
334-
padding: var(--gi-spacing-md);
334+
padding: var(--gi-spacing-lg);
335335
background: var(--gi-color-page-bg);
336336
overflow: auto;
337337
}
338338
339339
.layout-content-inner {
340340
min-height: calc(
341-
100vh - var(--gi-layout-header-height) - var(--gi-spacing-md) - var(--gi-spacing-md)
341+
100vh - var(--gi-layout-header-height) - var(--gi-spacing-lg) - var(--gi-spacing-lg)
342342
);
343343
}
344344
345-
@media (min-width: 1440px) {
346-
.layout-content {
347-
padding: var(--gi-spacing-xl);
348-
}
349-
350-
.layout-content-inner {
351-
min-height: calc(
352-
100vh - var(--gi-layout-header-height) - var(--gi-spacing-xl) - var(--gi-spacing-xl)
353-
);
354-
}
355-
}
356-
357345
@media (max-width: 1023px) {
358346
.layout-header {
359347
padding-inline: var(--gi-spacing-sm);
360348
}
361349
362350
.layout-content {
363-
padding: var(--gi-spacing-sm);
351+
padding: var(--gi-spacing-md);
364352
}
365353
366354
.layout-content-inner {
367355
min-height: calc(
368-
100vh - var(--gi-layout-header-height) - var(--gi-spacing-sm) - var(--gi-spacing-sm)
356+
100vh - var(--gi-layout-header-height) - var(--gi-spacing-md) - var(--gi-spacing-md)
369357
);
370358
}
371359
}

www/src/views/orders/detail/HeaderExtra.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<template>
22
<!-- 工单操作按钮 -->
3-
<a-space wrap class="header-action-group">
3+
<a-space class="header-action-group">
44
<!-- 主操作按钮 -->
5-
<a-button v-if="showMainButton" type="primary" @click="openMainModal">
5+
<a-button v-if="showMainButton" type="primary" size="small" @click="openMainModal">
66
{{ uiData.btnTitle }}
77
</a-button>
88

99
<!-- 执行任务按钮 -->
1010
<a-tooltip title="点击加载执行任务" placement="top">
11-
<a-button v-if="showExecuteButton" @click="genOrderTasks" :loading="uiState.genOrderTasksLoading">
11+
<a-button v-if="showExecuteButton" size="small" @click="genOrderTasks" :loading="uiState.genOrderTasksLoading">
1212
执行
1313
</a-button>
1414
</a-tooltip>
1515

1616
<!-- 已完成按钮 -->
1717
<a-tooltip title="标记当前工单为完成状态" placement="top">
18-
<a-button v-if="showCompleteFailButton" @click="openCompleteModal"> 已完成 </a-button>
18+
<a-button v-if="showCompleteFailButton" size="small" @click="openCompleteModal"> 已完成 </a-button>
1919
</a-tooltip>
2020

2121
<!-- 已失败按钮 -->
2222
<a-tooltip title="标记当前工单为失败状态" placement="top">
23-
<a-button v-if="showCompleteFailButton" @click="openFailModal"> 已失败 </a-button>
23+
<a-button v-if="showCompleteFailButton" size="small" @click="openFailModal"> 已失败 </a-button>
2424
</a-tooltip>
2525

2626
<!-- 转交按钮 -->
2727
<a-tooltip title="转交当前工单给其他人执行" placement="top">
28-
<a-button v-if="showTransferButton" @click="openTransferModal"> 转交 </a-button>
28+
<a-button v-if="showTransferButton" size="small" @click="openTransferModal"> 转交 </a-button>
2929
</a-tooltip>
3030

3131
<!-- 撤销按钮 -->
3232
<a-tooltip title="撤销当前工单" placement="top">
33-
<a-button v-if="!revokeDisabled" @click="openRevokeModal"> 撤销 </a-button>
33+
<a-button v-if="!revokeDisabled" size="small" @click="openRevokeModal"> 撤销 </a-button>
3434
</a-tooltip>
3535

3636
<!-- 复制工单 -->
3737
<a-tooltip title="快速复制当前工单为一个新的工单" placement="top">
38-
<a-button @click="handleCopyAsNewOrder"> 复制工单 </a-button>
38+
<a-button size="small" @click="handleCopyAsNewOrder"> 复制工单 </a-button>
3939
</a-tooltip>
4040
</a-space>
4141

@@ -358,6 +358,8 @@ const handleCopyAsNewOrder = () => {
358358
359359
<style scoped>
360360
.header-action-group {
361+
align-items: center;
362+
flex-wrap: nowrap;
361363
gap: var(--gi-spacing-xs) var(--gi-spacing-sm);
362364
}
363365

www/src/views/orders/detail/OrderDetail.vue

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,19 @@ onMounted(async () => {
124124
box-shadow: var(--gi-shadow-sm);
125125
}
126126
127+
.components-page-header-responsive :deep(.ant-page-header-heading) {
128+
align-items: center;
129+
}
130+
131+
.components-page-header-responsive :deep(.ant-page-header-heading-title) {
132+
align-items: center;
133+
}
134+
135+
.components-page-header-responsive :deep(.ant-page-header-heading-extra) {
136+
display: flex;
137+
align-items: center;
138+
}
139+
127140
.detail-section-card {
128141
margin-top: var(--gi-spacing-ssm);
129142
border-radius: var(--gi-radius-card);
@@ -140,4 +153,10 @@ onMounted(async () => {
140153
.order-logs-container :deep(.ant-timeline-item-content) {
141154
color: var(--gi-color-text-secondary);
142155
}
156+
157+
@media (min-width: 992px) {
158+
.components-page-header-responsive :deep(.ant-page-header-heading) {
159+
flex-wrap: nowrap;
160+
}
161+
}
143162
</style>

0 commit comments

Comments
 (0)