Browse Source

fix: visibility issue in extensible table component

set as standalone visible.directive
pull/18150/head
masumulu28 3 years ago
parent
commit
49ecd30db4
  1. 2
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html
  2. 10
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts
  3. 1
      npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts
  4. 5
      npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

2
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html

@ -44,7 +44,7 @@
</ng-template> </ng-template>
<ng-template let-row="row" let-i="index" ngx-datatable-cell-template> <ng-template let-row="row" let-i="index" ngx-datatable-cell-template>
<ng-container *abpPermission="prop.permission; runChangeDetection: false"> <ng-container *abpPermission="prop.permission; runChangeDetection: false">
<ng-container *ngIf="row['_' + prop.name]?.visible"> <ng-container *abpVisible="row['_' + prop.name]?.visible">
<div <div
*ngIf="!row['_' + prop.name].component; else component" *ngIf="!row['_' + prop.name].component; else component"
[innerHTML]="row['_' + prop.name]?.value | async" [innerHTML]="row['_' + prop.name]?.value | async"

10
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts

@ -8,13 +8,12 @@ import {
ListService, ListService,
PermissionService, PermissionService,
} from '@abp/ng.core'; } from '@abp/ng.core';
import { CommonModule, formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
import { import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
Component, Component,
EventEmitter, EventEmitter,
inject, inject,
Inject,
Injector, Injector,
Input, Input,
LOCALE_ID, LOCALE_ID,
@ -39,7 +38,11 @@ import {
import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { NgxDatatableModule } from '@swimlane/ngx-datatable';
import { GridActionsComponent } from '../grid-actions/grid-actions.component'; import { GridActionsComponent } from '../grid-actions/grid-actions.component';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { NgxDatatableDefaultDirective, NgxDatatableListDirective } from '@abp/ng.theme.shared'; import {
AbpVisibleDirective,
NgxDatatableDefaultDirective,
NgxDatatableListDirective,
} from '@abp/ng.theme.shared';
const DEFAULT_ACTIONS_COLUMN_WIDTH = 150; const DEFAULT_ACTIONS_COLUMN_WIDTH = 150;
@ -49,6 +52,7 @@ const DEFAULT_ACTIONS_COLUMN_WIDTH = 150;
standalone: true, standalone: true,
imports: [ imports: [
CoreModule, CoreModule,
AbpVisibleDirective,
NgxDatatableModule, NgxDatatableModule,
GridActionsComponent, GridActionsComponent,
NgbTooltip, NgbTooltip,

1
npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts

@ -2,6 +2,7 @@ import { OnInit, Directive, OnDestroy, Input, ViewContainerRef, TemplateRef } fr
import { EMPTY, from, Observable, of, Subscription } from 'rxjs'; import { EMPTY, from, Observable, of, Subscription } from 'rxjs';
@Directive({ @Directive({
standalone: true,
selector: '[abpVisible]', selector: '[abpVisible]',
}) })
export class AbpVisibleDirective implements OnDestroy, OnInit { export class AbpVisibleDirective implements OnDestroy, OnInit {

5
npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

@ -54,7 +54,6 @@ const declarationsWithExports = [
ToastContainerComponent, ToastContainerComponent,
LoadingDirective, LoadingDirective,
ModalCloseDirective, ModalCloseDirective,
AbpVisibleDirective,
FormInputComponent, FormInputComponent,
FormCheckboxComponent, FormCheckboxComponent,
]; ];
@ -70,7 +69,8 @@ const declarationsWithExports = [
PasswordComponent, PasswordComponent,
NgxDatatableDefaultDirective, NgxDatatableDefaultDirective,
NgxDatatableListDirective, NgxDatatableListDirective,
DisabledDirective DisabledDirective,
AbpVisibleDirective,
], ],
declarations: [...declarationsWithExports, HttpErrorWrapperComponent], declarations: [...declarationsWithExports, HttpErrorWrapperComponent],
exports: [ exports: [
@ -78,6 +78,7 @@ const declarationsWithExports = [
NgxValidateCoreModule, NgxValidateCoreModule,
CardModule, CardModule,
DisabledDirective, DisabledDirective,
AbpVisibleDirective,
NgxDatatableListDirective, NgxDatatableListDirective,
NgxDatatableDefaultDirective, NgxDatatableDefaultDirective,
...declarationsWithExports, ...declarationsWithExports,

Loading…
Cancel
Save