[修复] 修复在transfer中给pagination设置属性错误

Author: hpyou

CHANGELOG.md

@@ -1,3 +1,17 @@
+## v1.1.16 (2018-10-31)
+
+### 新特性 / New Features
+- 无
+
+### 破坏性修改 / Breaking Changes
+- 无
+
+###  优化 / Modified
+- 无
+
+### 修复 / Fixes
+- [修复] 修复在transfer中给pagination设置属性错误
+
 ## v1.1.15 (2018-10-31)
 
 ### 新特性 / New Features

src/app/app.interceptor.ts

@@ -8,7 +8,7 @@ import {PagingInfo} from "../jigsaw/core/data/component-data";
 @Injectable()
 export class AjaxInterceptor implements HttpInterceptor {
 
-    private static _usingRealRDK: boolean = true;
+    private static _usingRealRDK: boolean = false;
     private static _processors: any[] = [];
 
     public static registerProcessor(urlPattern: RegExp | string, processor: (req: HttpRequest<any>) => any, context?: any) {
@@ -50,11 +50,11 @@ export class AjaxInterceptor implements HttpInterceptor {
         const params = req.method.toLowerCase() == 'post' ? 'body' : 'params';
         const service = this.getParamValue(req, params, 'service');
         let paging = this.getParamValue(req, params, 'paging') ? this.getParamValue(req, params, 'paging') : null;
-        paging = typeof paging === 'string' ? JSON.stringify(paging) : paging;
+        paging = typeof paging === 'string' ? JSON.parse(paging) : paging;
         let filter = this.getParamValue(req, params, 'filter') ? this.getParamValue(req, params, 'filter') : null;
-        filter = typeof filter === 'string' ? JSON.stringify(filter) : filter;
+        filter = typeof filter === 'string' ? JSON.parse(filter) : filter;
         let sort = this.getParamValue(req, params, 'sort') ? this.getParamValue(req, params, 'sort') : null;
-        sort = typeof sort === 'string' ? JSON.stringify(sort) : sort;
+        sort = typeof sort === 'string' ? JSON.parse(sort) : sort;
         return PageableData.get({service, paging, filter, sort});
     }
 

src/app/demo/transfer/pageable-array/demo.component.ts

@@ -8,15 +8,12 @@ import {TableData} from "jigsaw/core/data/table-data";
 })
 export class TransferPageableArrayComponent {
     constructor(private _http: HttpClient) {
-        this.data = new PageableArray(_http, {
-            url: '/rdk/service/app/example/server/my_service',
-            method: 'post'
-        });
+        this.data = new PageableArray(_http, 'mock-data/countries');
         this.data.fromAjax();
 
         this.selectedCountries = new ArrayCollection();
         this.selectedCountries.http = _http;
-        this.selectedCountries.fromAjax('/rdk/service/app/example/server/my_service');
+        this.selectedCountries.fromAjax('mock-data/countries');
         this.selectedCountries.dataReviser = (td: TableData) => TableData.toArray(td).slice(10,15);
     }
 

src/jigsaw/component/transfer/transfer-list.html

@@ -32,5 +32,8 @@
     </div>
 </div>
 <div class="jigsaw-transfer-foot" *ngIf="data && data.pagingInfo && data.pagingInfo.pageSize != _$infinity">
-    <j-pagination [data]="data" mode="simple" (currentChange)="_$updateCurrentPageSelectedItems()"></j-pagination>
+    <j-pagination [total]="data.pagingInfo.totalRecord"
+                  [pageSize]="data.pagingInfo.pageSize"
+                  [(current)]="data.pagingInfo.currentPage"
+                  mode="simple" (currentChange)="_$updateCurrentPageSelectedItems()"></j-pagination>
 </div>

src/jigsaw/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rdkmaster/jigsaw",
-    "version": "1.1.15",
+    "version": "1.1.16",
     "description": "Jigsaw, the next generation component set for RDK",
     "main": "./bundles/jigsaw.umd.js",
     "module": "./@rdkmaster/jigsaw.es5.js",