From c1361131a66b7b488af331650977eeb47838075f Mon Sep 17 00:00:00 2001 From: guqing <1484563614@qq.com> Date: Sat, 12 Oct 2019 23:01:51 +0800 Subject: [PATCH 01/10] Fixed a bug that could not change the contents of the input box after selecting an attachment --- src/views/interface/components/ThemeSetting.vue | 3 ++- src/views/system/OptionForm.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/interface/components/ThemeSetting.vue b/src/views/interface/components/ThemeSetting.vue index fa23f37b..61019373 100644 --- a/src/views/interface/components/ThemeSetting.vue +++ b/src/views/interface/components/ThemeSetting.vue @@ -317,7 +317,8 @@ export default { this.attachmentDrawerVisible = true }, handleSelectAttachment(data) { - this.themeSettings[this.selectedField] = encodeURI(data.path) + this.$set(this.themeSettings, this.selectedField, encodeURI(data.path)) + // this.themeSettings[this.selectedField] = encodeURI(data.path) this.attachmentDrawerVisible = false }, toggleViewMode() { diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue index 79f7159c..1df412bb 100644 --- a/src/views/system/OptionForm.vue +++ b/src/views/system/OptionForm.vue @@ -1198,7 +1198,7 @@ export default { } }, handleSelectLogo(data) { - this.options.blog_logo = encodeURI(data.path) + this.$set(this.options, 'blog_logo', encodeURI(data.path)) this.logoDrawerVisible = false }, handleTestMailClick() { From 5b9bbe053c521014637de22403bc9dde118a487c Mon Sep 17 00:00:00 2001 From: ruibaby Date: Wed, 16 Oct 2019 10:43:09 +0800 Subject: [PATCH 02/10] Refactor password input. --- package.json | 8 +++--- src/views/post/components/PostSetting.vue | 31 +---------------------- src/views/system/OptionForm.vue | 31 +++++------------------ src/views/user/Profile.vue | 15 +++-------- 4 files changed, 14 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index d30350bd..df39e680 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ }, "dependencies": { "animate.css": "^3.7.0", - "ant-design-vue": "^1.3.16", + "ant-design-vue": "^1.4.0", "axios": "^0.18.0", "enquire.js": "^2.1.6", - "filepond": "^4.6.1", - "filepond-plugin-image-preview": "^4.4.0", + "filepond": "^4.7.2", + "filepond-plugin-image-preview": "^4.5.0", "halo-editor": "^2.7.6", "marked": "^0.6.3", "moment": "^2.24.0", @@ -26,7 +26,7 @@ "vue-count-to": "^1.0.13", "vue-filepond": "^5.1.3", "vue-ls": "^3.2.1", - "vue-router": "^3.1.2", + "vue-router": "^3.1.3", "vue-video-player": "^5.0.2", "vuejs-logger": "^1.5.3", "vuex": "^3.1.1" diff --git a/src/views/post/components/PostSetting.vue b/src/views/post/components/PostSetting.vue index 1715fb51..7c381c33 100644 --- a/src/views/post/components/PostSetting.vue +++ b/src/views/post/components/PostSetting.vue @@ -31,31 +31,7 @@ - - - - - - - - - - + @@ -239,7 +215,6 @@ export default { thumbDrawerVisible: false, categoryFormVisible: false, settingLoading: true, - passwordVisible: false, selectedPost: this.post, selectedTagIds: this.tagIds, selectedCategoryIds: this.categoryIds, @@ -417,12 +392,8 @@ export default { }) } }, - togglePasswordVisible() { - this.passwordVisible = !this.passwordVisible - }, onClose() { this.$emit('close', false) - this.passwordVisible = false }, onPostDateChange(value, dateString) { this.selectedPost.createTime = value.valueOf() diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue index 1df412bb..332ac349 100644 --- a/src/views/system/OptionForm.vue +++ b/src/views/system/OptionForm.vue @@ -333,10 +333,7 @@ label="操作员密码:" :wrapper-col="wrapperCol" > - + - + - + - + - + @@ -660,11 +645,7 @@ label="邮箱密码:" :wrapper-col="wrapperCol" > - + - + - + - + Date: Wed, 16 Oct 2019 12:57:30 +0800 Subject: [PATCH 03/10] Refactor post list layout in mobile. --- src/views/post/PostList.vue | 171 +++++++++++++++++++++- src/views/post/components/PostSetting.vue | 31 +++- src/views/sheet/internal/JournalList.vue | 2 - src/views/system/OptionForm.vue | 31 +++- src/views/user/Profile.vue | 15 +- 5 files changed, 237 insertions(+), 13 deletions(-) diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue index 1278bf31..a38a65e1 100644 --- a/src/views/post/PostList.vue +++ b/src/views/post/PostList.vue @@ -77,7 +77,7 @@ icon="plus" >写文章 - +
+ + + + + + + + + + + + {{ item.title }} + + + {{ item.title }} + + + {{ item.title }} + + + {{ item.title }} + + + + + + {{ item.summary }}... + +
+
+ {{ category.name }} +
+ {{ tag.name }} + +
+
+ + - + + + + + + + + + + @@ -214,6 +238,7 @@ export default { return { thumbDrawerVisible: false, categoryFormVisible: false, + passwordVisible: false, settingLoading: true, selectedPost: this.post, selectedTagIds: this.tagIds, @@ -392,8 +417,12 @@ export default { }) } }, + togglePasswordVisible() { + this.passwordVisible = !this.passwordVisible + }, onClose() { this.$emit('close', false) + this.passwordVisible = false }, onPostDateChange(value, dateString) { this.selectedPost.createTime = value.valueOf() diff --git a/src/views/sheet/internal/JournalList.vue b/src/views/sheet/internal/JournalList.vue index 5bbbe41f..9431231b 100644 --- a/src/views/sheet/internal/JournalList.vue +++ b/src/views/sheet/internal/JournalList.vue @@ -101,7 +101,6 @@ {{ item.likes }} @@ -113,7 +112,6 @@ > {{ item.commentCount }} diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue index 332ac349..1df412bb 100644 --- a/src/views/system/OptionForm.vue +++ b/src/views/system/OptionForm.vue @@ -333,7 +333,10 @@ label="操作员密码:" :wrapper-col="wrapperCol" > - + - + - + - + - +
@@ -645,7 +660,11 @@ label="邮箱密码:" :wrapper-col="wrapperCol" > - + - + - + - + Date: Wed, 16 Oct 2019 21:25:33 +0800 Subject: [PATCH 04/10] Refactor sheet/links/comments list layout in mobile. --- src/views/comment/components/CommentTab.vue | 138 +++++++++++- src/views/sheet/SheetList.vue | 232 ++++++++++++++++++++ src/views/sheet/internal/LinkList.vue | 77 ++++++- 3 files changed, 444 insertions(+), 3 deletions(-) diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue index 3c67c527..d041f193 100644 --- a/src/views/comment/components/CommentTab.vue +++ b/src/views/comment/components/CommentTab.vue @@ -54,7 +54,7 @@
- +
+ + + + + + + + + +   + {{ item.author }} +  {{ item.createTime | timeAgo }} + + +  {{ item.author }} {{ item.createTime | timeAgo }} + + +

+
+
+ 内置页面 + + + + + + + + + {{ item.title }} + {{ item.title }} + + + + + + + 自定义页面 + + + + + + + + + + + + {{ item.title }} + + + {{ item.title }} + + + {{ item.title }} + + + {{ item.title }} + + + + + + + + + - + @@ -71,8 +74,76 @@ :xs="24" :style="{ 'padding-bottom': '12px' }" > - + + + + + + + + + + {{ item.name }} + + + {{ item.url }} + + +