Skip to content

Commit 70aab93

Browse files
clanstyclansty
committed
fix: ci
1 parent eddc53c commit 70aab93

13 files changed

Lines changed: 44 additions & 24 deletions

File tree

‎.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"i18n-ally.localesPaths": [
3+
"MuConvert/i18n",
4+
"MuNET-UI/src/i18n",
5+
"ChuChartManager/Front/src/locales"
6+
]
7+
}

‎ChuChartManager/Front/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"sass": "^1.90.0",
3232
"typescript": "^6.0.0",
3333
"unocss": "^66.0.0",
34-
"vite": "^8.0.0"
34+
"vite": "^8.0.0",
35+
"vue-tsc": "^3.2.9"
3536
}
3637
}

‎ChuChartManager/Front/src/components/DirSelect.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default defineComponent({
4444
<div class="flex gap-2">
4545
<div class="flex-1">
4646
<Select value={props.value} options={options.value}
47-
onUpdate:value={(v: string) => emit('update:value', v)} />
47+
onChange={(v: string) => emit('update:value', v)} />
4848
</div>
4949
<Button onClick={() => { showCreate.value = true; newDirId.value = 1 }}>
5050
<span class="i-mdi-plus text-3.5" />
@@ -54,7 +54,7 @@ export default defineComponent({
5454
show={showCreate.value}
5555
title={t('optionDir.create')}
5656
width="min(90vw, 20em)"
57-
onClose={() => { showCreate.value = false }}
57+
onUpdateShow={(v) => { if (!v) showCreate.value = false }}
5858
>
5959
<div class="p-4 flex flex-col gap-3">
6060
<div class="flex gap-2 items-center">

‎ChuChartManager/Front/src/main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import '@unocss/reset/tailwind-compat.css'
22
import 'virtual:uno.css'
3-
import '@fontsource/noto-sans-sc'
4-
import '@fontsource/quicksand'
3+
import '@fontsource/noto-sans-sc/index.css'
4+
import '@fontsource/quicksand/index.css'
55
import { createApp } from 'vue'
66
import App from './App.vue'
77
import './global.sass'

‎ChuChartManager/Front/src/views/BatchAction/MusicSelector.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Button, TextInput } from '@munet/ui'
44
import { useI18n } from 'vue-i18n'
55
import { getJacketUrl, type MusicListItem } from '@/api'
66
import { sidebarActive, selectedSource, selectMusicId } from '@/store/refs'
7-
import _ from 'lodash-es'
7+
import * as _ from 'lodash-es'
88

99
const LEVEL_COLORS = ['#22c55e', '#f59e0b', '#ef4444', '#a855f7', '#1e1e1e', '#6366f1']
1010

@@ -37,7 +37,7 @@ export default defineComponent({
3737
{
3838
title: 'Opt', key: 'assetDir', width: 100,
3939
filterOptions: _.uniq(props.musicList.map(m => m.assetDir)).map(v => ({ label: v, value: v })),
40-
filter(value: string, row: MusicListItem) { return row.assetDir === value },
40+
filter(value, row: MusicListItem) { return row.assetDir === value },
4141
},
4242
{
4343
title: 'ID', key: 'id', width: 100,
@@ -46,7 +46,7 @@ export default defineComponent({
4646
{ label: 'Standard (0-7999)', value: 'std' },
4747
{ label: "World's End (8000+)", value: 'we' },
4848
],
49-
filter(value: string, row: MusicListItem) {
49+
filter(value, row: MusicListItem) {
5050
return value === 'std' ? row.id < 8000 : row.id >= 8000
5151
},
5252
},
@@ -71,8 +71,8 @@ export default defineComponent({
7171
{
7272
title: t('batch.colCharts'), key: 'charts', width: '16em',
7373
filterOptions: ['BASIC', 'ADVANCED', 'EXPERT', 'MASTER', 'ULTIMA', "WORLD'S END"].map((label, value) => ({ label, value })),
74-
filter(value: number, row: MusicListItem) {
75-
const f = row.fumens[value]
74+
filter(value, row: MusicListItem) {
75+
const f = row.fumens[value as number]
7676
return f != null && f.enable
7777
},
7878
render: (row: MusicListItem) => (

‎ChuChartManager/Front/src/views/Course/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export default defineComponent({
339339
show={showCreateModal.value}
340340
title={t('course.createCourse')}
341341
width="min(60vw, 42em)"
342-
onClose={() => { showCreateModal.value = false }}
342+
onUpdateShow={(v) => { if (!v) showCreateModal.value = false }}
343343
>
344344
<div class="flex flex-col gap-3 p-2">
345345
<div>
@@ -373,7 +373,7 @@ export default defineComponent({
373373
show={showMusicPicker.value}
374374
title={t('course.selectMusic')}
375375
width="min(70vw, 48em)"
376-
onClose={() => { showMusicPicker.value = false }}
376+
onUpdateShow={(v) => { if (!v) showMusicPicker.value = false }}
377377
>
378378
<div class="flex flex-col gap-3 p-2">
379379
<TextInput v-model:value={musicSearch.value} placeholder={t('course.searchMusic')} />

‎ChuChartManager/Front/src/views/Event/index.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ export default defineComponent({
703703
show={showCreateEvent.value}
704704
title={t('event.createEvent')}
705705
width="min(90vw, 28em)"
706-
onClose={() => { showCreateEvent.value = false }}
706+
onUpdateShow={(v) => { if (!v) showCreateEvent.value = false }}
707707
>
708708
<div class="p-4 flex flex-col gap-3">
709709
<div>
@@ -733,7 +733,7 @@ export default defineComponent({
733733
show={showCreateMap.value}
734734
title={t('event.createMap')}
735735
width="min(90vw, 28em)"
736-
onClose={() => { showCreateMap.value = false }}
736+
onUpdateShow={(v) => { if (!v) showCreateMap.value = false }}
737737
>
738738
<div class="p-4 flex flex-col gap-3">
739739
<div>
@@ -759,7 +759,7 @@ export default defineComponent({
759759
show={showDeleteEvent.value}
760760
title={t('event.deleteEvent')}
761761
width="min(90vw, 24em)"
762-
onClose={() => { showDeleteEvent.value = false }}
762+
onUpdateShow={(v) => { if (!v) showDeleteEvent.value = false }}
763763
>
764764
<div class="p-2">
765765
<p class="text-sm mb-4">
@@ -779,7 +779,7 @@ export default defineComponent({
779779
show={showDeleteMap.value}
780780
title={t('event.deleteMap')}
781781
width="min(90vw, 24em)"
782-
onClose={() => { showDeleteMap.value = false }}
782+
onUpdateShow={(v) => { if (!v) showDeleteMap.value = false }}
783783
>
784784
<div class="p-2">
785785
<p class="text-sm mb-4">

‎ChuChartManager/Front/src/views/LoginBonus/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ export default defineComponent({
275275
show={showCreateModal.value}
276276
title={t('loginBonus.createPreset')}
277277
width="min(90vw, 28em)"
278-
onClose={() => { showCreateModal.value = false }}
278+
onUpdateShow={(v) => { if (!v) showCreateModal.value = false }}
279279
>
280280
<div class="p-4 flex flex-col gap-3">
281281
<div>
@@ -301,7 +301,7 @@ export default defineComponent({
301301
show={showDeleteConfirm.value}
302302
title={t('loginBonus.deletePreset')}
303303
width="min(90vw, 24em)"
304-
onClose={() => { showDeleteConfirm.value = false }}
304+
onUpdateShow={(v) => { if (!v) showDeleteConfirm.value = false }}
305305
>
306306
<div class="p-2">
307307
<p class="text-sm mb-4">

‎ChuChartManager/Front/src/views/ModManager/ModEntry.vue‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,25 @@ const numericValue = computed({
2222
get: () => Number(value.value ?? 0),
2323
set: (next: number) => { value.value = next },
2424
})
25+
26+
const boolValue = computed({
27+
get: () => Boolean(value.value),
28+
set: (next: boolean) => { value.value = next },
29+
})
30+
31+
const stringValue = computed({
32+
get: () => String(value.value ?? ''),
33+
set: (next: string) => { value.value = next },
34+
})
2535
</script>
2636

2737
<template>
2838
<div class="flex gap-2 items-start pl-4">
2939
<div class="w-9em shrink-0 text-sm">{{ label }}</div>
3040
<div class="flex flex-col gap-2 w-full">
3141
<div class="flex gap-2 h-28px items-center">
32-
<CheckBox v-if="entry.type === 'bool'" v-model:value="value">
33-
{{ value ? $t('mods.on') : $t('mods.off') }}
42+
<CheckBox v-if="entry.type === 'bool'" v-model:value="boolValue">
43+
{{ boolValue ? $t('mods.on') : $t('mods.off') }}
3444
</CheckBox>
3545
<NumberInput
3646
v-else-if="entry.type === 'int'"
@@ -48,7 +58,7 @@ const numericValue = computed({
4858
:decimal="4"
4959
:step="0.1"
5060
/>
51-
<TextInput v-else v-model:value="value" class="w-full" />
61+
<TextInput v-else v-model:value="stringValue" class="w-full" />
5262
</div>
5363
<div v-if="description" class="text-sm op-80">{{ description }}</div>
5464
</div>

‎ChuChartManager/Front/src/views/ResourceManager/index.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ export default defineComponent({
132132
assetDir: s.assetDir,
133133
dirPath: '',
134134
hasImage: s.hasImage,
135+
rareType: 0,
135136
}))
136137
} else {
137138
resources.value = await getResourceList(activeType.value)
@@ -308,7 +309,7 @@ export default defineComponent({
308309
show={deleteTarget.value !== null}
309310
title={t('resource.deleteConfirm')}
310311
width="min(90vw, 24em)"
311-
onClose={() => { deleteTarget.value = null }}
312+
onUpdateShow={(v) => { if (!v) deleteTarget.value = null }}
312313
>
313314
<div class="p-2">
314315
<p class="text-sm mb-4">

0 commit comments

Comments
 (0)