Skip to content

Commit 8a9bf25

Browse files
committed
fix: 一些布局
1 parent 3c40be0 commit 8a9bf25

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

MaiChartManager/Front/src/components/DragDropDispatcher/ReplaceChartModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export default defineComponent({
8585
show.value = "";
8686
const result = (await api.ReplaceChart(selectMusicId.value, level, selectedADir.value, { file, shift: tempOption.value.shift })).data;
8787
if (!result.fatal) {
88-
await showTransactionalDialog(t('music.edit.replaceChartSuccess'), '', undefined, true);
88+
addToast({ type:'success', message: t('music.edit.replaceChartSuccess') })
8989
} else {
9090
apiResp.value = result; // 用于在失败时显示错误信息
9191
show.value = "failed";
@@ -130,7 +130,7 @@ export default defineComponent({
130130
</div>}
131131
{show.value === "maidata" && <div>
132132
<ShiftModeSelector tempOptions={tempOption.value}></ShiftModeSelector>
133-
<div>{t('music.edit.replaceChartShiftModeHint')}</div>
133+
<div class="text-sm">{t('music.edit.replaceChartShiftModeHint')}</div>
134134
</div>}
135135
</div>,
136136
actions: () => <>

MaiChartManager/Front/src/views/Charts/ImportCreateChartButton/ImportChartButton/ShiftModeSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default defineComponent({
1717
})
1818

1919
return () => <div>
20-
<div class="ml-1 text-sm">{t('chart.import.option.shiftMode')}</div>
20+
<div class="text-sm">{t('chart.import.option.shiftMode')}</div>
2121
<div class="flex flex-col gap-2 w-full">
2222
<div class="flex gap-2 h-34px items-center">
2323
<Popover trigger="hover">

MaiChartManager/Front/src/views/GenreVersionManager/CreateButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ export default defineComponent({
7171
/>
7272
</div>
7373
</div>,
74-
actions: () => <div class="flex gap-2 justify-end">
74+
actions: () => <>
7575
<Button onClick={save}>{t('common.confirm')}</Button>
76-
</div>
76+
</>
7777
}}</Modal>
7878
</Button>
7979
)

MaiChartManager/Front/src/views/GenreVersionManager/GenreDisplay.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default defineComponent({
112112
}}
113113
/> :
114114
// contenteditable 的换行有疑难杂症
115-
<pre class="b b-gray-3 b-solid rounded-sm h-12 lh-normal box-content text-align-center flex items-center justify-center my-4">{props.genre.genreNameTwoLine}</pre>
115+
<pre class="b b-gray-3 b-solid rounded-sm h-12 lh-normal box-content text-align-center flex items-center justify-center my-4 bg-white">{props.genre.genreNameTwoLine}</pre>
116116
}
117117
<Buttons/>
118118
</div>

MaiChartManager/Front/src/views/ModManager/AquaMaiConfigurator.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ export default defineComponent({
158158
}) || [];
159159
});
160160

161-
return () => <div class="grid cols-[15em_auto] max-[900px]:cols-1">
161+
return () => <div class="grid cols-[15em_auto] rows-1 max-[900px]:cols-1 flex-1 min-h-0">
162162
{/* 左侧导航 */}
163-
<div class="flex flex-col gap-0.5 max-[900px]:hidden of-y-auto h-[calc(100dvh-80px)]">
163+
<div class="flex flex-col gap-0.5 max-[900px]:hidden of-y-auto h-full">
164164
{allTabs.value.map(tab =>
165165
<div
166166
key={tab.key}
@@ -174,7 +174,7 @@ export default defineComponent({
174174
</div>
175175
)}
176176
</div>
177-
<div class="flex flex-col h-[calc(100dvh-80px)]">
177+
<div class="flex flex-col h-full">
178178
<div class="flex gap-2 p-2 shrink-0">
179179
<div class={["min-[900px]:hidden"]}>
180180
<Popover trigger="click">{{

MaiChartManager/Front/src/views/ModManager/ConfigEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ export default defineComponent({
125125
editorPart = <AquaMaiConfigurator config={config.value!} useNewSort={true}/>
126126
}
127127

128-
return <div class="flex flex-col gap-2 h-full of-y-auto">
129-
{!!modInfo.value && <div class="flex flex-col gap-2">
128+
return <div class="flex flex-col gap-2 flex-1 min-h-0">
129+
{!!modInfo.value && <div class="flex flex-col gap-2 flex-1 min-h-0">
130130
<div class="flex gap-2 items-center flex-wrap">
131131
<span class="max-[1060px]:hidden">MelonLoader:</span>
132132
{modInfo.value.melonLoaderInstalled ? <span class="c-green-6 max-[1060px]:hidden">{t('mod.installed')}</span> : <span class="c-red-6">{t('mod.notInstalled')}</span>}

MaiChartManager/Front/src/views/ModManager/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default defineComponent({
1515
if (shouldShowUpdate.value) return 'warning'
1616
})
1717

18-
return () => <div class="p-xy h-100dvh of-y-auto">
18+
return () => <div class="p-xy h-100dvh flex flex-col of-hidden">
1919
{modInfo.value && <ConfigEditor />}
2020
</div>;
2121
}

0 commit comments

Comments
 (0)