public/ruoyi-plus-vben5
1
0
Fork 0
mirror of https://gitee.com/dapppp/ruoyi-plus-vben5.git synced 2026-04-08 05:33:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: public:1.5.3
Branches Tags
public:main public:antdv-next public:dev public:vite8-preview public:flow-refactor
public:1.5.3-fix public:1.5.3 public:1.5.2 public:1.5.1 public:1.5.0 public:1.4.1-back5.4.1-lock public:1.4.1-back5.4.1 public:1.4.0-back5.4.0 public:1.3.6-back5.3.1 public:1.3.5-back5.3.1 public:1.3.4-back5.3.1 public:1.3.3-back5.3.1 public:1.3.2-back5.3.1 public:1.3.1-back5.3.1 public:1.3.0-back5.3.1 public:1.2.3-back5.3.1 public:1.2.2-back5.3.1 public:1.2.0-back5.3.0 public:1.1.3 public:1.1.2 public:1.1.1 public:1.1.0 public:1.0.0 public:1.0.0-beta
...
compare: public:main
Branches Tags
public:antdv-next public:dev public:main public:vite8-preview public:flow-refactor
public:1.5.3-fix public:1.5.3 public:1.5.2 public:1.5.1 public:1.5.0 public:1.4.1-back5.4.1-lock public:1.4.1-back5.4.1 public:1.4.0-back5.4.0 public:1.3.6-back5.3.1 public:1.3.5-back5.3.1 public:1.3.4-back5.3.1 public:1.3.3-back5.3.1 public:1.3.2-back5.3.1 public:1.3.1-back5.3.1 public:1.3.0-back5.3.1 public:1.2.3-back5.3.1 public:1.2.2-back5.3.1 public:1.2.0-back5.3.0 public:1.1.3 public:1.1.2 public:1.1.1 public:1.1.0 public:1.0.0 public:1.0.0-beta

2 Commits
1.5.3 ... main

Author SHA1 Message Date
dap
0a83a9adf9 fix(upload): 修复文件大小校验失败后仍被加入列表的问题 
通过返回 Upload.LIST_IGNORE 替代 false，防止不符合大小限制的文件被加入上传文件列表，解决 Safari 浏览器兼容性问题。
 2026-02-03 19:21:09 +08:00
dap
c139228d9b chore: 锁定版本 vxe打包丢失css 2026-02-03 14:36:43 +08:00
2 changed files with 4 additions and 3 deletions
Expand all files Collapse all files

5
apps/web-antd/src/components/upload/src/hook.ts
View File

@@ -22,7 +22,7 @@ import { computed, onUnmounted, ref, watch } from 'vue';
import { $t } from '@vben/locales'; import { $t } from '@vben/locales';
import { message, Modal } from 'ant-design-vue'; import { message, Modal, Upload } from 'ant-design-vue';
import { isFunction, isString } from 'lodash-es'; import { isFunction, isString } from 'lodash-es';
import { ossInfo } from '#/api/system/oss'; import { ossInfo } from '#/api/system/oss';
@@ -271,7 +271,8 @@ export function useUpload(
const isLtMax = file.size / 1024 / 1024 < props.maxSize!; const isLtMax = file.size / 1024 / 1024 < props.maxSize!;
if (!isLtMax) { if (!isLtMax) {
message.error($t('component.upload.maxSize', [props.maxSize])); message.error($t('component.upload.maxSize', [props.maxSize]));
return false; // 防止被加入文件列表 可以通过返回 Upload.LIST_IGNORE 实现。
return Upload.LIST_IGNORE;
} }
// 大坑 Safari不支持file-type库 去除文件类型的校验 // 大坑 Safari不支持file-type库 去除文件类型的校验
return file; return file;

2
pnpm-workspace.yaml
View File

@@ -199,7 +199,7 @@ catalog:
vue-tippy: ^6.7.1 vue-tippy: ^6.7.1
vue-tsc: ^3.2.4 vue-tsc: ^3.2.4
vue3-colorpicker: ^2.3.0 vue3-colorpicker: ^2.3.0
vxe-pc-ui: ^4.12.16 vxe-pc-ui: 4.12.16
vxe-table: ^4.17.46 vxe-table: ^4.17.46
watermark-js-plus: ^1.6.3 watermark-js-plus: ^1.6.3
yaml-eslint-parser: ^1.3.2 yaml-eslint-parser: ^1.3.2