公共组件 #18

Merged
xiaohai2271 merged 45 commits from dev into master 2020-07-11 10:41:50 +08:00
3 changed files with 14 additions and 9 deletions
Showing only changes of commit 1e3472244e - Show all commits

View File

@@ -45,10 +45,10 @@ const routes: Routes = [
loadChildren: () => import('./admin-visitor/admin-visitor.module').then(mod => mod.AdminVisitorModule), loadChildren: () => import('./admin-visitor/admin-visitor.module').then(mod => mod.AdminVisitorModule),
// canActivate: [AuthGuard] // canActivate: [AuthGuard]
}, },
// { {
// path: 'test', path: 'test',
// loadChildren: () => import('./test-common-table/test-common-table.module').then(Mod => Mod.TestCommonTableModule) loadChildren: () => import('./test-common-table/test-common-table.module').then(Mod => Mod.TestCommonTableModule)
// }, },
{ {
path: '**', path: '**',
loadChildren: () => import('./admin-dashboard/admin-dashboard.module').then(mod => mod.AdminDashboardModule), loadChildren: () => import('./admin-dashboard/admin-dashboard.module').then(mod => mod.AdminDashboardModule),

View File

@@ -1,11 +1,11 @@
<app-common-table [data]="data" [request]="req" cardTitle="文章管理" <!--<c-common-table [data]="data" [request]="req" cardTitle="文章管理"
[template]="{ [template]="{
dislikeCount:{temp:tag}, dislikeCount:{temp:tag},
readingNumber:{temp:readingNumber}, readingNumber:{temp:readingNumber},
open:{temp:open}, open:{temp:open},
original:{temp:original,param:{true:'原创',false:'转载'} original:{temp:original,param:{true:'原创',false:'转载'}
}}"> }}">-->
</app-common-table> <!--</c-common-table>-->
<ng-template #tag let-value="value"> <ng-template #tag let-value="value">
<nz-tag [nzColor]="'#87d068'">{{value}}</nz-tag> <nz-tag [nzColor]="'#87d068'">{{value}}</nz-tag>
</ng-template> </ng-template>
@@ -21,3 +21,6 @@
<ng-template #open let-value="value"> <ng-template #open let-value="value">
<label nz-checkbox nzDisabled [ngModel]="value"></label> <label nz-checkbox nzDisabled [ngModel]="value"></label>
</ng-template> </ng-template>
<editable-tag >hhh</editable-tag>

View File

@@ -5,6 +5,7 @@ import {Router, RouterModule} from '@angular/router';
import {CommonTableModule} from '../components/common-table/common-table.module'; import {CommonTableModule} from '../components/common-table/common-table.module';
import {NzCheckboxModule, NzTagModule} from 'ng-zorro-antd'; import {NzCheckboxModule, NzTagModule} from 'ng-zorro-antd';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {EditableTagModule} from '../components/editable-tag/editable-tag.module';
@NgModule({ @NgModule({
@@ -15,7 +16,8 @@ import {FormsModule} from '@angular/forms';
CommonTableModule, CommonTableModule,
NzTagModule, NzTagModule,
NzCheckboxModule, NzCheckboxModule,
FormsModule FormsModule,
EditableTagModule
] ]
}) })
export class TestCommonTableModule { export class TestCommonTableModule {