Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(upload): sizelimit api #1553

Merged
merged 1 commit into from
Sep 23, 2022
Merged

fix(upload): sizelimit api #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_common
Open in desktop
Submodule _common updated 8 files
+8 −8 .github/workflows/preview-publish.yml
+86 −13 .github/workflows/pull-request.yml
+1 −1 docs/web/overview.md
+24 −0 js/upload/utils.ts
+1 −1 js/upload/xhr.ts
+7 −4 style/web/components/select/_index.less
+0 −4 style/web/components/table/_index.less
+1 −1 style/web/components/tag-input/_index.less
4 changes: 2 additions & 2 deletions src/upload/upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ImageCard from './image';
import FlowList from './flow-list';
import xhr from '../_common/js/upload/xhr';
import log from '../_common/js/log';
import { formatFiles, isOverSizeLimit } from '../_common/js/upload/utils';
import { formatFiles, isOverSizeLimit1 } from '../_common/js/upload/utils';
import TButton from '../button';
import TDialog from '../dialog';
import SingleFile from './single-file';
Expand Down Expand Up @@ -516,7 +516,7 @@ export default mixins(getConfigReceiverMixins<Vue, UploadConfig>('upload'), getG

handleSizeLimit(fileSize: number) {
const sizeLimit: SizeLimitObj = typeof this.sizeLimit === 'number' ? { size: this.sizeLimit, unit: 'KB' } : this.sizeLimit;
const rSize = isOverSizeLimit(fileSize, sizeLimit.size, sizeLimit.unit);
const rSize = isOverSizeLimit1(fileSize, sizeLimit.size, sizeLimit.unit);
if (!rSize) {
// 有参数 message 则使用，没有就使用全局 global 配置
this.errorMsg = sizeLimit.message
Expand Down