fix: (module: grid): fix return contentType error (#320)

NG-ZORRO · Mar 4, 2019 · dd88a52 · dd88a52
1 parent 475eb14
commit dd88a52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/components/grid/grid.component.html b/components/grid/grid.component.html
@@ -15,16 +15,16 @@
            (click)="click(subItem,i * columnNum + j)"
       >
         <div class="{{defaultProps.prefixCls}}-item-inner-content column-num-{{columnNum}}">
-          <img *ngIf="subItem.icon && getIconType(subItem.icon) === 'url'"
+          <img *ngIf="subItem.icon && getContentType(subItem.icon) === 'url'"
                src="{{subItem.icon}}"
                class="{{defaultProps.prefixCls}}-icon"
           >
-          <Icon *ngIf="subItem.icon && getIconType(subItem.icon)==='icon'"
+          <Icon *ngIf="subItem.icon && getContentType(subItem.icon)==='icon'"
                 [type]="subItem.icon"
                 [size]="subItem.size"
           ></Icon>
-          <div *ngIf="subItem.icon && getIconType(subItem.icon)==='innerHTML'" [innerHTML]="subItem.icon | safeHTML"></div>
-          <ng-template *ngIf="subItem.icon && getIconType(subItem.icon)==='TemplateRef'" [ngTemplateOutlet]="subItem.icon"></ng-template>
+          <div *ngIf="subItem.icon && getContentType(subItem.icon)==='innerHTML'" [innerHTML]="subItem.icon | safeHTML"></div>
+          <ng-template *ngIf="subItem.icon && getContentType(subItem.icon)==='TemplateRef'" [ngTemplateOutlet]="subItem.icon"></ng-template>
           <div class="{{defaultProps.prefixCls}}-text">{{subItem.text}}</div>
         </div>
       </div>

diff --git a/components/grid/grid.component.ts b/components/grid/grid.component.ts
@@ -72,15 +72,15 @@ export class GridComponent implements OnInit {
 
   constructor() {}
 
-  getIconType(value: any): string {
+  getContentType(value: any): string {
     if ((value.indexOf('http') >= 0 || value.indexOf('assets') >= 0) && value.indexOf('<') < 0) {
       return 'url';
     } else if (value.indexOf('<') >= 0) {
       return 'innerHTML';
     } else if (value instanceof TemplateRef) {
       return 'TemplateRef';
     } else {
-      return 'string';
+      return 'icon';
     }
   }