release: 1.3.1

pull/3445/head
ruibaby 2020-03-28 15:45:50 +08:00
parent 95ca384767
commit dfa0d91007
6 changed files with 21 additions and 14 deletions

View File

@ -1,2 +1,2 @@
NODE_ENV=production NODE_ENV=production
PUBLIC_PATH=https://cdn.jsdelivr.net/npm/halo-admin@1.3.0/dist/ PUBLIC_PATH=https://cdn.jsdelivr.net/npm/halo-admin@1.3.1/dist/

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "halo-admin", "name": "halo-admin",
"version": "1.3.0", "version": "1.3.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "halo-admin", "name": "halo-admin",
"version": "1.3.0", "version": "1.3.1",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",

View File

@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<meta name="robots" content="noindex,nofllow" /> <meta name="robots" content="noindex,nofllow" />
<meta name="generator" content="Halo 1.3.0" /> <meta name="generator" content="Halo 1.3.1" />
<link rel="icon" href="<%= BASE_URL %>logo.png" /> <link rel="icon" href="<%= BASE_URL %>logo.png" />
<title>Halo Dashboard</title> <title>Halo Dashboard</title>
<style> <style>

View File

@ -26,7 +26,7 @@
</a-form-item> </a-form-item>
<a-form-item <a-form-item
label="页面别名:" label="页面别名:"
:help="options.blog_url+'/'+options.sheet_prefix+'/'+ (selectedSheet.slug ? selectedSheet.slug : '{slug}')+options.path_suffix" :help="options.blog_url+'/'+options.sheet_prefix+'/'+ (selectedSheet.slug ? selectedSheet.slug : '{slug}')+(options.path_suffix?options.path_suffix:'')"
> >
<a-input v-model="selectedSheet.slug" /> <a-input v-model="selectedSheet.slug" />
</a-form-item> </a-form-item>

View File

@ -202,6 +202,7 @@
type="primary" type="primary"
icon="upload" icon="upload"
@click="handleInstall" @click="handleInstall"
:loading="installing"
>安装</a-button> >安装</a-button>
</a-row> </a-row>
</a-card> </a-card>
@ -221,7 +222,8 @@ export default {
installation: {}, installation: {},
stepCurrent: 0, stepCurrent: 0,
migrationData: null, migrationData: null,
bloggerForm: this.$form.createForm(this) bloggerForm: this.$form.createForm(this),
installing: false
} }
}, },
created() { created() {
@ -256,13 +258,18 @@ export default {
}) })
}, },
install() { install() {
adminApi.install(this.installation).then(response => { adminApi
.install(this.installation)
.then(response => {
this.$log.debug('Installation response', response) this.$log.debug('Installation response', response)
this.$message.success('安装成功!') this.$message.success('安装成功!')
setTimeout(() => { setTimeout(() => {
this.$router.push({ name: 'Login' }) this.$router.push({ name: 'Login' })
}, 300) }, 300)
}) })
.finally(() => {
this.installing = false
})
}, },
handleInstall() { handleInstall() {
const password = this.installation.password const password = this.installation.password
@ -275,7 +282,7 @@ export default {
this.$message.error('确认密码和密码不匹配') this.$message.error('确认密码和密码不匹配')
return return
} }
this.installing = true
if (this.migrationData) { if (this.migrationData) {
const hide = this.$message.loading('数据导入中...', 0) const hide = this.$message.loading('数据导入中...', 0)
migrateApi migrateApi