release 1.1.0

pull/40/head
ruibaby 2019-09-11 21:26:51 +08:00
parent d96a7f6a73
commit bdd85b05ed
8 changed files with 64 additions and 8 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "halo-admin",
"version": "1.1.0-beta.3",
"version": "1.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "halo-admin",
"version": "1.1.0-beta.3",
"version": "1.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",

View File

@ -182,4 +182,4 @@ themeApi.exists = template => {
})
}
export default themeApi
export default themeApi

View File

@ -108,6 +108,22 @@
:loading="loading"
:pagination="false"
>
<template
slot="author"
slot-scope="text,record"
>
<a-icon
type="user"
v-if="record.isAdmin"
style="margin-right: 3px;"
/>
<a
:href="record.authorUrl"
target="_blank"
v-if="record.authorUrl"
>{{ text }}</a>
<span v-else>{{ text }}</span>
</template>
<p
class="comment-content-wrapper"
slot="content"
@ -272,7 +288,8 @@ import commentApi from '@/api/comment'
const postColumns = [
{
title: '昵称',
dataIndex: 'author'
dataIndex: 'author',
scopedSlots: { customRender: 'author' }
},
{
title: '内容',
@ -308,7 +325,8 @@ const postColumns = [
const sheetColumns = [
{
title: '昵称',
dataIndex: 'author'
dataIndex: 'author',
scopedSlots: { customRender: 'author' }
},
{
title: '内容',

View File

@ -18,9 +18,22 @@
:href="item.authorUrl"
target="_blank"
>{{ item.author }}</a> 发表在 <a
v-if="item.post.status=='PUBLISHED'"
:href="options.blog_url+'/archives/'+item.post.url"
target="_blank"
>{{ item.post.title }}</a>
>{{ item.post.title }}</a><a
v-else-if="item.post.status=='INTIMATE'"
:href="options.blog_url+'/archives/'+item.post.url+'/password'"
target="_blank"
>{{ item.post.title }}</a><a
v-else-if="item.post.status=='DRAFT'"
href="javascript:void(0)"
@click="handlePostPreview(item.post.id)"
>{{ item.post.title }}</a><a
v-else
href="javascript:void(0)"
>{{ item.post.title }}</a>
</template>
<template
slot="author"
@ -30,8 +43,16 @@
:href="item.authorUrl"
target="_blank"
>{{ item.author }}</a> 发表在 <a
v-if="item.sheet.status=='PUBLISHED'"
:href="options.blog_url+'/s/'+item.sheet.url"
target="_blank"
>{{ item.sheet.title }}</a><a
v-else-if="item.sheet.status=='DRAFT'"
href="javascript:void(0)"
@click="handleSheetPreview(item.sheet.id)"
>{{ item.sheet.title }}</a><a
v-else
href="javascript:void(0)"
>{{ item.sheet.title }}</a>
</template>
<!-- <template slot="actions">
@ -56,6 +77,8 @@
<script>
import { mapGetters } from 'vuex'
import commentApi from '@/api/comment'
import postApi from '@/api/post'
import sheetApi from '@/api/sheet'
import marked from 'marked'
export default {
@ -95,6 +118,16 @@ export default {
this.comments = response.data.data
this.loading = false
})
},
handlePostPreview(postId) {
postApi.preview(postId).then(response => {
window.open(response.data, '_blank')
})
},
handleSheetPreview(sheetId) {
sheetApi.preview(sheetId).then(response => {
window.open(response.data, '_blank')
})
}
}
}

View File

@ -143,14 +143,14 @@ export default {
}
})
}
themeApi.getContent(this.selectedTheme.id,file.path).then(response => {
themeApi.getContent(this.selectedTheme.id, file.path).then(response => {
this.content = response.data.data
this.file = file
this.buttonDisabled = false
})
},
handlerSaveContent() {
themeApi.saveContent(this.selectedTheme.id,this.file.path, this.content).then(response => {
themeApi.saveContent(this.selectedTheme.id, this.file.path, this.content).then(response => {
this.$message.success('保存成功!')
})
}

View File

@ -141,6 +141,7 @@
v-if="record.topPriority!=0"
theme="twoTone"
twoToneColor="red"
style="margin-right: 3px;"
/>
<a
v-if="record.status=='PUBLISHED'"

View File

@ -155,6 +155,10 @@ export default {
}
],
steps: [
{
date: '2019-09-11',
content: 'Halo v1.1.0 发布'
},
{
date: '2019-07-09',
content: 'Halo v1.0.3 发布'