Showing
4 changed files
with
7 additions
and
7 deletions
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | </mat-form-field> |
57 | 57 | </div> |
58 | 58 | <tb-contact [parentForm]="entityForm" [isEdit]="isEdit"></tb-contact> |
59 | - <div fxLayout="column"> | |
59 | + <!--div fxLayout="column"> | |
60 | 60 | <mat-checkbox class="hinted-checkbox" formControlName="isolatedTbCore"> |
61 | 61 | <div>{{ 'tenant.isolated-tb-core' | translate }}</div> |
62 | 62 | <div class="tb-hint">{{'tenant.isolated-tb-core-details' | translate}}</div> |
... | ... | @@ -65,7 +65,7 @@ |
65 | 65 | <div>{{ 'tenant.isolated-tb-rule-engine' | translate }}</div> |
66 | 66 | <div class="tb-hint">{{'tenant.isolated-tb-rule-engine-details' | translate}}</div> |
67 | 67 | </mat-checkbox> |
68 | - </div> | |
68 | + </div--> | |
69 | 69 | </fieldset> |
70 | 70 | </form> |
71 | 71 | </div> | ... | ... |
... | ... | @@ -51,8 +51,8 @@ export class TenantsTableConfigResolver implements Resolve<EntityTableConfig<Ten |
51 | 51 | |
52 | 52 | this.config.columns.push( |
53 | 53 | new DateEntityTableColumn<TenantInfo>('createdTime', 'common.created-time', this.datePipe, '150px'), |
54 | - new EntityTableColumn<TenantInfo>('title', 'tenant-profile.tenant-profile', '20%'), | |
55 | - new EntityTableColumn<TenantInfo>('tenantProfileName', 'tenant.title', '20%'), | |
54 | + new EntityTableColumn<TenantInfo>('title', 'tenant.title', '20%'), | |
55 | + new EntityTableColumn<TenantInfo>('tenantProfileName', 'tenant-profile.tenant-profile', '20%'), | |
56 | 56 | new EntityTableColumn<TenantInfo>('email', 'contact.email', '20%'), |
57 | 57 | new EntityTableColumn<TenantInfo>('country', 'contact.country', '20%'), |
58 | 58 | new EntityTableColumn<TenantInfo>('city', 'contact.city', '20%') | ... | ... |
... | ... | @@ -83,8 +83,8 @@ export interface Device extends BaseData<DeviceId> { |
83 | 83 | name: string; |
84 | 84 | type: string; |
85 | 85 | label: string; |
86 | - deviceProfileId: DeviceProfileId; | |
87 | - deviceData: DeviceData; | |
86 | + deviceProfileId?: DeviceProfileId; | |
87 | + deviceData?: DeviceData; | |
88 | 88 | additionalInfo?: any; |
89 | 89 | } |
90 | 90 | ... | ... |