diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-01-15 23:18:14 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-01-15 23:18:14 +0900 |
| commit | 005d6b4ccff43141b65ce0e257b95474746c9d60 (patch) | |
| tree | d94a1a3f20beda4c6e5f2feb530e1c12f87790aa /src | |
| parent | :art: (diff) | |
| download | sharkey-005d6b4ccff43141b65ce0e257b95474746c9d60.tar.gz sharkey-005d6b4ccff43141b65ce0e257b95474746c9d60.tar.bz2 sharkey-005d6b4ccff43141b65ce0e257b95474746c9d60.zip | |
pageのノート埋め込みの「詳細な表示」オプションが機能していない問題を修正
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/components/page/page.note.vue | 7 | ||||
| -rw-r--r-- | src/client/pages/page-editor/els/page-editor.el.note.vue | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/client/components/page/page.note.vue b/src/client/components/page/page.note.vue index b4b6a9efcd..27c1f1ed66 100644 --- a/src/client/components/page/page.note.vue +++ b/src/client/components/page/page.note.vue @@ -1,17 +1,20 @@ <template> <div class="voxdxuby"> - <XNote v-if="note" v-model:note="note" :key="note.id" :detail="value.detailed"/> + <XNote v-if="note && !value.detailed" v-model:note="note" :key="note.id + ':normal'"/> + <XNoteDetailed v-if="note && value.detailed" v-model:note="note" :key="note.id + ':detail'"/> </div> </template> <script lang="ts"> import { defineComponent } from 'vue'; import XNote from '@/components/note.vue'; +import XNoteDetailed from '@/components/note-detailed.vue'; import * as os from '@/os'; export default defineComponent({ components: { - XNote + XNote, + XNoteDetailed, }, props: { value: { diff --git a/src/client/pages/page-editor/els/page-editor.el.note.vue b/src/client/pages/page-editor/els/page-editor.el.note.vue index 7e6f8ca681..4f45f3b5fd 100644 --- a/src/client/pages/page-editor/els/page-editor.el.note.vue +++ b/src/client/pages/page-editor/els/page-editor.el.note.vue @@ -9,7 +9,8 @@ </MkInput> <MkSwitch v-model:value="value.detailed"><span>{{ $ts._pages.blocks._note.detailed }}</span></MkSwitch> - <XNote v-if="note" v-model:note="note" :key="note.id + ':' + (value.detailed ? 'detailed' : 'normal')" :detail="value.detailed" style="margin-bottom: 16px;"/> + <XNote v-if="note && !value.detailed" v-model:note="note" :key="note.id + ':normal'" style="margin-bottom: 16px;"/> + <XNoteDetailed v-if="note && value.detailed" v-model:note="note" :key="note.id + ':detail'" style="margin-bottom: 16px;"/> </section> </XContainer> </template> @@ -21,11 +22,12 @@ import XContainer from '../page-editor.container.vue'; import MkInput from '@/components/ui/input.vue'; import MkSwitch from '@/components/ui/switch.vue'; import XNote from '@/components/note.vue'; +import XNoteDetailed from '@/components/note-detailed.vue'; import * as os from '@/os'; export default defineComponent({ components: { - XContainer, MkInput, MkSwitch, XNote + XContainer, MkInput, MkSwitch, XNote, XNoteDetailed, }, props: { |