Merge master

npm/ng-packs/packages/core/src/lib/core.module.ts

@@ -27,7 +27,6 @@ import { getInitialData, localeInitializer } from './utils/initial-utils';
 import { ConfigPlugin, NGXS_CONFIG_PLUGIN_OPTIONS } from './plugins/config.plugin';
 import { ForDirective } from './directives/for.directive';
 import { AbstractNgModelComponent } from './abstracts/ng-model.component';
-import { TableSortDirective } from './directives/table-sort.directive';
 
 @NgModule({
   imports: [
@@ -47,7 +46,6 @@ import { TableSortDirective } from './directives/table-sort.directive';
     EllipsisDirective,
     ForDirective,
     FormSubmitDirective,
-    TableSortDirective,
     LocalizationPipe,
     SortPipe,
     PermissionDirective,
@@ -70,7 +68,6 @@ import { TableSortDirective } from './directives/table-sort.directive';
     FormSubmitDirective,
     LocalizationPipe,
     SortPipe,
-    TableSortDirective,
     PermissionDirective,
     VisibilityDirective,
     InputEventDebounceDirective,

npm/ng-packs/packages/core/src/lib/directives/index.ts

@@ -3,5 +3,4 @@ export * from './ellipsis.directive';
 export * from './for.directive';
 export * from './form-submit.directive';
 export * from './permission.directive';
-export * from './table-sort.directive';
 export * from './visibility.directive';

npm/ng-packs/packages/core/src/lib/utils/route-utils.ts

@@ -51,6 +51,12 @@ export function setChildRoute(routes: ABP.FullRoute[], parentNameArr: ABP.FullRo
 export function sortRoutes(routes: ABP.FullRoute[] = []): ABP.FullRoute[] {
   if (!routes.length) return [];
   return routes
+    .map((route, index) => {
+      return {
+        ...route,
+        order: typeof route.order === 'undefined' ? index + 1 : route.order,
+      };
+    })
     .sort((a, b) => a.order - b.order)
     .map(route => {
       if (route.children && route.children.length) {

npm/ng-packs/packages/theme-shared/src/lib/directives/index.ts

@@ -0,0 +1 @@
+export * from './table-sort.directive';

npm/ng-packs/packages/core/src/lib/directives/table-sort.directive.ts → npm/ng-packs/packages/theme-shared/src/lib/directives/table-sort.directive.ts

@@ -1,11 +1,13 @@
 import { Directive, Input, Optional, Self, SimpleChanges, OnChanges } from '@angular/core';
 import { Table } from 'primeng/table';
-import { SortPipe, SortOrder } from '../pipes/sort.pipe';
 import clone from 'just-clone';
+import { SortPipe, SortOrder } from '@abp/ng.core';
+
 export interface TableSortOptions {
   key: string;
   order: SortOrder;
 }
+
 @Directive({
   selector: '[abpTableSort]',
   providers: [SortPipe],

npm/ng-packs/packages/core/src/lib/tests/table-sort.directive.spec.ts → npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts

@@ -1,6 +1,6 @@
 import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator/jest';
-import { TableSortDirective } from '../directives/table-sort.directive';
 import { TableModule, Table } from 'primeng/table';
+import { TableSortDirective } from '../directives/table-sort.directive';
 
 describe('TableSortDirective', () => {
   let spectator: SpectatorDirective<TableSortDirective>;

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

@@ -1,9 +1,9 @@
 import { CoreModule, LazyLoadService } from '@abp/ng.core';
 import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core';
+import { NgxValidateCoreModule } from '@ngx-validate/core';
 import { MessageService } from 'primeng/components/common/messageservice';
 import { ToastModule } from 'primeng/toast';
 import { forkJoin } from 'rxjs';
-import { take } from 'rxjs/operators';
 import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component';
 import { ButtonComponent } from './components/button/button.component';
 import { ChartComponent } from './components/chart/chart.component';
@@ -11,13 +11,13 @@ import { ConfirmationComponent } from './components/confirmation/confirmation.co
 import { ErrorComponent } from './components/error/error.component';
 import { LoaderBarComponent } from './components/loader-bar/loader-bar.component';
 import { ModalComponent } from './components/modal/modal.component';
-import { ToastComponent } from './components/toast/toast.component';
 import { SortOrderIconComponent } from './components/sort-order-icon/sort-order-icon.component';
+import { TableEmptyMessageComponent } from './components/table-empty-message/table-empty-message.component';
+import { ToastComponent } from './components/toast/toast.component';
 import styles from './contants/styles';
+import { TableSortDirective } from './directives/table-sort.directive';
 import { ErrorHandler } from './handlers/error.handler';
 import { chartJsLoaded$ } from './utils/widget-utils';
-import { TableEmptyMessageComponent } from './components/table-empty-message/table-empty-message.component';
-import { NgxValidateCoreModule } from '@ngx-validate/core';
 
 export function appendScript(injector: Injector) {
   const fn = () => {
@@ -52,6 +52,7 @@ export function appendScript(injector: Injector) {
     TableEmptyMessageComponent,
     ToastComponent,
     SortOrderIconComponent,
+    TableSortDirective,
   ],
   exports: [
     BreadcrumbComponent,
@@ -63,6 +64,7 @@ export function appendScript(injector: Injector) {
     TableEmptyMessageComponent,
     ToastComponent,
     SortOrderIconComponent,
+    TableSortDirective,
   ],
   entryComponents: [ErrorComponent],
 })

npm/ng-packs/packages/theme-shared/src/public-api.ts

@@ -5,6 +5,7 @@
 export * from './lib/theme-shared.module';
 export * from './lib/animations';
 export * from './lib/components';
+export * from './lib/directives';
 export * from './lib/models';
 export * from './lib/services';
 export * from './lib/utils';