From d0f8834799fb2ea5ebfb2e32512be908be20b0e9 Mon Sep 17 00:00:00 2001 From: johnniang Date: Sun, 28 Apr 2019 21:49:01 +0800 Subject: [PATCH] Enhance installation --- src/api/admin.js | 7 ++ src/api/post.js | 2 +- src/api/recovery.js | 15 +++ src/components/Upload/Upload.vue | 3 +- src/views/system/Installation.vue | 181 +++++++++++++++++++++++------- 5 files changed, 168 insertions(+), 40 deletions(-) create mode 100644 src/api/recovery.js diff --git a/src/api/admin.js b/src/api/admin.js index bc940f1ca..85dd8dba6 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -11,4 +11,11 @@ adminApi.counts = () => { }) } +adminApi.install = data => { + return service({ + url: `${baseUrl}/installations`, + data: data, + method: 'post' + }) +} export default adminApi diff --git a/src/api/post.js b/src/api/post.js index 49f582453..c9b46efc7 100644 --- a/src/api/post.js +++ b/src/api/post.js @@ -44,7 +44,7 @@ postApi.update = (postId, postToUpdate) => { postApi.updateStatus = (postId, status) => { return service({ - url: `${baseUrl}/${postId}/${status}`, + url: `${baseUrl}/${postId}/status/${status}`, method: 'put' }) } diff --git a/src/api/recovery.js b/src/api/recovery.js new file mode 100644 index 000000000..2f3bf2d55 --- /dev/null +++ b/src/api/recovery.js @@ -0,0 +1,15 @@ +import service from '@/utils/service' + +const baseUrl = '/api/admin/recoveries' + +const recoveryApi = {} + +recoveryApi.migrate = formData => { + return service({ + url: `${baseUrl}/migrations/v0_4_3`, + data: formData, + method: 'post' + }) +} + +export default recoveryApi diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index ad7622332..3afdb7b32 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -34,7 +34,8 @@ export default { props: { name: { type: String, - required: true + required: false, + default: 'file' }, multiple: { type: Boolean, diff --git a/src/views/system/Installation.vue b/src/views/system/Installation.vue index d86908601..a964307ee 100644 --- a/src/views/system/Installation.vue +++ b/src/views/system/Installation.vue @@ -47,35 +47,67 @@ layout="horizontal" v-show="stepCurrent == 0" > - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + @@ -85,22 +117,48 @@ layout="horizontal" v-show="stepCurrent == 1" > - - + + + + - - + + + + +
+ +

+ +

+

点击选择文件或将文件拖拽到此处

+

仅支持单个文件上传

+
+
+ @@ -120,6 +178,7 @@ v-if="stepCurrent == 2" type="danger" icon="upload" + @click="handleInstall" >安装 @@ -130,6 +189,9 @@