Skip to content

Commit 8e79807

Browse files
ajiaberryshijia.sj
ajiaberry
and
shijia.sj
authored
fix: 修复图片上传中的中文文案问题 (#1136)
Co-authored-by: shijia.sj <[email protected]>
1 parent fab601b commit 8e79807

File tree

12 files changed

+61
-9
lines changed

12 files changed

+61
-9
lines changed

‎compiled/alipay/demo/pages/ImageUpload/index.axml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<ant-container title="基本用法">
22
<ant-uploader
33
onChange="onChange"
4-
onUpload="{{ onUpload ? onUpload : 'onUpload' }}" />
4+
onUpload="{{ onUpload ? onUpload : 'onUpload' }}"
5+
uploadingText="上传中……"
6+
uploadfailedText="上传失败" />
57
</ant-container>
68
<ant-container title="初始值">
79
<ant-uploader

‎compiled/alipay/src/ImageUpload/index.axml

+6-2
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,19 @@
2525
a:if="{{ item.status === 'uploading' }}"
2626
class="ant-image-upload-cover-loading">
2727
<loading className="ant-image-upload-cover-loading-icon" />
28-
<view class="ant-image-upload-cover-loading-text">上传中...</view>
28+
<view class="ant-image-upload-cover-loading-text">
29+
{{ uploadingText }}
30+
</view>
2931
</view>
3032
<view
3133
a:if="{{ item.status === 'error' }}"
3234
class="ant-image-upload-cover-error">
3335
<icon
3436
className="ant-image-upload-cover-error-icon"
3537
type="CloseCircleOutline" />
36-
<view class="ant-image-upload-cover-error-text">上传失败</view>
38+
<view class="ant-image-upload-cover-error-text">
39+
{{ uploadfailedText }}
40+
</view>
3741
</view>
3842
</view>
3943

‎compiled/alipay/src/ImageUpload/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ toc: 'content'
3535
| defaultFileList | 文件列表初始值 | [File](#file)[] | [] |
3636
| sourceType | 上传选择的来源。可选 `['album']`、`['camera']` 或 `['album', 'camera']` | string[] | ['album', 'camera'] |
3737
| style | 样式 | string | - |
38+
| uploadingText | 上传中提示文案 | string | '上传中……' |
39+
| uploadfailedText | 上传失败提示文案 | string | '上传失败' |
3840
| fileList | 文件列表（受控） | [File](#file)[] | - |
3941
| imageMode | 图片缩放模式和裁剪模式。详见 [图片 mode 说明](https://opendocs.alipay.com/mini/component/image#mode) | string | scaleToFill |
4042
| onBeforeUpload | 上传文件之前的钩子。参数为上传的文件列表，若返回 false 则停止上传。支持返回一个 Promise 对象，Promise 对象 reject 时则停止上传，resolve 时开始上传（resolve 传入修改后的 localFileList） | (localFileList: [localFile](#localfile)[]) => boolean \| Promise<[localFile](#localfile)[]> | - |

‎compiled/alipay/src/ImageUpload/props.ts

+12
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,16 @@ export interface IUploaderProps extends IBaseProps {
9797
* @description 自定义上传方式，只在不存在action字段时生效
9898
*/
9999
onUpload?: (localFile: LocalFile) => Promise<string>;
100+
/**
101+
* @description 上传中文案
102+
* @default "上传中……"
103+
*/
104+
uploadingText?: string;
105+
/**
106+
* @description 上传失败文案
107+
* @default "上传失败"
108+
*/
109+
uploadfailedText?: string;
100110
}
101111

102112
export const UploaderDefaultProps: Partial<IUploaderProps> = {
@@ -114,4 +124,6 @@ export const UploaderFunctionalProps: Partial<IUploaderProps> = {
114124
onUpload: null,
115125
onBeforeUpload: null,
116126
onRemove: null,
127+
uploadingText: '上传中',
128+
uploadfailedText: '上传失败'
117129
};

‎compiled/wechat/demo/pages/ImageUpload/index.wxml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<ant-container title="基本用法">
22
<ant-uploader
33
bind:change="onChange"
4-
onUpload="{{ onUpload ? onUpload : 'onUpload' }}" />
4+
onUpload="{{ onUpload ? onUpload : 'onUpload' }}"
5+
uploadingText="上传中……"
6+
uploadfailedText="上传失败" />
57
</ant-container>
68
<ant-container title="初始值">
79
<ant-uploader

‎compiled/wechat/src/ImageUpload/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ toc: 'content'
3535
| defaultFileList | 文件列表初始值 | [File](#file)[] | [] |
3636
| sourceType | 上传选择的来源。可选 `['album']`、`['camera']` 或 `['album', 'camera']` | string[] | ['album', 'camera'] |
3737
| style | 样式 | string | - |
38+
| uploadingText | 上传中提示文案 | string | '上传中……' |
39+
| uploadfailedText | 上传失败提示文案 | string | '上传失败' |
3840
| fileList | 文件列表（受控） | [File](#file)[] | - |
3941
| imageMode | 图片缩放模式和裁剪模式。详见 [图片 mode 说明](https://opendocs.alipay.com/mini/component/image#mode) | string | scaleToFill |
4042
| onBeforeUpload | 上传文件之前的钩子。参数为上传的文件列表，若返回 false 则停止上传。支持返回一个 Promise 对象，Promise 对象 reject 时则停止上传，resolve 时开始上传（resolve 传入修改后的 localFileList） | (localFileList: [localFile](#localfile)[]) => boolean \| Promise<[localFile](#localfile)[]> | - |

‎compiled/wechat/src/ImageUpload/index.wxml

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@
1919
wx:if="{{ item.status === 'uploading' }}"
2020
class="ant-image-upload-cover-loading">
2121
<loading className="ant-image-upload-cover-loading-icon" />
22-
<view class="ant-image-upload-cover-loading-text">上传中...</view>
22+
<view class="ant-image-upload-cover-loading-text">
23+
{{ uploadingText }}
24+
</view>
2325
</view>
2426
<view
2527
wx:if="{{ item.status === 'error' }}"
2628
class="ant-image-upload-cover-error">
2729
<icon
2830
className="ant-image-upload-cover-error-icon"
2931
type="CloseCircleOutline" />
30-
<view class="ant-image-upload-cover-error-text">上传失败</view>
32+
<view class="ant-image-upload-cover-error-text">
33+
{{ uploadfailedText }}
34+
</view>
3135
</view>
3236
</view>
3337

‎compiled/wechat/src/ImageUpload/props.js

+2
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ export var UploaderFunctionalProps = {
1212
onUpload: null,
1313
onBeforeUpload: null,
1414
onRemove: null,
15+
uploadingText: '上传中',
16+
uploadfailedText: '上传失败'
1517
};

‎demo/pages/ImageUpload/index.axml.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ export default ({
1313
<AntUploader
1414
onChange="onChange"
1515
onUpload={onUpload ? onUpload : 'onUpload'}
16+
uploadingText="上传中……"
17+
uploadfailedText="上传失败"
1618
/>
1719
</AntContainer>
1820
<AntContainer title="初始值">

‎src/ImageUpload/index.axml.tsx

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ import { View, Slot, InternalData, TSXMLProps, Image } from 'tsxml';
44
import { IUploaderProps } from './props';
55

66
export default (
7-
{ className, style, imageMode, maxCount }: TSXMLProps<IUploaderProps>,
7+
{ className,
8+
style,
9+
imageMode,
10+
maxCount,
11+
uploadingText,
12+
uploadfailedText
13+
}: TSXMLProps<IUploaderProps>,
814
{ mixin }: InternalData
915
) => (
1016
<View class={`ant-image-upload ${className || ''}`} style={style || ''}>
@@ -31,7 +37,7 @@ export default (
3137
<View class="ant-image-upload-cover-loading">
3238
<Loading className="ant-image-upload-cover-loading-icon" />
3339
<View class="ant-image-upload-cover-loading-text">
34-
上传中...
40+
{uploadingText}
3541
</View>
3642
</View>
3743
)}
@@ -42,7 +48,7 @@ export default (
4248
type="CloseCircleOutline"
4349
/>
4450
<View class="ant-image-upload-cover-error-text">
45-
上传失败
51+
{uploadfailedText}
4652
</View>
4753
</View>
4854
)}

‎src/ImageUpload/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ toc: 'content'
3535
| defaultFileList | 文件列表初始值 | [File](#file)[] | [] |
3636
| sourceType | 上传选择的来源。可选 `['album']`、`['camera']` 或 `['album', 'camera']` | string[] | ['album', 'camera'] |
3737
| style | 样式 | string | - |
38+
| uploadingText | 上传中提示文案 | string | '上传中……' |
39+
| uploadfailedText | 上传失败提示文案 | string | '上传失败' |
3840
| fileList | 文件列表（受控） | [File](#file)[] | - |
3941
| imageMode | 图片缩放模式和裁剪模式。详见 [图片 mode 说明](https://opendocs.alipay.com/mini/component/image#mode) | string | scaleToFill |
4042
| onBeforeUpload | 上传文件之前的钩子。参数为上传的文件列表，若返回 false 则停止上传。支持返回一个 Promise 对象，Promise 对象 reject 时则停止上传，resolve 时开始上传（resolve 传入修改后的 localFileList） | (localFileList: [localFile](#localfile)[]) => boolean \| Promise<[localFile](#localfile)[]> | - |

‎src/ImageUpload/props.ts

+12
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,16 @@ export interface IUploaderProps extends IBaseProps {
9797
* @description 自定义上传方式，只在不存在action字段时生效
9898
*/
9999
onUpload?: (localFile: LocalFile) => Promise<string>;
100+
/**
101+
* @description 上传中文案
102+
* @default "上传中……"
103+
*/
104+
uploadingText?: string;
105+
/**
106+
* @description 上传失败文案
107+
* @default "上传失败"
108+
*/
109+
uploadfailedText?: string;
100110
}
101111

102112
export const UploaderDefaultProps: Partial<IUploaderProps> = {
@@ -114,4 +124,6 @@ export const UploaderFunctionalProps: Partial<IUploaderProps> = {
114124
onUpload: null,
115125
onBeforeUpload: null,
116126
onRemove: null,
127+
uploadingText: '上传中',
128+
uploadfailedText: '上传失败'
117129
};

0 commit comments

Comments
 (0)