diff --git a/package-lock.json b/package-lock.json index 0ca2d5ad..547348a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "halo-admin", - "version": "1.0.2", + "version": "1.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 18eb587f..0d1f9621 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-admin", - "version": "1.0.2", + "version": "1.0.3", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/components/global.less b/src/components/global.less index 1e33d699..929a6ab8 100644 --- a/src/components/global.less +++ b/src/components/global.less @@ -697,4 +697,15 @@ body { p{ margin-bottom: 0; } +} + +.post-thum { + .img { + width: 100%; + cursor: pointer; + border-radius: 4px; + } + .post-thum-remove { + margin-top: 16px; + } } \ No newline at end of file diff --git a/src/views/attachment/components/AttachmentDetailDrawer.vue b/src/views/attachment/components/AttachmentDetailDrawer.vue index ba0d8427..4495ce7b 100644 --- a/src/views/attachment/components/AttachmentDetailDrawer.vue +++ b/src/views/attachment/components/AttachmentDetailDrawer.vue @@ -260,7 +260,7 @@ export default { this.editable = false }, handleCopyNormalLink() { - const text = `${this.attachment.path}` + const text = `${encodeURI(this.attachment.path)}` this.$copyText(text) .then(message => { console.log('copy', message) @@ -272,7 +272,7 @@ export default { }) }, handleCopyMarkdownLink() { - const text = `![${this.attachment.name}](${this.attachment.path})` + const text = `![${this.attachment.name}](${encodeURI(this.attachment.path)})` this.$copyText(text) .then(message => { console.log('copy', message) diff --git a/src/views/attachment/components/AttachmentSelectDrawer.vue b/src/views/attachment/components/AttachmentSelectDrawer.vue index 8bddba89..e31f2079 100644 --- a/src/views/attachment/components/AttachmentSelectDrawer.vue +++ b/src/views/attachment/components/AttachmentSelectDrawer.vue @@ -47,8 +47,14 @@ @change="handlePaginationChange" > - +
+ 使用 Gravatar {{ post.title }} { diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue index 2c31458d..bb1de14c 100644 --- a/src/views/dashboard/Dashboard.vue +++ b/src/views/dashboard/Dashboard.vue @@ -202,24 +202,24 @@ - + 保存 - 更多选项 + >更多选项 --> @@ -508,4 +508,7 @@ export default { margin-left: 15px; text-decoration: none; } + a { + text-decoration: none; + } diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue index 41df9b6f..d27d4542 100644 --- a/src/views/interface/ThemeList.vue +++ b/src/views/interface/ThemeList.vue @@ -427,9 +427,7 @@ export default { this.themeConfiguration = response.data.data themeApi.fetchSettings(theme.id).then(response => { this.themeSettings = response.data.data - setTimeout(() => { - this.visible = true this.optionLoading = false }, 300) }) diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue index 3eeb5559..baed7cf0 100644 --- a/src/views/post/PostEdit.vue +++ b/src/views/post/PostEdit.vue @@ -199,7 +199,6 @@ import FooterToolBar from '@/components/FooterToolbar' import { mixin, mixinDevice } from '@/utils/mixin.js' import { toolbars } from '@/core/const' import 'mavon-editor/dist/css/index.css' -import tagApi from '@/api/tag' import categoryApi from '@/api/category' import postApi from '@/api/post' import optionApi from '@/api/option' @@ -226,7 +225,6 @@ export default { postSettingVisible: false, thumDrawerVisible: false, categoryForm: false, - tags: [], categories: [], selectedCategoryIds: [], selectedTagIds: [], @@ -238,7 +236,6 @@ export default { } }, created() { - this.loadTags() this.loadCategories() this.loadOptions() clearInterval(this.timer) @@ -273,11 +270,6 @@ export default { }) }, methods: { - loadTags() { - tagApi.listAll(true).then(response => { - this.tags = response.data.data - }) - }, loadCategories() { categoryApi.listAll().then(response => { this.categories = response.data.data @@ -365,15 +357,4 @@ export default { z-index: 1000; min-height: 580px; } - -.post-thum { - .img { - width: 100%; - cursor: pointer; - border-radius: 4px; - } - .post-thum-remove { - margin-top: 16px; - } -} diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue index c838e910..c9fdfc87 100644 --- a/src/views/post/PostList.vue +++ b/src/views/post/PostList.vue @@ -128,12 +128,27 @@ :loading="postsLoading" :pagination="false" > - {{ postTitle }} + slot-scope="text,record" + > + {{ text }} + --> + + + {{ text }} + + 删除 + + + + 设置
@@ -223,16 +245,170 @@
+ + +
+
+

基本设置

+
+ + + + + + + + + + 开启 + 关闭 + + + +
+
+ + +
+

分类目录

+
+ +
+ + + + + + + + + + + + 保存 + 新增 + 取消 + + +
+
+
+ + +
+

标签

+
+ + + + + +
+
+ + +
+

摘要

+
+ + + + + +
+
+ + +
+

缩略图

+
+
+ + 移除 +
+
+
+ +
+ +
+ 保存 +
+
+ diff --git a/src/views/post/components/TagSelect.vue b/src/views/post/components/TagSelect.vue index 245f80c3..c960710b 100644 --- a/src/views/post/components/TagSelect.vue +++ b/src/views/post/components/TagSelect.vue @@ -42,7 +42,14 @@ export default { }, created() { this.loadTags() - this.selectedTagNames = this.tagIds.map(tagId => this.tagIdMap[tagId].name) + }, + watch: { + tags(newValue, oldValue) { + // 解决tags未赋上值就使用导致的取值报错问题 + if (newValue) { + this.selectedTagNames = this.tagIds.map(tagId => this.tagIdMap[tagId].name) + } + } }, computed: { tagIdMap() { diff --git a/src/views/sheet/SheetList.vue b/src/views/sheet/SheetList.vue index c858c5c7..4c33157b 100644 --- a/src/views/sheet/SheetList.vue +++ b/src/views/sheet/SheetList.vue @@ -96,6 +96,18 @@ :dataSource="formattedSheets" :pagination="false" > + + + {{ text }} + + {{ statusProperty.text }} - + diff --git a/src/views/sheet/internal/JournalList.vue b/src/views/sheet/internal/JournalList.vue index fb89bac0..3e69ca6b 100644 --- a/src/views/sheet/internal/JournalList.vue +++ b/src/views/sheet/internal/JournalList.vue @@ -41,7 +41,7 @@ > - example - + --> - + diff --git a/src/views/system/About.vue b/src/views/system/About.vue index 0e3f7a94..8862c8af 100644 --- a/src/views/system/About.vue +++ b/src/views/system/About.vue @@ -136,9 +136,23 @@ export default { avatar: '//cn.gravatar.com/avatar/08cf681fb7c6ad1b4fe70a8269c2103c?s=256&d=mm', website: 'https://www.apkdv.com', github: 'https://github.com/appdev' + }, + { + name: 'guqing', + avatar: '//cn.gravatar.com/avatar/ad062ba572c8b006bfd2cbfc43fdee5e?s=256&d=mm', + website: 'http://www.guqing.xyz', + github: 'https://github.com/guqing' } ], steps: [ + { + date: '2019-07-09', + content: 'Halo v1.0.3 发布' + }, + { + date: '2019-07-08', + content: 'Star 数达到 6500' + }, { date: '2019-06-01', content: '1.0 正式版发布' diff --git a/src/views/user/Profile.vue b/src/views/user/Profile.vue index b71dba44..7a302378 100644 --- a/src/views/user/Profile.vue +++ b/src/views/user/Profile.vue @@ -138,7 +138,9 @@ @@ -149,6 +151,7 @@ import userApi from '@/api/user' import adminApi from '@/api/admin' import optionApi from '@/api/option' import { mapMutations } from 'vuex' +import MD5 from 'md5.js' export default { components: { @@ -217,6 +220,10 @@ export default { handleSelectAvatar(data) { this.user.avatar = data.path this.attachmentDrawerVisible = false + }, + handleSelectGravatar() { + this.user.avatar = '//cn.gravatar.com/avatar/' + new MD5().update(this.user.email).digest('hex') + '&d=mm' + this.attachmentDrawerVisible = false } } }