diff --git a/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm index 507322a93..bbf5c9fe6 100644 --- a/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm +++ b/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm @@ -74,7 +74,7 @@ #elseif("" != $column.dictType)## 数据字典 #else diff --git a/yudao-ui-admin/src/api/bpm/processInstance.js b/yudao-ui-admin/src/api/bpm/processInstance.js index 58c456f71..0bf6add9d 100644 --- a/yudao-ui-admin/src/api/bpm/processInstance.js +++ b/yudao-ui-admin/src/api/bpm/processInstance.js @@ -33,3 +33,18 @@ export function getProcessInstance(id) { method: 'get', }) } + +export class createProcessInstanceExt { +} + +export class exportProcessInstanceExtExcel { +} + +export class getProcessInstanceExtPage { +} + +export class deleteProcessInstanceExt { +} + +export class deleteProcessInstanceExt { +} diff --git a/yudao-ui-admin/src/components/FileUpload/index.vue b/yudao-ui-admin/src/components/FileUpload/index.vue index 69942aa08..c340007c4 100644 --- a/yudao-ui-admin/src/components/FileUpload/index.vue +++ b/yudao-ui-admin/src/components/FileUpload/index.vue @@ -4,9 +4,7 @@ :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" - :limit="1" :on-error="handleUploadError" - :on-exceed="handleExceed" :on-success="handleUploadSuccess" :show-file-list="false" :headers="headers" @@ -26,8 +24,8 @@ -
  • - +
  • + {{ getFileName(file.name) }}
    @@ -42,6 +40,7 @@ import { getToken } from "@/utils/auth"; export default { + name: "FileUpload", props: { // 值 value: [String, Object, Array], @@ -63,6 +62,7 @@ export default { }, data() { return { + baseUrl: process.env.VUE_APP_BASE_API, uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), @@ -70,30 +70,35 @@ export default { fileList: [], }; }, + watch: { + value: { + handler(val) { + if (val) { + let temp = 1; + // 首先将值转为数组 + const list = Array.isArray(val) ? val : this.value.split(','); + // 然后将数组转为对象数组 + this.fileList = list.map(item => { + if (typeof item === "string") { + item = { name: item, url: item }; + } + item.uid = item.uid || new Date().getTime() + temp++; + return item; + }); + } else { + this.fileList = []; + return []; + } + }, + deep: true, + immediate: true + } + }, computed: { // 是否显示提示 showTip() { return this.isShowTip && (this.fileType || this.fileSize); }, - // 列表 - list() { - let temp = 1; - if (this.value) { - // 首先将值转为数组 - const list = Array.isArray(this.value) ? this.value : [this.value]; - // 然后将数组转为对象数组 - return list.map((item) => { - if (typeof item === "string") { - item = { name: item, url: item }; - } - item.uid = item.uid || new Date().getTime() + temp++; - return item; - }); - } else { - this.fileList = []; - return []; - } - }, }, methods: { // 上传前校检格式和大小 @@ -124,10 +129,6 @@ export default { } return true; }, - // 文件个数超出 - handleExceed() { - this.$message.error(`只允许上传单个文件`); - }, // 上传失败 handleUploadError(err) { this.$message.error("上传失败, 请重试"); @@ -135,12 +136,13 @@ export default { // 上传成功回调 handleUploadSuccess(res, file) { this.$message.success("上传成功"); - this.$emit("input", res.url); + this.fileList.push({ name: res.fileName, url: res.fileName }); + this.$emit("input", this.listToString(this.fileList)); }, // 删除文件 handleDelete(index) { this.fileList.splice(index, 1); - this.$emit("input", ''); + this.$emit("input", this.listToString(this.fileList)); }, // 获取文件名称 getFileName(name) { @@ -149,11 +151,16 @@ export default { } else { return ""; } + }, + // 对象转成分隔字符串 + listToString(list) { + let files = ""; + for (let key in list) { + files += list[key].url + ","; + } + return files.substr(0, files.length - 1); } - }, - created() { - this.fileList = this.list; - }, + } }; @@ -176,4 +183,4 @@ export default { .ele-upload-list__item-content-action .el-link { margin-right: 10px; } - \ No newline at end of file + diff --git a/yudao-ui-admin/src/views/bpm/definition/index.vue b/yudao-ui-admin/src/views/bpm/definition/index.vue index 88afd64df..277047ee4 100644 --- a/yudao-ui-admin/src/views/bpm/definition/index.vue +++ b/yudao-ui-admin/src/views/bpm/definition/index.vue @@ -12,7 +12,7 @@ diff --git a/yudao-ui-admin/src/views/bpm/model/index.vue b/yudao-ui-admin/src/views/bpm/model/index.vue index 9b1817e41..007d0e938 100644 --- a/yudao-ui-admin/src/views/bpm/model/index.vue +++ b/yudao-ui-admin/src/views/bpm/model/index.vue @@ -47,7 +47,7 @@ @@ -291,7 +291,7 @@ export default { // 设置上传的请求头部 headers: getBaseHeader(), // 上传的地址 - url: process.env.VUE_APP_BASE_API + '/api/' + "/bpm/model/import", + url: process.env.VUE_APP_BASE_API + '/admin-api/' + "/bpm/model/import", // 表单 form: {}, // 校验规则 diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue index 22d3d8356..6d2b4e2e9 100644 --- a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue +++ b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue @@ -84,7 +84,7 @@ diff --git a/yudao-ui-admin/src/views/bpm/processInstance/create.vue b/yudao-ui-admin/src/views/bpm/processInstance/create.vue index 1cdee0bcf..8a8195c23 100644 --- a/yudao-ui-admin/src/views/bpm/processInstance/create.vue +++ b/yudao-ui-admin/src/views/bpm/processInstance/create.vue @@ -12,7 +12,7 @@ diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue index 27229cada..3a095045d 100644 --- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue +++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue @@ -52,7 +52,7 @@ @@ -64,14 +64,7 @@ @@ -106,16 +99,7 @@