-
+
-
+
-
-
+
+
+
+
+
-
-
-
@@ -25,36 +26,45 @@
-
-
-
-
-
-
-
-
- {{ l('ClearEmpty') }}
-
-
-
+
- {{
- l(
- 'GridFooterDisplayText',
- pageNumber,
- totalPages,
- total,
- range[0],
- range[1]
- )
- }}
+ {{l('GridFooterDisplayText',pageNumber,totalPages,total,range[0],range[1])}}
-
-
- {{ l('ImgUrl') }}
-
+ (nzCheckedChange)="checkAll($event)">
- {{ l('Name') }}
+ {{l('Name')}}
- {{ l('Author') }}
+ {{l('Author')}}
- {{ l('Intro') }}
+ {{l('Intro')}}
- {{ l('PriceUrl') }}
+ {{l('PriceUrl')}}
+
+
+ {{l('ImgUrl')}}
- {{ l('Actions') }}
+ {{l('Actions')}}
@@ -111,35 +111,46 @@
- ![封面图片]()
+
- {{ item.name }}
+
+ {{item.name}}
+
- {{ item.author }}
+
+ {{item.author}}
+
-
- {{ item.intro }}
+
+
+ {{item.intro}}
+
- {{ item.priceUrl }}
+
+ {{item.priceUrl}}
+
+
+ ![]()
+
+
- {{ l('Edit') }}
+ {{l('Edit')}}
@@ -149,24 +160,39 @@
[nzCancelText]="l('Cancel')">
- {{ l('Delete') }}
+ {{l('Delete')}}
-
+
-
- {{ l('More') }}
+ {{l('More')}}
+
+
+
diff --git a/src/booklist-angular/src/app/cloud-book-list/books/books.component.less b/src/booklist-angular/src/app/cloud-book-list/books/book.component.less
similarity index 100%
rename from src/booklist-angular/src/app/cloud-book-list/books/books.component.less
rename to src/booklist-angular/src/app/cloud-book-list/books/book.component.less
diff --git a/src/booklist-angular/src/app/cloud-book-list/books/books.component.ts b/src/booklist-angular/src/app/cloud-book-list/books/book.component.ts
similarity index 63%
rename from src/booklist-angular/src/app/cloud-book-list/books/books.component.ts
rename to src/booklist-angular/src/app/cloud-book-list/books/book.component.ts
index 1e5482415e802c275708e2b3ac8c8fc46365de26..68095a01d2d9f96997c5567df3da824734f6b06d 100644
--- a/src/booklist-angular/src/app/cloud-book-list/books/books.component.ts
+++ b/src/booklist-angular/src/app/cloud-book-list/books/book.component.ts
@@ -1,34 +1,35 @@
-import { PagedRequestDto } from '@shared/component-base/paged-listing-component-base';
-import { BookServiceProxy } from './../../../shared/service-proxies/service-proxies';
-import { Component, OnInit, Injector } from '@angular/core';
-import { appModuleAnimation } from '@shared/animations/routerTransition';
-import { PagedListingComponentBase } from '@shared/component-base';
-import { BookListDto } from '@shared/service-proxies/service-proxies';
-import { finalize } from 'rxjs/operators';
+import { Component, Injector, OnInit } from '@angular/core';
import * as _ from 'lodash';
+import { appModuleAnimation } from '@shared/animations/routerTransition';
+import {
+ PagedListingComponentBase,
+ PagedRequestDto,
+} from '@shared/component-base/paged-listing-component-base';
+import {
+ BookServiceProxy,
+ PagedResultDtoOfBookListDto,
+ BookListDto,
+} from '@shared/service-proxies/service-proxies';
import { CreateOrEditBookComponent } from './create-or-edit-book/create-or-edit-book.component';
+import { AppConsts } from '@shared/AppConsts';
+// import { FileDownloadService } from '@shared/utils/file-download.service';
@Component({
- // selector: 'app-books',
- templateUrl: './books.component.html',
- styles: ['./books.component.less'],
+ templateUrl: './book.component.html',
+ styleUrls: ['./book.component.less'],
animations: [appModuleAnimation()],
})
-export class BooksComponent extends PagedListingComponentBase
+export class BookComponent extends PagedListingComponentBase
implements OnInit {
constructor(injector: Injector, private _bookService: BookServiceProxy) {
super(injector);
}
- // ngOnInit() {
- // this.refresh();
- // }
-
/**
- * 默认获取后端分页数据列表信息
- * @param request 请求数据的dto，比如分页
- * @param pageNumber 当前的页码
- * @param finishedCallback 完成请求后的回调信息
+ * 获取后端数据列表信息
+ * @param request 请求的数据的dto 请求必需参数 skipCount: number; maxResultCount: number;
+ * @param pageNumber 当前页码
+ * @param finishedCallback 完成后回调函数
*/
protected fetchDataList(
request: PagedRequestDto,
@@ -36,17 +37,15 @@ export class BooksComponent extends PagedListingComponentBase
finishedCallback: Function,
): void {
this._bookService
- .getPageBookAsync(
+ .getPaged(
this.filterText,
request.sorting,
- request.skipCount,
request.maxResultCount,
+ request.skipCount,
)
- .pipe(
- finalize(() => {
- finishedCallback();
- }),
- )
+ .finally(() => {
+ finishedCallback();
+ })
.subscribe(result => {
this.dataList = result.items;
this.showPaging(result);
@@ -72,7 +71,7 @@ export class BooksComponent extends PagedListingComponentBase
* @param entity 角色的实体信息
*/
delete(entity: BookListDto): void {
- this._bookService.deleteBook(entity.id).subscribe(() => {
+ this._bookService.delete(entity.id).subscribe(() => {
/**
* 刷新表格数据并跳转到第一页（`pageNumber = 1`）
*/
@@ -96,7 +95,7 @@ export class BooksComponent extends PagedListingComponentBase
res => {
if (res) {
const ids = _.map(this.selectedDataItems, 'id');
- this._bookService.batchDeleteBook(ids).subscribe(() => {
+ this._bookService.batchDelete(ids).subscribe(() => {
this.refreshGoFirstPage();
this.notify.success(this.l('SuccessfullyDeleted'));
});
@@ -114,10 +113,4 @@ export class BooksComponent extends PagedListingComponentBase
// this._fileDownloadService.downloadTempFile(result);
// });
}
-
- // showImg(url: string) {
- // this.modalHelper
- // .open(ImgShowComponent, { imgUrl: url }, 'md')
- // .subscribe(() => {});
- // }
}
diff --git a/src/booklist-angular/src/app/cloud-book-list/books/create-or-edit-book/create-or-edit-book.component.html b/src/booklist-angular/src/app/cloud-book-list/books/create-or-edit-book/create-or-edit-book.component.html
index 520958b2f83c733bc97a22ee9ed26025be9e4c29..6585f1a83323b402a9b61b742ec648f39c71516a 100644
--- a/src/booklist-angular/src/app/cloud-book-list/books/create-or-edit-book/create-or-edit-book.component.html
+++ b/src/booklist-angular/src/app/cloud-book-list/books/create-or-edit-book/create-or-edit-book.component.html
@@ -1,101 +1,94 @@
+
+
+
+
+
+
+ {{l('ClearEmpty')}}
+
+
+
@@ -69,40 +79,30 @@