diff --git a/package-lock.json b/package-lock.json
index 468bfb88..fa01f883 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2434,9 +2434,9 @@
}
},
"ant-design-vue": {
- "version": "1.5.0-rc.7",
- "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.5.0-rc.7.tgz",
- "integrity": "sha512-SIk20myTSRV7b3HjstksGelhIO5l3OoqdsHSWUGmwMzm8zjdED9Na4vw8dSH1f0UsMbr85TLCQQtakywHpOCqA==",
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.5.2.tgz",
+ "integrity": "sha512-DmlOl+ld4hSQdEG1c2wAV+v9/Bl2aG+wBEnd1GJYV0LeOXaSrBGiIkZrmUrTrUL92yBdFO+OF25aFNb0UFMZOA==",
"requires": {
"@ant-design/icons": "^2.1.1",
"@ant-design/icons-vue": "^2.0.0",
@@ -2465,7 +2465,7 @@
"resize-observer-polyfill": "^1.5.1",
"shallow-equal": "^1.0.0",
"shallowequal": "^1.0.2",
- "vue-ref": "^1.0.4",
+ "vue-ref": "^2.0.0",
"warning": "^4.0.0"
}
},
@@ -10481,9 +10481,9 @@
"dev": true
},
"mutationobserver-shim": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
- "integrity": "sha512-gciOLNN8Vsf7YzcqRjKzlAJ6y7e+B86u7i3KXes0xfxx/nfLmozlW1Vn+Sc9x3tPIePFgc1AeIFhtRgkqTjzDQ=="
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.5.tgz",
+ "integrity": "sha512-YAMuSp4Oi19SYQF04dGnRajyFp4Wyam+jKKWzm5roPcNh1Rip8dnHPxls5F/xBgY0H2gV+3IzWuIvYQPDAvmBQ=="
},
"mute-stream": {
"version": "0.0.7",
@@ -14726,9 +14726,9 @@
"integrity": "sha512-JoZDpSu0qV5AM50vspEzOut2lcm8R0tr5WG99jMHh14qFXkUes3ZdmDMG/p8iSQVQpg0pd/svGwM9Nd7OI2oaw=="
},
"vue-ref": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-1.0.6.tgz",
- "integrity": "sha512-UzD8t1CG+aoWVOOpGd5KcaCNtCgUc0byaKhJMH+6N7H/p1ThVkYl/VCt7DmCrdhUlzZK+hT5JPTKAdrbWi0nNw=="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz",
+ "integrity": "sha512-uKNKpFOVeWNqS2mrBZqnpLyXJo5Q+vnkex6JvpENvhXHFNBW/SJTP8vJywLuVT3DpxwXcF9N0dyIiZ4/NpTexQ=="
},
"vue-router": {
"version": "3.1.6",
diff --git a/package.json b/package.json
index d11ac565..14a1f65c 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
- "ant-design-vue": "^1.5.0-rc.7",
+ "ant-design-vue": "^1.5.2",
"axios": "^0.19.2",
"enquire.js": "^2.1.6",
"filepond": "^4.13.0",
diff --git a/src/components/Upload/FilePondUpload.vue b/src/components/Upload/FilePondUpload.vue
index 8c739ae6..133e5e3d 100644
--- a/src/components/Upload/FilePondUpload.vue
+++ b/src/components/Upload/FilePondUpload.vue
@@ -7,9 +7,9 @@
:allow-multiple="multiple"
:allowRevert="false"
:accepted-file-types="accept"
- :maxParallelUploads="options.attachment_upload_max_parallel_uploads"
- :allowImagePreview="options.attachment_upload_image_preview_enable"
- :maxFiles="options.attachment_upload_max_files"
+ :maxParallelUploads="loadOptions?options.attachment_upload_max_parallel_uploads:1"
+ :allowImagePreview="loadOptions?options.attachment_upload_image_preview_enable:false"
+ :maxFiles="loadOptions?options.attachment_upload_max_files:1"
labelFileProcessing="上传中"
labelFileProcessingComplete="上传完成"
labelFileProcessingAborted="取消上传"
@@ -70,6 +70,11 @@ export default {
uploadHandler: {
type: Function,
required: true
+ },
+ loadOptions: {
+ type: Boolean,
+ required: false,
+ default: false
}
},
data: function() {
diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index 10b73fd7..2b50837a 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -248,7 +248,10 @@