From 8185e19898da65bee062d92015048ac355164246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=84=E7=9A=87?= Date: Mon, 22 Apr 2019 16:47:47 +0800 Subject: [PATCH 1/3] feat:(imagePicker) add config disableDelete --- components/image-picker/PropsType.tsx | 1 + components/image-picker/demo/length.md | 1 + components/image-picker/index.en-US.md | 3 ++- components/image-picker/index.tsx | 6 ++++-- components/image-picker/index.zh-CN.md | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/components/image-picker/PropsType.tsx b/components/image-picker/PropsType.tsx index 2907e3a8a8..981e64b835 100644 --- a/components/image-picker/PropsType.tsx +++ b/components/image-picker/PropsType.tsx @@ -12,4 +12,5 @@ export interface ImagePickerPropTypes { accept?: string; length?: number | string; capture?: any; // 本应该是boolean | string; 但是因为@types/react中interface InputHTMLAttributes定义问题，写成any跳过ts检查 + disableDelete?: boolean, // 是否显示删除按钮，默认false } diff --git a/components/image-picker/demo/length.md b/components/image-picker/demo/length.md index dd3fcba1a8..42a0c78ac0 100644 --- a/components/image-picker/demo/length.md +++ b/components/image-picker/demo/length.md @@ -49,6 +49,7 @@ class ImagePickerExample extends React.Component { onImageClick={(index, fs) => console.log(index, fs)} selectable={files.length < 7} onAddImageClick={this.onAddImageClick} + disableDelete /> ); diff --git a/components/image-picker/index.en-US.md b/components/image-picker/index.en-US.md index 83c957881a..465eafe791 100644 --- a/components/image-picker/index.en-US.md +++ b/components/image-picker/index.en-US.md @@ -19,4 +19,5 @@ Properties | Descrition | Type | Default | multiple | whether support choose multi images at once | boolean | false | | accept | File type accept | string | image/* | | length | Number of images in line | string \| number | 4 | -| capture | Image capture setting, please refer to the description of capture in [MDN](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/Input) | boolean \| string | false | \ No newline at end of file +| capture | Image capture setting, please refer to the description of capture in [MDN](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/Input) | boolean \| string | false | +| disableDelete | whether to disable delete icon | boolean | false | \ No newline at end of file diff --git a/components/image-picker/index.tsx b/components/image-picker/index.tsx index b5e52132a4..22553fef32 100644 --- a/components/image-picker/index.tsx +++ b/components/image-picker/index.tsx @@ -27,6 +27,7 @@ export default class ImagePicker extends React.Component< multiple: false, accept: 'image/*', length: 4, + disableDelete: false, }; fileSelectorInput: HTMLInputElement | null; @@ -173,6 +174,7 @@ export default class ImagePicker extends React.Component< multiple, accept, capture, + disableDelete, } = this.props; const imgItemList: any[] = []; @@ -196,7 +198,7 @@ export default class ImagePicker extends React.Component< style={itemStyle} >
-
{ this.removeImage(index); }} - /> + />}
Date: Mon, 22 Apr 2019 17:11:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__tests__/__snapshots__/demo.test.js.snap | 10 ---------- .../image-picker/__tests__/index.test.js | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/components/image-picker/__tests__/__snapshots__/demo.test.js.snap b/components/image-picker/__tests__/__snapshots__/demo.test.js.snap index 282a7ee01d..49edf8e347 100644 --- a/components/image-picker/__tests__/__snapshots__/demo.test.js.snap +++ b/components/image-picker/__tests__/__snapshots__/demo.test.js.snap @@ -268,11 +268,6 @@ exports[`renders ./components/image-picker/demo/length.md correctly 1`] = `
-
-
{ expect(wrapper.find('.am-image-picker-upload-btn').length).toBe(1); }); + it('disableDelete', () => { + const files = [{ + url: 'https://zos.alipayobjects.com/rmsportal/PZUUCKTRIHWiZSY.jpeg', + id: '2121', + }, { + url: 'https://zos.alipayobjects.com/rmsportal/hqQWgTXdrlmVVYi.jpeg', + id: '2122', + }, { + url: 'https://zos.alipayobjects.com/rmsportal/PZUUCKTRIHWiZSY.jpeg', + id: '2123', + }]; + const wrapperCant = mount( + , + ); + // have no delect icon + expect(wrapperCant.find('.am-image-picker-item-remove').length).toBe(0); + }); it('renders length', () => { const files = [{ url: 'https://zos.alipayobjects.com/rmsportal/PZUUCKTRIHWiZSY.jpeg', From 9c409f6874d6ee4cfe91529f4f77f4dc8cadda6f Mon Sep 17 00:00:00 2001 From: likezero Date: Sun, 28 Apr 2019 09:56:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=E4=BC=98=E5=8C=96=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/image-picker/PropsType.tsx | 2 +- components/image-picker/index.en-US.md | 2 +- components/image-picker/index.zh-CN.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/image-picker/PropsType.tsx b/components/image-picker/PropsType.tsx index 981e64b835..dba5307d08 100644 --- a/components/image-picker/PropsType.tsx +++ b/components/image-picker/PropsType.tsx @@ -12,5 +12,5 @@ export interface ImagePickerPropTypes { accept?: string; length?: number | string; capture?: any; // 本应该是boolean | string; 但是因为@types/react中interface InputHTMLAttributes定义问题，写成any跳过ts检查 - disableDelete?: boolean, // 是否显示删除按钮，默认false + disableDelete?: boolean, // 是否隐藏删除按钮，默认false } diff --git a/components/image-picker/index.en-US.md b/components/image-picker/index.en-US.md index 465eafe791..8ae37fe9f2 100644 --- a/components/image-picker/index.en-US.md +++ b/components/image-picker/index.en-US.md @@ -20,4 +20,4 @@ Properties | Descrition | Type | Default | accept | File type accept | string | image/* | | length | Number of images in line | string \| number | 4 | | capture | Image capture setting, please refer to the description of capture in [MDN](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/Input) | boolean \| string | false | -| disableDelete | whether to disable delete icon | boolean | false | \ No newline at end of file +| disableDelete | whether to hide delete icon | boolean | false | \ No newline at end of file diff --git a/components/image-picker/index.zh-CN.md b/components/image-picker/index.zh-CN.md index 61bfb49fce..029defaa77 100644 --- a/components/image-picker/index.zh-CN.md +++ b/components/image-picker/index.zh-CN.md @@ -21,4 +21,4 @@ subtitle: 图片选择器 | accept | 图片类型 | string | image/* | | length | 单行的图片数量 | string \| number | 4 | | capture | 图片捕获设置, 具体请参考[MDN](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/Input)中关于capture的说明 | boolean \| string | false | -| disableDelete | 是否禁用删除按钮 | boolean | false | \ No newline at end of file +| disableDelete | 是否隐藏删除按钮 | boolean | false | \ No newline at end of file