github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

update package.json

pull/9/head
ruibaby 2019-05-08 21:41:38 +08:00
parent 787c7bd917 bb4f88bd03
commit 287b805c2f
9 changed files with 57 additions and 11044 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
package-lock.json generated
View File

@ -10716,11 +10716,6 @@
"integrity": "sha1-vsECT4WxvZbL6kBbI8FK1kQ6b4E=",
"dev": true
},
"lodash.get": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
},
"lodash.kebabcase": {
"version": "4.1.1",
"resolved": "http://registry.npm.taobao.org/lodash.kebabcase/download/lodash.kebabcase-4.1.1.tgz",
@ -10843,6 +10838,11 @@
"object-visit": "^1.0.0"
}
},
"marked": {
"version": "0.6.2",
"resolved": "https://registry.npm.taobao.org/marked/download/marked-0.6.2.tgz",
"integrity": "sha1-xXS+i1Rai0hkFFbKHb4ON7bczBo="
},
"math-random": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
@ -13555,7 +13555,8 @@
"version": "4.0.8",
"resolved": "http://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true
"dev": true,
"optional": true
},
"rx-lite-aggregates": {
"version": "4.0.8",
@ -15485,11 +15486,6 @@
}
}
},
"vue-fragment": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.0.tgz",
"integrity": "sha512-nobmbbOSOx59fm7U00BDz14Yvqitwx7NPQGYDTKg3+dNDGTDCRNy/q2kfr5hV4S0l4fQG0kvC+rbCmENLmHUSA=="
},
"vue-hot-reload-api": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz",
@ -15558,11 +15554,6 @@
"integrity": "sha512-We9ZLSYPQx9y3v5+HNWyjkGFaxZMlWPTqYBU08y4YT46f453BQ4JxIoS8rV0a8PIxnKap7m/YIzrdIfoHxrpaA==",
"dev": true
},
"vue-svg-component-runtime": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/vue-svg-component-runtime/-/vue-svg-component-runtime-1.0.1.tgz",
"integrity": "sha512-TkmZ1qwFeFJSRH6b6KVqDU2f8DCSdoNoo/veKqog7FsyF0UETTI66ALKX1rrLXy/KT6LSaJB5IfZkuuSfaQsEA=="
},
"vue-svg-icon-loader": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/vue-svg-icon-loader/-/vue-svg-icon-loader-2.1.1.tgz",

1
package.json
View File

@ -13,6 +13,7 @@
"ant-design-vue": "~1.3.8",
"axios": "^0.18.0",
"enquire.js": "^2.1.6",
"marked": "^0.6.2",
"mavon-editor": "^2.7.4",
"moment": "^2.24.0",
"nprogress": "^0.2.0",

12
src/components/Tools/HeaderComment.vue
View File

