cc-core-cli 1.0.35 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "Command Line Interface tool for generating project templates for the (Your Platform's Name) platform.",
   "main": "bin/index.js",
   "scripts": {

package/template/core/src/core/core.controller.ts

@@ -57,7 +57,7 @@ export class CoreController {
     ) {
       return this.serviceSetting.getSetting(params.entity);
     } else {
-      const { keywords, filters, page, page_size, sort, fields } = query;
+      const { keywords, filters, page, page_size, sort, grouping, fields } = query;
       return this.service.search(
         params.entity,
         keywords,
@@ -65,6 +65,7 @@ export class CoreController {
         page ? parseInt(page, 10) : 1,
         page_size ? parseInt(page_size, 10) : 10,
         sort,
+        this._convertFields(grouping),
         false,
         this._convertFields(fields)
       );
@@ -161,7 +162,7 @@ export class CoreController {
           this._convertFields(query.fields)
         );
       }
-      const { keywords, filters, page, page_size, sort } = query;
+      const { keywords, filters, page, page_size, sort, grouping } = query;
       return this.service.searchWithLayout(
         params.entity,
         params.key,
@@ -169,7 +170,8 @@ export class CoreController {
         convertFilter(filters),
         page ? parseInt(page, 10) : 1,
         page_size ? parseInt(page_size, 10) : 10,
-        sort
+        sort,
+        this._convertFields(grouping)
       );
     }
   }

package/template/core/src/core/core.service.ts

@@ -357,6 +357,7 @@ export class CoreService implements OnModuleInit {
     page: number = 1,
     pageSize: number = 10,
     sort: string = "",
+    grouping?: Array<string>,
     noTranslate?: boolean,
     fields?: Array<string>
   ): Promise<SearchResultDto> {
@@ -367,6 +368,7 @@ export class CoreService implements OnModuleInit {
       page,
       pageSize,
       sort,
+      grouping,
       noTranslate,
       fields
     );
@@ -392,6 +394,7 @@ export class CoreService implements OnModuleInit {
     page?: number,
     pageSize?: number,
     sort?: any,
+    grouping?: Array<string>,
     isDetail?: boolean
   ): Promise<SearchResultDto> {
     const service = await this._getService(entityName);
@@ -402,6 +405,7 @@ export class CoreService implements OnModuleInit {
       page,
       pageSize,
       sort,
+      grouping,
       isDetail
     );
   }