@@ -132,39 +114,36 @@
- {{ title }}
-
+ {{ title }}
+
+
-
+
-
- 发布
-
-
+ 发布
+
-
-
-
-
-
-
- 更多选项
-
+
+
+
+
+
+
+
+ 更多选项
+
+
+
@@ -175,21 +154,11 @@
v-model="selectCommentVisible"
>
-
- 回复
-
+ 回复
-
+
@@ -203,23 +172,16 @@
destroyOnClose
@close="()=>this.commentVisiable = false"
>
-
+
-
+
{{ journal.content }}
{{ journal.createTime | moment }}
-
+
{
@@ -360,10 +347,10 @@ export default {
this.handleCommentShow(this.journal)
})
},
- createOrUpdateJournal() {
- // 给属性填充数据
- this.journal.photos = this.journalPhotos
-
+ createOrUpdateJournal() {
+ // 给属性填充数据
+ this.journal.photos = this.journalPhotos
+
if (this.journal.id) {
journalApi.update(this.journal.id, this.journal).then(response => {
this.$message.success('更新成功！')
@@ -373,6 +360,7 @@ export default {
journalApi.create(this.journal).then(response => {
this.$message.success('发表成功！')
this.loadJournals()
+ this.photoList = []
})
}
this.visible = false
@@ -389,11 +377,17 @@ export default {
}
}
}
-
-
From d811428f0a2adc30c72afed529ea381728476304 Mon Sep 17 00:00:00 2001
From: guqing <1484563614@qq.com>
Date: Wed, 26 Jun 2019 16:59:20 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C?=
=?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=9B=BE=E7=89=87=E5=88=99=E4=B8=8D=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/AttachmentDetailDrawer.vue | 37 +++++++++++++++++--
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/views/attachment/components/AttachmentDetailDrawer.vue b/src/views/attachment/components/AttachmentDetailDrawer.vue
index 9ff754c2..7d9e347c 100644
--- a/src/views/attachment/components/AttachmentDetailDrawer.vue
+++ b/src/views/attachment/components/AttachmentDetailDrawer.vue
@@ -18,7 +18,8 @@
:paragraph="{rows: 8}"
>
-
![]()
+
此文件不支持预览
+
![]()
-
![]()
+
当前格式不支持预览
+
![]()
此文件不支持预览
-
![]()
+
![]()
+
+
@@ -149,18 +154,41 @@
import { mixin, mixinDevice } from '@/utils/mixin.js'
import attachmentApi from '@/api/attachment'
import photoApi from '@/api/photo'
+import 'video.js/dist/video-js.css'
+import { videoPlayer } from 'vue-video-player'
export default {
name: 'AttachmentDetailDrawer',
mixins: [mixin, mixinDevice],
+ components: {
+ videoPlayer
+ },
data() {
return {
detailLoading: true,
editable: false,
photo: {},
photoPreviewVisible: false,
- vedioPreviewVisible: false,
- nonsupportPreviewVisible: false
+ videoPreviewVisible: false,
+ nonsupportPreviewVisible: false,
+ playerOptions: {
+ // videojs options
+ muted: true,
+ language: 'zh-CN',
+ aspectRatio: '16:9',
+ fluid: true,
+ controls: true,
+ loop: false,
+ muted: false,
+ playbackRates: [0.7, 1.0, 1.5, 2.0],
+ sources: [{
+ type: "video/mp4",
+ src: "https://cdn.theguardian.tv/webM/2015/07/20/150716YesMen_synd_768k_vp8.webm"
+ }],
+ poster: "/static/images/author.jpg",
+ width: document.documentElement.clientWidth,
+ notSupportedMessage: '此视频暂无法播放，请稍后再试'
+ }
}
},
model: {
@@ -186,6 +214,11 @@ export default {
created() {
this.loadSkeleton()
},
+ computed: {
+ player() {
+ return this.$refs.videoPlayer.player
+ }
+ },
watch: {
visiable: function(newValue, oldValue) {
this.$log.debug('old value', oldValue)
@@ -197,8 +230,7 @@ export default {
attachment: function(newValue, oldValue) {
if (newValue) {
var attachment = newValue
- var mediaType = attachment.mediaType
- this.handleJudgeMediaType(mediaType)
+ this.handleJudgeMediaType(attachment)
}
}
},
@@ -262,20 +294,29 @@ export default {
onClose() {
this.$emit('close', false)
},
- handleJudgeMediaType(mediaType) {
+ handleJudgeMediaType(attachment) {
+ var mediaType = attachment.mediaType
// 判断文件类型
if(mediaType) {
var prefix = mediaType.split('/')[0]
if(prefix === 'video' || prefix==='flv') {
- this.vedioPreviewVisible = true
+ this.videoPreviewVisible = true
+ this.photoPreviewVisible = false
this.nonsupportPreviewVisible = false
+ // 设置视频地址
+ this.$set(this.playerOptions.sources, 0, {
+ type: mediaType,
+ src: attachment.path
+ })
+ console.log(this.playerOptions.sources)
} else if(prefix === 'image') {
this.photoPreviewVisible = true
+ this.videoPreviewVisible = false
this.nonsupportPreviewVisible = false
} else {
this.nonsupportPreviewVisible = true
- this.vedioPreviewVisible = false
+ this.videoPreviewVisible = false
this.photoPreviewVisible = false
}
}
@@ -288,4 +329,7 @@ export default {
.attach-detail-img img {
width: 100%;
}
+.video-player-box {
+ width: 100%;
+}
From 6bf343286ce1d1a8dd65f44ca080c5558e5d138f Mon Sep 17 00:00:00 2001
From: guqing <1484563614@qq.com>
Date: Wed, 26 Jun 2019 22:44:25 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8Deslint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/attachment/AttachmentList.vue | 12 ++---
.../components/AttachmentDetailDrawer.vue | 46 ++++++++++++-------
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/views/attachment/AttachmentList.vue b/src/views/attachment/AttachmentList.vue
index 85aa9c2e..3626e3bf 100644
--- a/src/views/attachment/AttachmentList.vue
+++ b/src/views/attachment/AttachmentList.vue
@@ -247,18 +247,18 @@ export default {
handleJudgeMediaType(attachment) {
var mediaType = attachment.mediaType
// 判断文件类型
- if(mediaType) {
+ if (mediaType) {
var prefix = mediaType.split('/')[0]
-
- if(prefix === 'image') {
+
+ if (prefix === 'image') {
// 是图片
- return true
+ return true
} else {
- // 非图片
+ // 非图片
return false
}
}
- //没有获取到文件返回false
+ // 没有获取到文件返回false
return false
}
}
diff --git a/src/views/attachment/components/AttachmentDetailDrawer.vue b/src/views/attachment/components/AttachmentDetailDrawer.vue
index bcda0731..ba0d8427 100644
--- a/src/views/attachment/components/AttachmentDetailDrawer.vue
+++ b/src/views/attachment/components/AttachmentDetailDrawer.vue
@@ -20,11 +20,13 @@
此文件不支持预览
![]()
-
-
+
+
@@ -179,13 +181,12 @@ export default {
fluid: true,
controls: true,
loop: false,
- muted: false,
playbackRates: [0.7, 1.0, 1.5, 2.0],
sources: [{
- type: "video/mp4",
- src: "https://cdn.theguardian.tv/webM/2015/07/20/150716YesMen_synd_768k_vp8.webm"
+ type: 'video/mp4',
+ src: 'https://cdn.theguardian.tv/webM/2015/07/20/150716YesMen_synd_768k_vp8.webm'
}],
- poster: "/static/images/author.jpg",
+ poster: '/static/images/author.jpg',
width: document.documentElement.clientWidth,
notSupportedMessage: '此视频暂无法播放，请稍后再试'
}
@@ -297,10 +298,10 @@ export default {
handleJudgeMediaType(attachment) {
var mediaType = attachment.mediaType
// 判断文件类型
- if(mediaType) {
+ if (mediaType) {
var prefix = mediaType.split('/')[0]
-
- if(prefix === 'video' || prefix==='flv') {
+
+ if (prefix === 'video' || prefix === 'flv') {
this.videoPreviewVisible = true
this.photoPreviewVisible = false
this.nonsupportPreviewVisible = false
@@ -310,10 +311,10 @@ export default {
src: attachment.path
})
console.log(this.playerOptions.sources)
- } else if(prefix === 'image') {
- this.photoPreviewVisible = true
- this.videoPreviewVisible = false
- this.nonsupportPreviewVisible = false
+ } else if (prefix === 'image') {
+ this.photoPreviewVisible = true
+ this.videoPreviewVisible = false
+ this.nonsupportPreviewVisible = false
} else {
this.nonsupportPreviewVisible = true
this.videoPreviewVisible = false
@@ -321,6 +322,19 @@ export default {
}
}
}
+ // handleDownLoadPhoto(attachment) {
+ // var path = attachment.path
+
+ // var index = path.lastIndexOf('/')
+ // var filename = path.substr(index+1, path.length)
+ // // chrome/firefox
+ // var aTag = document.createElement('a')
+ // aTag.download = filename
+ // aTag.href = path//URL.createObjectURL(blob)
+ // aTag.target = '_blank'
+ // aTag.click()
+ // URL.revokeObjectURL(aTag.href)
+ // }
}
}
From 11b9e2c119150f06d50ca28d542cbe9b6565feab Mon Sep 17 00:00:00 2001
From: ruibaby
Date: Sun, 30 Jun 2019 13:00:29 +0800
Subject: [PATCH 06/16] Encode when copy attachment url.
---
src/views/attachment/components/AttachmentDetailDrawer.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 = ``
+ const text = `})`
this.$copyText(text)
.then(message => {
console.log('copy', message)
From 24ebf4199d64e211a02ddc2ea765a777b7e2e34d Mon Sep 17 00:00:00 2001
From: ruibaby
Date: Sun, 30 Jun 2019 13:36:51 +0800
Subject: [PATCH 07/16] Fixed #28
---
src/views/comment/components/CommentTab.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
index c7da82f4..584081c1 100644
--- a/src/views/comment/components/CommentTab.vue
+++ b/src/views/comment/components/CommentTab.vue
@@ -408,7 +408,11 @@ export default {
this.selectComment = comment
this.replyCommentVisible = true
this.replyComment.parentId = comment.id
- this.replyComment.postId = comment.post.id
+ if (this.type === 'posts') {
+ this.replyComment.postId = comment.post.id
+ } else {
+ this.replyComment.postId = comment.sheet.id
+ }
},
handleCreateClick() {
commentApi.create(this.type, this.replyComment).then(response => {
From ed5af4484059b9f01313410a301b04eeb717a417 Mon Sep 17 00:00:00 2001
From: ruibaby
Date: Sun, 30 Jun 2019 23:33:34 +0800
Subject: [PATCH 08/16] Support select gravatar.
---
.../components/AttachmentSelectDrawer.vue | 16 +++++++++++++++-
src/views/user/Profile.vue | 7 +++++++
2 files changed, 22 insertions(+), 1 deletion(-)
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"
>