diff --git a/src/components/GlobalFooter/GlobalFooter.vue b/src/components/GlobalFooter/GlobalFooter.vue index 58cf9e7b..48c5e363 100644 --- a/src/components/GlobalFooter/GlobalFooter.vue +++ b/src/components/GlobalFooter/GlobalFooter.vue @@ -1,6 +1,12 @@ - - diff --git a/src/views/attachment/components/AttachmentDrawer.vue b/src/views/attachment/components/AttachmentDrawer.vue index 6e2c9236..5d212f60 100644 --- a/src/views/attachment/components/AttachmentDrawer.vue +++ b/src/views/attachment/components/AttachmentDrawer.vue @@ -88,8 +88,8 @@ - - diff --git a/src/views/attachment/components/AttachmentSelectDrawer.vue b/src/views/attachment/components/AttachmentSelectDrawer.vue index 03b81e68..d509bb3d 100644 --- a/src/views/attachment/components/AttachmentSelectDrawer.vue +++ b/src/views/attachment/components/AttachmentSelectDrawer.vue @@ -183,6 +183,3 @@ export default { } } - - diff --git a/src/views/comment/CommentList.vue b/src/views/comment/CommentList.vue index 53d61157..4f1aa180 100644 --- a/src/views/comment/CommentList.vue +++ b/src/views/comment/CommentList.vue @@ -26,10 +26,6 @@ export default { components: { PageView, CommentTab - }, - data() { - return {} - }, - methods: {} + } } diff --git a/src/views/comment/components/CommentDetail.vue b/src/views/comment/components/CommentDetail.vue index aee9abd8..1dd7ffc5 100644 --- a/src/views/comment/components/CommentDetail.vue +++ b/src/views/comment/components/CommentDetail.vue @@ -202,5 +202,3 @@ export default { } } - diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue index 37b4fd00..ee4456d1 100644 --- a/src/views/comment/components/CommentTab.vue +++ b/src/views/comment/components/CommentTab.vue @@ -263,9 +263,9 @@ - - diff --git a/src/views/exception/404.vue b/src/views/exception/404.vue index 8d8aeb31..b9fb2f33 100644 --- a/src/views/exception/404.vue +++ b/src/views/exception/404.vue @@ -11,6 +11,3 @@ export default { } } - - diff --git a/src/views/exception/500.vue b/src/views/exception/500.vue index 3715314e..531c94e3 100644 --- a/src/views/exception/500.vue +++ b/src/views/exception/500.vue @@ -11,6 +11,3 @@ export default { } } - - diff --git a/src/views/interface/MenuList.vue b/src/views/interface/MenuList.vue index 67227382..642e2ebd 100644 --- a/src/views/interface/MenuList.vue +++ b/src/views/interface/MenuList.vue @@ -237,6 +237,3 @@ export default { } } - - diff --git a/src/views/interface/ThemeEdit.vue b/src/views/interface/ThemeEdit.vue index c4a63ead..d316866a 100644 --- a/src/views/interface/ThemeEdit.vue +++ b/src/views/interface/ThemeEdit.vue @@ -46,7 +46,12 @@ v-for="(theme,index) in themes" :key="index" :value="theme.id" - >{{ theme.name }} + >{{ theme.name }} + + - - diff --git a/src/views/interface/components/ThemeFile.vue b/src/views/interface/components/ThemeFile.vue index 0d6a2369..78f46ffc 100644 --- a/src/views/interface/components/ThemeFile.vue +++ b/src/views/interface/components/ThemeFile.vue @@ -56,11 +56,3 @@ export default { } } - - diff --git a/src/views/interface/components/ThemeSetting.vue b/src/views/interface/components/ThemeSetting.vue index 7022fda2..fa23f37b 100644 --- a/src/views/interface/components/ThemeSetting.vue +++ b/src/views/interface/components/ThemeSetting.vue @@ -219,9 +219,9 @@ - diff --git a/src/views/post/CategoryList.vue b/src/views/post/CategoryList.vue index ebcb8d25..18b9b7b2 100644 --- a/src/views/post/CategoryList.vue +++ b/src/views/post/CategoryList.vue @@ -239,6 +239,3 @@ export default { } } - - diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue index 9ae79c68..c0164785 100644 --- a/src/views/post/PostEdit.vue +++ b/src/views/post/PostEdit.vue @@ -108,6 +108,23 @@ export default { } }) }, + destroyed: function() { + if (this.postSettingVisible) { + this.postSettingVisible = false + } + if (this.attachmentDrawerVisible) { + this.attachmentDrawerVisible = false + } + }, + beforeRouteLeave(to, from, next) { + if (this.postSettingVisible) { + this.postSettingVisible = false + } + if (this.attachmentDrawerVisible) { + this.attachmentDrawerVisible = false + } + next() + }, methods: { handleSaveDraft() { this.postToStage.status = 'DRAFT' @@ -177,6 +194,3 @@ export default { } } - - diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue index bbe003f1..0043a9c7 100644 --- a/src/views/post/PostList.vue +++ b/src/views/post/PostList.vue @@ -408,6 +408,17 @@ export default { this.loadPosts() this.loadCategories() }, + destroyed: function() { + if (this.postSettingVisible) { + this.postSettingVisible = false + } + }, + beforeRouteLeave(to, from, next) { + if (this.postSettingVisible) { + this.postSettingVisible = false + } + next() + }, methods: { loadPosts() { this.postsLoading = true @@ -537,5 +548,3 @@ export default { } } - diff --git a/src/views/post/components/CategorySelectTree.vue b/src/views/post/components/CategorySelectTree.vue index 2b731e7d..f1111a4a 100644 --- a/src/views/post/components/CategorySelectTree.vue +++ b/src/views/post/components/CategorySelectTree.vue @@ -58,6 +58,3 @@ export default { } } - - diff --git a/src/views/post/components/CategoryTree.vue b/src/views/post/components/CategoryTree.vue index b2a6b107..4e039df0 100644 --- a/src/views/post/components/CategoryTree.vue +++ b/src/views/post/components/CategoryTree.vue @@ -52,6 +52,3 @@ export default { } } - - diff --git a/src/views/post/components/PostSetting.vue b/src/views/post/components/PostSetting.vue index ee1c3901..6261e121 100644 --- a/src/views/post/components/PostSetting.vue +++ b/src/views/post/components/PostSetting.vue @@ -401,5 +401,3 @@ export default { } } - diff --git a/src/views/post/components/TagSelect.vue b/src/views/post/components/TagSelect.vue index c960710b..9fd12330 100644 --- a/src/views/post/components/TagSelect.vue +++ b/src/views/post/components/TagSelect.vue @@ -105,6 +105,3 @@ export default { } } - - diff --git a/src/views/sheet/SheetEdit.vue b/src/views/sheet/SheetEdit.vue index 32c62925..3a3cba8d 100644 --- a/src/views/sheet/SheetEdit.vue +++ b/src/views/sheet/SheetEdit.vue @@ -98,6 +98,23 @@ export default { } }) }, + destroyed: function() { + if (this.sheetSettingVisible) { + this.sheetSettingVisible = false + } + if (this.attachmentDrawerVisible) { + this.attachmentDrawerVisible = false + } + }, + beforeRouteLeave(to, from, next) { + if (this.sheetSettingVisible) { + this.sheetSettingVisible = false + } + if (this.attachmentDrawerVisible) { + this.attachmentDrawerVisible = false + } + next() + }, methods: { handleSaveDraft() { this.sheetToStage.status = 'DRAFT' @@ -158,5 +175,3 @@ export default { } } - diff --git a/src/views/sheet/SheetList.vue b/src/views/sheet/SheetList.vue index b65e864c..cd466520 100644 --- a/src/views/sheet/SheetList.vue +++ b/src/views/sheet/SheetList.vue @@ -245,8 +245,8 @@ - diff --git a/src/views/sheet/components/SheetSetting.vue b/src/views/sheet/components/SheetSetting.vue index c51aed42..7d14c0bb 100644 --- a/src/views/sheet/components/SheetSetting.vue +++ b/src/views/sheet/components/SheetSetting.vue @@ -125,10 +125,6 @@ export default { customTpls: [] } }, - // model: { - // prop: 'visible', - // event: 'close' - // }, props: { sheet: { type: Object, @@ -250,5 +246,3 @@ export default { } } - diff --git a/src/views/sheet/internal/LinkList.vue b/src/views/sheet/internal/LinkList.vue index 48d73b3a..14a4657c 100644 --- a/src/views/sheet/internal/LinkList.vue +++ b/src/views/sheet/internal/LinkList.vue @@ -201,6 +201,3 @@ export default { } } - - diff --git a/src/views/sheet/internal/PhotoList.vue b/src/views/sheet/internal/PhotoList.vue index f50defd9..de455e3a 100644 --- a/src/views/sheet/internal/PhotoList.vue +++ b/src/views/sheet/internal/PhotoList.vue @@ -272,8 +272,8 @@ - diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue index 410400a0..b0b49f20 100644 --- a/src/views/system/OptionForm.vue +++ b/src/views/system/OptionForm.vue @@ -749,6 +749,23 @@ export default { mounted() { this.loadFormOptions() }, + destroyed: function() { + if (this.faviconDrawerVisible) { + this.faviconDrawerVisible = false + } + if (this.logoDrawerVisible) { + this.logoDrawerVisible = false + } + }, + beforeRouteLeave(to, from, next) { + if (this.faviconDrawerVisible) { + this.faviconDrawerVisible = false + } + if (this.logoDrawerVisible) { + this.logoDrawerVisible = false + } + next() + }, methods: { ...mapActions(['loadUser', 'loadOptions']), loadFormOptions() { diff --git a/src/views/system/ToolList.vue b/src/views/system/ToolList.vue index b6a91910..c5564641 100644 --- a/src/views/system/ToolList.vue +++ b/src/views/system/ToolList.vue @@ -73,6 +73,3 @@ export default { } } - - diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 6b94726f..000d4952 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -148,7 +148,7 @@ export default { } } -