Browse Source

release: 1.3.1

pull/120/head v1.3.1
ruibaby 5 years ago
parent
commit
794e24e69f
  1. 2
      .env.jsdelivr
  2. 2
      package-lock.json
  3. 2
      package.json
  4. 2
      public/index.html
  5. 2
      src/views/sheet/components/SheetSettingDrawer.vue
  6. 25
      src/views/system/Installation.vue

2
.env.jsdelivr

@ -1,2 +1,2 @@
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

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

2
package.json

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

2
public/index.html

@ -6,7 +6,7 @@
<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="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" />
<title>Halo Dashboard</title>
<style>

2
src/views/sheet/components/SheetSettingDrawer.vue

@ -26,7 +26,7 @@
</a-form-item>
<a-form-item
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-form-item>

25
src/views/system/Installation.vue

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

Loading…
Cancel
Save