diff --git a/src/components/GlobalFooter/GlobalFooter.vue b/src/components/GlobalFooter/GlobalFooter.vue index 58cf9e7b6..48c5e363a 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 6e2c9236c..5d212f609 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 03b81e688..d509bb3d7 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 53d611577..4f1aa180f 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 aee9abd82..1dd7ffc5f 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 37b4fd001..ee4456d16 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 8d8aeb318..b9fb2f334 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 3715314ed..531c94e37 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 672273821..642e2ebdf 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 c4a63eade..d316866ac 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 0d6a23693..78f46ffcb 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 7022fda26..fa23f37b1 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 ebcb8d257..18b9b7b2b 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 9ae79c687..c01647850 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 bbe003f1b..0043a9c79 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 2b731e7db..f1111a4ac 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 b2a6b1070..4e039df0c 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 ee1c3901f..6261e121d 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 c960710b0..9fd12330d 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 32c629256..3a3cba8de 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 b65e864c1..cd466520f 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 c51aed42a..7d14c0bb6 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 48d73b3a5..14a4657ce 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 f50defd9b..de455e3aa 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 410400a01..b0b49f209 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 b6a91910c..c55646410 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 6b94726ff..000d49523 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -148,7 +148,7 @@ export default { } } -