@ -11,7 +11,7 @@
>
<template slot="content">
<a-spin :spinning="loadding">
<a-list :dataSource="comments">
<a-list :dataSource="converttedComments">
<a-list-item
slot="renderItem"
slot-scope="item"
@ -56,6 +56,8 @@
<script>
import commentApi from '@/api/comment'
import marked from 'marked'
export default {
name: 'HeaderComment',
data() {
@ -68,6 +70,14 @@ export default {
created() {
this.getComment()
},
computed: {
converttedComments() {
return this.comments.map(comment => {
comment.content = marked(comment.content, { sanitize: true })
return comment
})
}
},
methods: {
fetchComment() {
if (!this.visible) {

2
src/store/modules/user.js
View File

@ -40,7 +40,7 @@ const user = {
},
actions: {
loadUser({ commit }) {
return Promise((resolve, reject) => {
return new Promise((resolve, reject) => {
userApi
.getProfile()
.then(response => {

3
src/views/comment/CommentList.vue
View File

@ -240,6 +240,8 @@
<script>
import { PageView } from '@/layouts'
import commentApi from '@/api/comment'
import marked from 'marked'
const columns = [
{
title: '昵称',
@ -307,6 +309,7 @@ export default {
formattedComments() {
return this.comments.map(comment => {
comment.statusProperty = this.commentStatus[comment.status]
comment.content = marked(comment.content, { sanitize: true })
return comment
})
}

9
src/views/dashboard/Dashboard.vue
View File

@ -138,7 +138,7 @@
</span>
<a-list
itemLayout="horizontal"
:dataSource="commentData"
:dataSource="formmatedCommentData"
>
<a-list-item
slot="renderItem"
@ -332,6 +332,7 @@
import { PageView } from '@/layouts'
import AnalysisCard from './components/AnalysisCard'
import { mixin, mixinDevice } from '@/utils/mixin.js'
import marked from 'marked'
import postApi from '@/api/post'
import commentApi from '@/api/comment'
@ -393,6 +394,12 @@ export default {
log.type = this.logType[log.type].text
return log
})
},
formmatedCommentData() {
return this.commentData.map(comment => {
comment.content = marked(comment.content, { sanitize: true })
return comment
})
}
},
methods: {

40
src/views/post/PostEdit.vue
View File

@ -271,7 +271,7 @@ export default {
this.categories = response.data.data
})
},
createOrUpdatePost() {
createOrUpdatePost(createSuccess, updateSuccess) {
// Set category ids
this.postToStage.categoryIds = this.selectedCategoryIds
// Set tag ids
@ -281,17 +281,27 @@ export default {
// Update the post
postApi.update(this.postToStage.id, this.postToStage).then(response => {
this.$log.debug('Updated post', response.data.data)
this.$message.success('文章更新成功')
if (updateSuccess) {
updateSuccess()
}
})
} else {
// Create the post
postApi.create(this.postToStage).then(response => {
this.$log.debug('Created post', response.data.data)
this.$message.success('文章创建成功')
if (createSuccess) {
createSuccess()
}
this.postToStage = response.data.data
})
}
},
savePost() {
this.createOrUpdatePost(() => this.$message.success('文章创建成功'), () => this.$message.success('文章更新成功'))
},
autoSavePost() {
this.createOrUpdatePost()
},
handleShowDrawer() {
this.visible = true
},
@ -331,24 +341,18 @@ export default {
autoSaveTimer() {
if (this.timer == null) {
this.timer = setInterval(() => {
if (this.postToStage.title != null && this.postToStage.originalContent != null) {
this.postToStage.categoryIds = this.selectedCategoryIds
this.postToStage.tagIds = this.selectedTagIds
if (this.postToStage.id) {
postApi.update(this.postToStage.id, this.postToStage).then(response => {
this.$log.debug('Auto updated post', response.data.data)
})
} else {
postApi.create(this.postToStage).then(response => {
this.$log.debug('Auto saved post', response.data.data)
this.postToStage = response.data.data
})
}
}
this.autoSavePost()
}, 15000)
}
}
},
beforeRouteLeave(to, from, next) {
if (this.timer !== null) {
clearInterval(this.timer)
}
// Auto save the post
this.autoSavePost()
next()
}
}
</script>

5
src/views/system/OptionForm.vue
View File

@ -571,6 +571,7 @@ import AttachmentSelectDrawer from '../attachment/components/AttachmentSelectDra
import optionApi from '@/api/option'
import mailApi from '@/api/mail'
import attachmentApi from '@/api/attachment'
import { mapActions } from 'vuex'
export default {
components: {
@ -598,6 +599,7 @@ export default {
this.loadOptions()
},
methods: {
...mapActions(['loadUser']),
loadOptions() {
optionApi.listAll().then(response => {
this.options = response.data.data
@ -607,11 +609,12 @@ export default {
handleSaveOptions() {
optionApi.save(this.options).then(response => {
this.loadOptions()
this.loadUser()
this.$message.success('保存成功！')
})
},
handleAttachChange(e) {
switch (e.toUppper()) {
switch (e) {
case 'LOCAL':
case 'SMMS':
this.upyunFormHidden = false

11006
yarn.lock
View File

File diff suppressed because it is too large Load Diff