fix(module:upload): fix only allow type is picture or picture-card ge…

…nerate thumbnail (#2219) close #2216
NG-ZORRO · Oct 10, 2018 · 8306111 · 8306111
1 parent 8861beb
commit 8306111
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/components/upload/nz-upload.component.ts b/components/upload/nz-upload.component.ts
@@ -228,11 +228,14 @@ export class NzUploadComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   private genThumb(file: UploadFile): void {
-    if (typeof document === 'undefined' ||
+    if (
+      (this.nzListType !== 'picture' && this.nzListType !== 'picture-card') ||
+      typeof document === 'undefined' ||
       typeof window === 'undefined' ||
-      !(window as any).FileReader || !(window as any).File ||
+      !(window as any).FileReader ||
+      !(window as any).File ||
       !(file.originFileObj instanceof File) ||
-      file.thumbUrl !== undefined
+      file.thumbUrl != null
     ) {
       return;
     }

diff --git a/components/upload/upload.spec.ts b/components/upload/upload.spec.ts
@@ -461,6 +461,25 @@ describe('upload', () => {
           expect(dl.queryAll(By.css('.anticon-close')).length).toBe(INITCOUNT - 1);
         });
       });
+
+      describe('[nzListType]', () => {
+        describe(`should be only allow type is picture or picture-card generate thumbnail`, () => {
+          it('with text', () => {
+            instance.nzListType = 'text';
+            fixture.detectChanges();
+            pageObject.postSmall();
+            fixture.detectChanges();
+            expect(instance.comp.nzFileList[0].thumbUrl).toBeUndefined();
+          });
+          it('with picture', () => {
+            instance.nzListType = 'picture';
+            fixture.detectChanges();
+            pageObject.postSmall();
+            fixture.detectChanges();
+            expect(instance.comp.nzFileList[0].thumbUrl).not.toBeUndefined();
+          });
+        });
+      });
     });
 
     describe('CORS', () => {