From b7f04c1283b9a62ef45cc5d75fcd1de83885c738 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 28 Jun 2019 16:20:40 +0800 Subject: [PATCH] [improvement] Uploader: support number type of name prop (#3681) --- src/uploader/README.md | 2 +- src/uploader/README.zh-CN.md | 2 +- src/uploader/index.js | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/uploader/README.md b/src/uploader/README.md index 765ae2d91..e320bf2a5 100644 --- a/src/uploader/README.md +++ b/src/uploader/README.md @@ -108,7 +108,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| -| name | Input name | `String` | - | +| name | Input name | `String | Number` | - | | accept | Accepted file type | `String` | `image/*` | | preview-image | Whether to show image preview | `Boolean` | `true` | | preview-size | Size of preview image | `String | Number` | `80px` | diff --git a/src/uploader/README.zh-CN.md b/src/uploader/README.zh-CN.md index 1d8de0ed1..d9c70d1df 100644 --- a/src/uploader/README.zh-CN.md +++ b/src/uploader/README.zh-CN.md @@ -121,7 +121,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | 版本 | |------|------|------|------|------| -| name | 标识符,可以在回调函数的第二项参数中获取 | `String` | - | 1.6.13 | +| name | 标识符,可以在回调函数的第二项参数中获取 | `String | Number` | - | 2.0.3 | | accept | 接受的文件类型 | `String` | `image/*` | - | | preview-image | 是否在上传完成后展示预览图 | `Boolean` | `true` | 2.0.0 | | preview-size | 预览图和上传区域的尺寸,默认单位为`px` | `String | Number` | `80px` | 2.0.0 | diff --git a/src/uploader/index.js b/src/uploader/index.js index 7ee5e51f8..9417ba97c 100644 --- a/src/uploader/index.js +++ b/src/uploader/index.js @@ -24,6 +24,10 @@ export default createComponent({ afterRead: Function, beforeRead: Function, previewSize: [Number, String], + name: { + type: [String, Number], + default: '' + }, previewImage: { type: Boolean, default: true @@ -49,7 +53,7 @@ export default createComponent({ computed: { detail() { return { - name: this.$attrs.name || '' + name: this.name }; } },