github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-2.3' into chore/release-2.3.2

pull/912/head
Ryan Wang 2023-03-15 12:09:37 +08:00 committed by GitHub
parent 24dac5be8b b33268997d
commit b14fc0af1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/contents/pages/SinglePageEditor.vue
View File

@ -48,6 +48,7 @@ const handleChangeEditorProvider = (provider: EditorProvider) => {
formState.value.page.metadata.annotations = { formState.value.page.metadata.annotations = {
"content.halo.run/preferred-editor": provider.name, "content.halo.run/preferred-editor": provider.name,
}; };
formState.value.content.rawType = provider.rawType;
}; };
// SinglePage form // SinglePage form
@ -208,6 +209,8 @@ const handleFetchContent = async () => {
name: formState.value.page.metadata.name, name: formState.value.page.metadata.name,
}); });
formState.value.content = Object.assign(formState.value.content, data);
// get editor provider // get editor provider
if (!currentEditorProvider.value) { if (!currentEditorProvider.value) {
const preferredEditor = editorProviders.value.find( const preferredEditor = editorProviders.value.find(
@ -249,8 +252,6 @@ const handleFetchContent = async () => {
} }
await nextTick(); await nextTick();
} }
formState.value.content = Object.assign(formState.value.content, data);
}; };
// SinglePage settings // SinglePage settings

5
src/modules/contents/posts/PostEditor.vue
View File

@ -48,6 +48,7 @@ const handleChangeEditorProvider = (provider: EditorProvider) => {
formState.value.post.metadata.annotations = { formState.value.post.metadata.annotations = {
"content.halo.run/preferred-editor": provider.name, "content.halo.run/preferred-editor": provider.name,
}; };
formState.value.content.rawType = provider.rawType;
}; };
// Post form // Post form
@ -213,6 +214,8 @@ const handleFetchContent = async () => {
name: formState.value.post.metadata.name, name: formState.value.post.metadata.name,
}); });
formState.value.content = Object.assign(formState.value.content, data);
// get editor provider // get editor provider
if (!currentEditorProvider.value) { if (!currentEditorProvider.value) {
const preferredEditor = editorProviders.value.find( const preferredEditor = editorProviders.value.find(
@ -256,8 +259,6 @@ const handleFetchContent = async () => {
await nextTick(); await nextTick();
} }
formState.value.content = Object.assign(formState.value.content, data);
}; };
const handleOpenSettingModal = async () => { const handleOpenSettingModal = async () => {