diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue index 3ecca178..b847eff1 100644 --- a/src/components/Upload/FileUpload.vue +++ b/src/components/Upload/FileUpload.vue @@ -225,10 +225,8 @@ watch( * 限制用户上传文件的大小 */ function handleBeforeUpload(file: UploadRawFile) { - if (file.size > props.uploadMaxSize) { - ElMessage.warning( - "上传文件不能大于" + Math.trunc(props.uploadMaxSize / 1024 / 1024) + "M" - ); + if (file.size > props.maxSize) { + ElMessage.warning("上传文件不能大于" + props.maxSize + "M"); return false; } uploadPercent.value = 0; diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue index 0a4def00..c15cd043 100644 --- a/src/views/codegen/index.vue +++ b/src/views/codegen/index.vue @@ -699,7 +699,10 @@ async function handleOpenDialog(tableName: string) { currentTableName.value = tableName; // 获取字典数据 DictAPI.getList().then((data) => { - dictOptions.value = data; + dictOptions.value = data.map((item) => ({ + label: item.name, + value: item.dictCode, + })); loading.value = true; GeneratorAPI.getGenConfig(tableName) .then((data) => { diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts index 22ac11b0..3cb11ea8 100644 --- a/src/views/demo/curd/config/content.ts +++ b/src/views/demo/curd/config/content.ts @@ -1,5 +1,5 @@ import UserAPI from "@/api/system/user"; -import RoleAPI from "@/api/role"; +import RoleAPI from "@/api/system/role"; import type { UserPageQuery } from "@/api/system/user"; import type { IContentConfig } from "@/components/CURD/types";