diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-05-30 17:37:38 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-05-30 17:37:38 +0900 |
| commit | f2d9e3105db3215da77881162b6627032456a46f (patch) | |
| tree | 305ad442824a055e90043341195ef43b77a94a38 | |
| parent | fix(backend): 「アクセストークンの管理」画面でアプリの情... (diff) | |
| download | misskey-f2d9e3105db3215da77881162b6627032456a46f.tar.gz misskey-f2d9e3105db3215da77881162b6627032456a46f.tar.bz2 misskey-f2d9e3105db3215da77881162b6627032456a46f.zip | |
fix(frontend): Pagesのコンテンツが表示されない・作成や編集ができない問題を修正
Fix #10908
| -rw-r--r-- | packages/frontend/src/components/page/page.block.vue | 12 | ||||
| -rw-r--r-- | packages/frontend/src/components/page/page.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/page-editor/page-editor.blocks.vue | 12 |
3 files changed, 23 insertions, 3 deletions
diff --git a/packages/frontend/src/components/page/page.block.vue b/packages/frontend/src/components/page/page.block.vue index dddb9d76bc..2bf3d12daa 100644 --- a/packages/frontend/src/components/page/page.block.vue +++ b/packages/frontend/src/components/page/page.block.vue @@ -1,5 +1,5 @@ <template> -<component :is="'x-' + block.type" :key="block.id" :page="page" :block="block" :h="h"/> +<component :is="getComponent(block.type)" :key="block.id" :page="page" :block="block" :h="h"/> </template> <script lang="ts" setup> @@ -11,6 +11,16 @@ import XImage from './page.image.vue'; import XNote from './page.note.vue'; import { Block } from './block.type'; +function getComponent(type: string) { + switch (type) { + case 'text': return XText; + case 'section': return XSection; + case 'image': return XImage; + case 'note': return XNote; + default: return null; + } +} + defineProps<{ block: Block, h: number, diff --git a/packages/frontend/src/components/page/page.vue b/packages/frontend/src/components/page/page.vue index a6d3ff6359..c2c2693224 100644 --- a/packages/frontend/src/components/page/page.vue +++ b/packages/frontend/src/components/page/page.vue @@ -1,6 +1,6 @@ <template> <div :class="{ [$style.center]: page.alignCenter, [$style.serif]: page.font === 'serif' }"> - <XBlock v-for="child in page.content" :key="child.id" :block="child" :h="2"/> + <XBlock v-for="child in page.content" :key="child.id" :page="page" :block="child" :h="2"/> </div> </template> diff --git a/packages/frontend/src/pages/page-editor/page-editor.blocks.vue b/packages/frontend/src/pages/page-editor/page-editor.blocks.vue index 24b9cb4065..fc945b3d63 100644 --- a/packages/frontend/src/pages/page-editor/page-editor.blocks.vue +++ b/packages/frontend/src/pages/page-editor/page-editor.blocks.vue @@ -3,7 +3,7 @@ <template #item="{element}"> <div :class="$style.item"> <!-- divが無いとエラーになる https://github.com/SortableJS/vue.draggable.next/issues/189 --> - <component :is="'x-' + element.type" :modelValue="element" @update:modelValue="updateItem" @remove="() => removeItem(element)"/> + <component :is="getComponent(element.type)" :modelValue="element" @update:modelValue="updateItem" @remove="() => removeItem(element)"/> </div> </template> </Sortable> @@ -16,6 +16,16 @@ import XText from './els/page-editor.el.text.vue'; import XImage from './els/page-editor.el.image.vue'; import XNote from './els/page-editor.el.note.vue'; +function getComponent(type: string) { + switch (type) { + case 'section': return XSection; + case 'text': return XText; + case 'image': return XImage; + case 'note': return XNote; + default: return null; + } +} + const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default)); const props = defineProps<{ |