release 1.1.0-beta.2

pull/40/head
ruibaby 2019-09-01 21:35:54 +08:00
parent 9e43dfdf69
commit 884964eadf
5 changed files with 25 additions and 23 deletions

View File

@ -136,10 +136,10 @@ themeApi.getContent = path => {
themeApi.saveContent = (path, content) => { themeApi.saveContent = (path, content) => {
return service({ return service({
url: `${baseUrl}/files/content`, url: `${baseUrl}/files/content`,
params: { data: {
path: path path: path,
content: content
}, },
data: content,
method: 'put' method: 'put'
}) })
} }

View File

@ -689,7 +689,8 @@ body {
} }
} }
.post-thumb,.sheet-thumb { .post-thumb,
.sheet-thumb {
.img { .img {
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
@ -697,7 +698,8 @@ body {
} }
} }
.post-thumb-remove,.sheet-thumb-remove { .post-thumb-remove,
.sheet-thumb-remove {
margin-top: 16px; margin-top: 16px;
} }
@ -719,6 +721,7 @@ body {
overflow: hidden; overflow: hidden;
float: left; float: left;
cursor: pointer; cursor: pointer;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;

View File

@ -520,12 +520,12 @@ export default {
} }
</script> </script>
<style scoped="scoped"> <style lang="less" scoped>
.more-options-btn { /* .more-options-btn {
margin-left: 15px; margin-left: 15px;
text-decoration: none; text-decoration: none;
} }
a { a {
text-decoration: none; text-decoration: none;
} } */
</style> </style>

View File

@ -167,6 +167,7 @@
:sm="24" :sm="24"
:xs="24" :xs="24"
v-if="viewMode" v-if="viewMode"
style="padding-bottom: 50px;"
> >
<a-card <a-card
:bordered="true" :bordered="true"
@ -179,7 +180,8 @@
scrolling="auto" scrolling="auto"
border="0" border="0"
:src="options.blog_url" :src="options.blog_url"
style="width:100%;height:1000px;overflow-y:hidden;" width="100%"
:height="clientHeight-165"
> </iframe> > </iframe>
</a-card> </a-card>
</a-col> </a-col>
@ -196,14 +198,14 @@
:style="{ width : '100%'}" :style="{ width : '100%'}"
> >
<a-button <a-button
v-if="theme.activated && viewMode" v-if="!this.isMobile() && theme.activated && viewMode"
type="primary" type="primary"
@click="toggleViewMode" @click="toggleViewMode"
style="marginRight: 8px" style="marginRight: 8px"
ghost ghost
>普通模式</a-button> >普通模式</a-button>
<a-button <a-button
v-else-if="theme.activated && !viewMode" v-else-if="!this.isMobile() && theme.activated && !viewMode"
type="dashed" type="dashed"
@click="toggleViewMode" @click="toggleViewMode"
style="marginRight: 8px" style="marginRight: 8px"
@ -248,7 +250,8 @@ export default {
viewMode: false, viewMode: false,
formColValue: 12, formColValue: 12,
options: [], options: [],
keys: ['blog_url'] keys: ['blog_url'],
clientHeight: document.documentElement.clientHeight
} }
}, },
model: { model: {
@ -285,6 +288,11 @@ export default {
this.settingLoading = false this.settingLoading = false
}, 500) }, 500)
}, },
loadOptions() {
optionApi.listAll(this.keys).then(response => {
this.options = response.data.data
})
},
initData() { initData() {
this.settingLoading = true this.settingLoading = true
@ -318,7 +326,8 @@ export default {
this.attachmentDrawerVisible = false this.attachmentDrawerVisible = false
}, },
toggleViewMode() { toggleViewMode() {
if (!this.viewMode) { this.viewMode = !this.viewMode
if (this.viewMode) {
this.formColValue = 4 this.formColValue = 4
this.wrapperCol = { this.wrapperCol = {
xl: { span: 24 }, xl: { span: 24 },
@ -335,12 +344,6 @@ export default {
xs: { span: 24 } xs: { span: 24 }
} }
} }
this.viewMode = !this.viewMode
},
loadOptions() {
optionApi.listAll(this.keys).then(response => {
this.options = response.data.data
})
} }
} }
} }

View File

@ -6,10 +6,6 @@
:checkedKeys="categoryIds" :checkedKeys="categoryIds"
@check="onCheck" @check="onCheck"
> >
<span
slot="title0010"
style="color: #1890ff"
>sss</span>
</a-tree> </a-tree>
</template> </template>