diff --git a/backend/Magic.Core/Service/File/SysFileService.cs b/backend/Magic.Core/Service/File/SysFileService.cs index b18280be56b8d13062138fe5557a2f23ea0d8780..595ce72017bd0ad1fd5e7f2443b7cb1055f0cff1 100644 --- a/backend/Magic.Core/Service/File/SysFileService.cs +++ b/backend/Magic.Core/Service/File/SysFileService.cs @@ -238,7 +238,7 @@ namespace Magic.Core.Service FileSizeKb = fileSizeKb.ToString(), FilePath = pathType }; - newFile = await App.GetService().Insertable(newFile).ExecuteReturnEntityAsync(); + newFile = await App.GetService().Insertable(newFile).CallEntityMethod(m=>m.Create()).ExecuteReturnEntityAsync(); var finalName = newFile.FileObjectName; // 生成文件的最终名称 if (fileLocation == FileLocation.LOCAL) // 本地存储 diff --git a/backend/Magic.Web.Entry/Magic.db b/backend/Magic.Web.Entry/Magic.db index 3428891a7a2ab0aba89ecc26fad2223f320080a9..1d7b589d5c3bb46f4d1ef860f25c7a82e6ed8f2a 100644 Binary files a/backend/Magic.Web.Entry/Magic.db and b/backend/Magic.Web.Entry/Magic.db differ diff --git a/frontend/package-lock.json b/frontend/package-lock.json index fc4fc5587baea105536010754edd29a9150d0533..fe1ba580feb092e841ecae570c19fbf8490962fb 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2675,17 +2675,6 @@ "unique-filename": "^1.1.1" } }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz", @@ -2737,18 +2726,6 @@ "supports-color": "^7.0.0" } }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz", @@ -2806,18 +2783,6 @@ "webpack-sources": "^1.4.3" } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - } - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz", @@ -16781,6 +16746,87 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.5.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", + "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-ls": { "version": "3.2.2", "resolved": "https://registry.npm.taobao.org/vue-ls/download/vue-ls-3.2.2.tgz", diff --git a/frontend/src/api/modular/system/fileManage.js b/frontend/src/api/modular/system/fileManage.js index 389ccdbedda46916e2ae0993909ae3698972389b..efa25fb293ba4c4711a2e043490cfa7e71ed51d0 100644 --- a/frontend/src/api/modular/system/fileManage.js +++ b/frontend/src/api/modular/system/fileManage.js @@ -32,13 +32,20 @@ export function sysFileInfoList (parameter) { * 上传文件 * * @author yubaoshan + * @change benxin 2021-08-23 * @date 2020/6/30 00:20 */ -export function sysFileInfoUpload (parameter) { +export function sysFileInfoUpload (parameter,callback) { return axios({ url: '/sysFileInfo/upload', method: 'post', - data: parameter + data: parameter, + timeout:0, + onUploadProgress: progressEvent => { + let process = (progressEvent.loaded / progressEvent.total * 100 | 0) + // console.log(process) + callback(progressEvent) + } }) } diff --git a/frontend/src/main.js b/frontend/src/main.js index ccd779395c688dde6db8fff3f6be2c8fe9c7ea7b..0ccc1eb9e8dbb457f18d88d2508c038ee88df24a 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -7,7 +7,8 @@ import router from './router' import store from './store/' import { VueAxios } from './utils/request' // WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV. -import './mock' +// 禁用mock，解决回调失败的问题 +// import './mock' import bootstrap from './core/bootstrap' import './core/lazy_use' diff --git a/frontend/src/views/system/file/index.vue b/frontend/src/views/system/file/index.vue index d364d14c2db09b25c7c966de9e40b21657001eae..571f939a642882fd5d89245b9f6af188d6ea2d0a 100644 --- a/frontend/src/views/system/file/index.vue +++ b/frontend/src/views/system/file/index.vue @@ -85,6 +85,18 @@ + @@ -104,6 +116,14 @@ }, data () { return { + //文件上传进度弹窗 + uploadModal:false, + //文件上传进度，单位% + percent:0, + //后台处理中状态 + backStatus:false, + //文件上传弹窗标题 + uploadTitle:'文件正在上传中...', // 高级搜索 展开/关闭 advanced: false, // 查询参数 @@ -237,9 +257,26 @@ customRequest (data) { const formData = new FormData() formData.append('file', data.file) - sysFileInfoUpload(formData).then((res) => { + formData.append('group',"default") + sysFileInfoUpload(formData,(res)=>{ + //上传进度回调函数 + this.uploadModal = true + this.uploadTitle="文件正在上传中..." + var loaded = res.loaded + var total = Number(res.total) +100 + var Atotal = res.total + this.percent = (loaded/total).toFixed(2)*100 + var Apercent = (loaded/Atotal).toFixed(2)*100 + if(Apercent == 100){ + this.uploadTitle="上传成功，服务器处理中..." + } + + }).then((res) => { + this.uploadModal = false if (res.success) { - this.$message.success('上传成功') + //this.$message.success('上传成功') + + this.percent = 100 this.$refs.table.refresh() } else { this.$message.error('上传失败：' + res.message)