Refactor settings/menu to use Composition API (#8586)

* refactor(client): refactor settings/menu to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
This commit is contained in:
Andreas Nedbal 2022-05-04 03:12:40 +02:00 committed by GitHub
parent 8489afa3d7
commit 60010bdb0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,24 +1,24 @@
<template> <template>
<div class="_formRoot"> <div class="_formRoot">
<FormTextarea v-model="items" tall manual-save class="_formBlock"> <FormTextarea v-model="items" tall manual-save class="_formBlock">
<template #label>{{ $ts.menu }}</template> <template #label>{{ i18n.ts.menu }}</template>
<template #caption><button class="_textButton" @click="addItem">{{ $ts.addItem }}</button></template> <template #caption><button class="_textButton" @click="addItem">{{ i18n.ts.addItem }}</button></template>
</FormTextarea> </FormTextarea>
<FormRadios v-model="menuDisplay" class="_formBlock"> <FormRadios v-model="menuDisplay" class="_formBlock">
<template #label>{{ $ts.display }}</template> <template #label>{{ i18n.ts.display }}</template>
<option value="sideFull">{{ $ts._menuDisplay.sideFull }}</option> <option value="sideFull">{{ i18n.ts._menuDisplay.sideFull }}</option>
<option value="sideIcon">{{ $ts._menuDisplay.sideIcon }}</option> <option value="sideIcon">{{ i18n.ts._menuDisplay.sideIcon }}</option>
<option value="top">{{ $ts._menuDisplay.top }}</option> <option value="top">{{ i18n.ts._menuDisplay.top }}</option>
<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ $ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 --> <!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
</FormRadios> </FormRadios>
<FormButton danger class="_formBlock" @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton> <FormButton danger class="_formBlock" @click="reset()"><i class="fas fa-redo"></i> {{ i18n.ts.default }}</FormButton>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { computed, defineExpose, ref, watch } from 'vue';
import FormTextarea from '@/components/form/textarea.vue'; import FormTextarea from '@/components/form/textarea.vue';
import FormRadios from '@/components/form/radios.vue'; import FormRadios from '@/components/form/radios.vue';
import FormButton from '@/components/ui/button.vue'; import FormButton from '@/components/ui/button.vue';
@ -27,81 +27,60 @@ import { menuDef } from '@/menu';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
import { unisonReload } from '@/scripts/unison-reload'; import { unisonReload } from '@/scripts/unison-reload';
import { i18n } from '@/i18n';
export default defineComponent({ const items = ref(defaultStore.state.menu.join('\n'));
components: {
FormButton,
FormTextarea,
FormRadios,
},
emits: ['info'], const split = computed(() => items.value.trim().split('\n').filter(x => x.trim() !== ''));
const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
data() { async function reloadAsk() {
return { const { canceled } = await os.confirm({
[symbols.PAGE_INFO]: { type: 'info',
title: this.$ts.menu, text: i18n.ts.reloadToApplySetting
icon: 'fas fa-list-ul', });
bg: 'var(--bg)', if (canceled) return;
},
menuDef: menuDef,
items: defaultStore.state.menu.join('\n'),
}
},
computed: { unisonReload();
splited(): string[] { }
return this.items.trim().split('\n').filter(x => x.trim() !== '');
},
menuDisplay: defaultStore.makeGetterSetter('menuDisplay') async function addItem() {
}, const menu = Object.keys(menuDef).filter(k => !defaultStore.state.menu.includes(k));
const { canceled, result: item } = await os.select({
title: i18n.ts.addItem,
items: [...menu.map(k => ({
value: k, text: i18n.ts[menuDef[k].title]
})), {
value: '-', text: i18n.ts.divider
}]
});
if (canceled) return;
items.value = [...split.value, item].join('\n');
}
watch: { async function save() {
menuDisplay() { defaultStore.set('menu', split.value);
this.reloadAsk(); await reloadAsk();
}, }
items() { function reset() {
this.save(); defaultStore.reset('menu');
}, items.value = defaultStore.state.menu.join('\n');
}, }
methods: { watch(items, async () => {
async addItem() { await save();
const menu = Object.keys(this.menuDef).filter(k => !this.$store.state.menu.includes(k)); });
const { canceled, result: item } = await os.select({
title: this.$ts.addItem,
items: [...menu.map(k => ({
value: k, text: this.$ts[this.menuDef[k].title]
})), ...[{
value: '-', text: this.$ts.divider
}]]
});
if (canceled) return;
this.items = [...this.splited, item].join('\n');
},
save() { watch(menuDisplay, async () => {
this.$store.set('menu', this.splited); await reloadAsk();
this.reloadAsk(); });
},
reset() { defineExpose({
this.$store.reset('menu'); [symbols.PAGE_INFO]: {
this.items = this.$store.state.menu.join('\n'); title: i18n.ts.menu,
}, icon: 'fas fa-list-ul',
bg: 'var(--bg)',
async reloadAsk() { }
const { canceled } = await os.confirm({
type: 'info',
text: this.$ts.reloadToApplySetting,
showCancelButton: true
});
if (canceled) return;
unisonReload();
}
},
}); });
</script> </script>