Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/datatable/components/dataindex/dataindex.component.html

@@ -19,7 +19,7 @@
         </p>
       </ng-template>
       <ng-template #AdvanceDepositFooter>
-        <g2-custom #AdvanceDeposit delay="100"></g2-custom>
+        <g2-custom #AdvanceDeposit></g2-custom>
         <!-- <g2-mini-area line color="#cceafe" height="45" [data]="totalAdvanceDeposit?.list || []"
           (clickItem)="handleClick($event)">
         </g2-mini-area> -->
@@ -75,12 +75,12 @@
 </div>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <nz-card  acl  [acl-ability]="['dataindex-getBillTypeProportion']"><label class="chart_title">订单类型比例</label>
+    <nz-card acl [acl-ability]="['dataindex-getBillTypeProportion']"><label class="chart_title">订单类型比例</label>
       <g2-custom #g2custom delay="100"></g2-custom>
     </nz-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="18">
-    <nz-card  acl  [acl-ability]="['dataindex-getBillAmount']"><label class="chart_title">大区业绩完成情况</label>
+    <nz-card acl [acl-ability]="['dataindex-getBillAmount']"><label class="chart_title">大区业绩完成情况</label>
       <!-- <g2-timeline [data]="chartData" [titleMap]="{ y1: '订单金额（元）', y2: '' }" [height]="200" mask="MM月DD日"
         [slider]="false"></g2-timeline> -->
       <g2-custom #RegionalPerforman delay="100"></g2-custom>
@@ -89,7 +89,7 @@
 </div>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <nz-card  acl  [acl-ability]="['dataindex-getWayBillDirectProportion']"> <label class="chart_title">运单直付比例</label>
+    <nz-card acl [acl-ability]="['dataindex-getWayBillDirectProportion']"> <label class="chart_title">运单直付比例</label>
       <!-- <g2-pie #pie title="销售额" subTitle="销售额" [total]="total" [valueFormat]="format" [data]="salesPieData" height="294"
         (clickItem)="handleClick($event)" [lineWidth]="10">
       </g2-pie> -->
@@ -97,7 +97,7 @@
     </nz-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="18">
-    <nz-card  acl  [acl-ability]="['dataindex-getBillPaymentAmount']">
+    <nz-card acl [acl-ability]="['dataindex-getBillPaymentAmount']">
       <label class="chart_title">业绩完成情况</label>
       <!-- <g2-bar  [data]="salesData" (clickItem)="handleClick($event)" height="400"></g2-bar> -->
       <g2-custom #SaleProportion delay="100"></g2-custom>

src/app/routes/datatable/components/dataindex/dataindex.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area';
 import { G2PieClickItem, G2PieComponent, G2PieData } from '@delon/chart/pie';
@@ -18,7 +18,7 @@ import { GeometryLabelCfg } from '@antv/g2/lib/interface';
   styleUrls: ['./dataindex.component.less'],
   providers: [CurrencyPipe]
 })
-export class DatatableDataindexComponent implements OnInit {
+export class DatatableDataindexComponent implements OnInit, AfterViewInit {
   @ViewChild('AdvanceDeposit', { static: false }) AdvanceDeposit!: G2CustomComponent;
   @ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent;
   @ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent;
@@ -38,13 +38,16 @@ export class DatatableDataindexComponent implements OnInit {
 
   regionalPerformanceCompletion: DataPerformanceTrendVO[] = [];
 
-  constructor(private service: DataService, private currency: CurrencyPipe) {}
+  constructor(private service: DataService, private currency: CurrencyPipe) { }
-
+  ngAfterViewInit(): void {
-  ngOnInit(): void {
     this.initMiniAreaData();
     this.initOthersData();
   }
 
+  ngOnInit(): void {
+
+  }
+
   private initMiniAreaData() {
     // 客户预存款总额
     this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => {
@@ -80,7 +83,7 @@ export class DatatableDataindexComponent implements OnInit {
         const billTypeDatas2 = this.formatCoordinateData(res);
         console.log(billTypeDatas2);
 
-        this.initBillChart(this.g2custom['el'].nativeElement as any,billTypeDatas2);
+        this.initBillChart(this.g2custom['el'].nativeElement as any, billTypeDatas2);
       }
     });
     // 大区业绩完成情况
@@ -101,7 +104,6 @@ export class DatatableDataindexComponent implements OnInit {
       if (res) {
         const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType })));
         console.log(billTypeDatas);
-        
         this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas);
       }
     });
@@ -145,7 +147,7 @@ export class DatatableDataindexComponent implements OnInit {
 
     chart.scale('percent', {
       formatter: val => {
-        val = (val * 100 ).toFixed(0)+ '%';
+        val = (val * 100).toFixed(0) + '%';
         return val;
       }
     });
@@ -202,7 +204,7 @@ export class DatatableDataindexComponent implements OnInit {
       .label('percent', percent => {
         return {
           content: data => {
-            return (percent * 100).toFixed(0)+`%`;
+            return (percent * 100).toFixed(0) + `%`;
           },
           style: { fontSize: 14 }
         };
@@ -351,6 +353,8 @@ export class DatatableDataindexComponent implements OnInit {
         }
         return {};
       });
+    console.log(chart);
+
     chart.render();
   }
 

src/app/routes/datatable/datatable.module.ts

@@ -86,7 +86,7 @@ const COMPONENTS: Type<void>[] = [
   imports: [
     SharedModule,
     DatatableRoutingModule,
-    SHARED_G2_MODULES
+    ...SHARED_G2_MODULES
   ],
   declarations: COMPONENTS,
 })

src/app/routes/regulatory-data/regulatory-data.module.ts

@@ -9,6 +9,6 @@ const COMPONENTS: any = [DashboardComponent];
 const NOTROUTECOMPONENTS: any = [];
 @NgModule({
   declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
-  imports: [CommonModule, RegulatoryDataRoutingModule, SharedModule, SHARED_G2_MODULES]
+  imports: [CommonModule, RegulatoryDataRoutingModule, SharedModule, ...SHARED_G2_MODULES]
 })
 export class RegulatoryDataModule {}

src/app/routes/routes.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, Type } from '@angular/core';
-import { SharedModule, STWidgetModule } from '@shared';
+import { BasicModuleModule, SharedModule, STWidgetModule } from '@shared';
 
 // dashboard pages
 import { DashboardComponent } from './dashboard/dashboard.component';
@@ -14,9 +14,8 @@ const COMPONENTS_NOROUNT: Array<Type<void>> = [];
 @NgModule({
   imports: [
     LayoutModule,
-    SharedModule,
+    BasicModuleModule,
     GlobalConfigModule.forRoot(),
-    STWidgetModule,
     RouteRoutingModule
   ],
   declarations: [...COMPONENTS, ...COMPONENTS_NOROUNT],

src/app/routes/tax-management/taxmanagement.module.ts

@@ -35,7 +35,7 @@ const COMPONENTS: Type<void>[] = [
   imports: [
     SharedModule,
     TaxManagementModuleRoutingModule,
-    SHARED_G2_MODULES
+    ...SHARED_G2_MODULES
   ],
   declarations: COMPONENTS,
 })

src/app/shared/basic-module.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+@NgModule({
+  declarations: [],
+  imports: [CommonModule, FormsModule, RouterModule, HttpClientModule, ReactiveFormsModule],
+  exports: [CommonModule, FormsModule, HttpClientModule, ReactiveFormsModule, RouterModule]
+})
+export class BasicModuleModule {}

src/app/shared/components/search-drawer/search-drawer.module.ts

@@ -5,10 +5,12 @@ import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module';
 import { SearchDrawerComponent } from './search-drawer.component';
 import { FormsModule } from '@angular/forms';
 import { DelonACLModule } from '@delon/acl';
+import { DelonFormModule } from '@delon/form';
+import { STWidgetModule } from '../../widget/st-widget.module';
 
 @NgModule({
   declarations: [SearchDrawerComponent],
-  imports: [CommonModule, FormsModule, DelonACLModule, ...SHARED_DELON_MODULES, ...SHARED_ZORRO_MODULES],
+  imports: [CommonModule, FormsModule, DelonACLModule, DelonFormModule, STWidgetModule, ...SHARED_DELON_MODULES, ...SHARED_ZORRO_MODULES],
   exports: [SearchDrawerComponent]
 })
 export class SearchDrawerModule {}

src/app/shared/index.ts

@@ -30,6 +30,7 @@ export * from './services';
 export * from './pipes';
 
 // Module
+export * from './basic-module.module';
 export * from './shared.module';
 export * from './shared-delon.module';
 export * from './shared-zorro.module';

src/app/shared/shared.module.ts

@@ -41,9 +41,11 @@ import { CaptchaModule } from './components/captcha';
 import { rebateTableModule } from './components/rebate-table';
 import { SearchDrawerModule } from './components/search-drawer';
 import { HttpClientModule } from '@angular/common/http';
+import { BasicModuleModule } from './basic-module.module';
+import { STWidgetModule } from './widget/st-widget.module';
+import { GlobalConfigModule } from '../global-config.module';
 // import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component';
 
-
 const MODULES = [
   AddressModule,
   DelayModule,
@@ -65,15 +67,12 @@ const MODULES = [
 ];
 // #endregion
 
-const SHAREDCOMPONENTS = [LogisticsTimeLineComponent, DictSelectComponent, AccountDetailComponent];
+const SHAREDCOMPONENTS = [LogisticsTimeLineComponent, AccountDetailComponent];
 
 @NgModule({
   imports: [
-    CommonModule,
+    BasicModuleModule,
-    FormsModule,
+    STWidgetModule,
-    RouterModule,
-    HttpClientModule,
-    ReactiveFormsModule,
     AlainThemeModule.forChild(),
     DelonACLModule,
     DelonFormModule,
@@ -83,11 +82,8 @@ const SHAREDCOMPONENTS = [LogisticsTimeLineComponent, DictSelectComponent, Accou
     // third libs
   ],
   exports: [
-    CommonModule,
+    BasicModuleModule,
-    FormsModule,
+    STWidgetModule,
-    HttpClientModule,
-    ReactiveFormsModule,
-    RouterModule,
     AlainThemeModule,
     DelonACLModule,
     DelonFormModule,

src/app/shared/widget/st-widget.module.ts

@@ -33,6 +33,9 @@ import { NounWidget } from './noun/noun.widget';
 import { PropertyValuesWidget } from './property-values/property-values.widget';
 import { SpecValuesWidget } from './spec-values/spec-values.widget';
 import { TinymceWidget } from './tinymce/tinymce.widget';
+import { SHARED_ZORRO_MODULES } from '../shared-zorro.module';
+import { SharedThirdModule } from '../shared-third.module';
+import { DictSelectComponent } from '../components/dict-select/dict-select.component';
 
 export const STWIDGET_COMPONENTS = [
   EditorWidget,
@@ -45,7 +48,8 @@ export const STWIDGET_COMPONENTS = [
   PropertyValuesWidget,
   SLFromToSearchWidget,
   DictSelectWidget,
-  STCurrencyCHYWidget
+  STCurrencyCHYWidget,
+  DictSelectComponent,
 ];
 
 @NgModule({
@@ -53,6 +57,8 @@ export const STWIDGET_COMPONENTS = [
   imports: [
     CommonModule,
     FormsModule,
+    ...SHARED_ZORRO_MODULES,
+    SharedThirdModule,
     DelonFormModule.forRoot(),
     AddressModule,
     EditorModule,
@@ -63,8 +69,7 @@ export const STWIDGET_COMPONENTS = [
     NzInputModule,
     NzDatePickerModule,
     NzInputNumberModule,
-    NgxTinymceModule,
+    NgxTinymceModule
-    SharedModule
   ],
   exports: [...STWIDGET_COMPONENTS],
   entryComponents: STWIDGET_COMPONENTS
@@ -82,7 +87,6 @@ export class STWidgetModule {
     widgetRegistry.register(SLFromToSearchWidget.KEY, SLFromToSearchWidget);
     widgetRegistry.register(DictSelectWidget.KEY, DictSelectWidget);
 
-
     sTWidgetRegistry.register(STCurrencyCHYWidget.KEY, STCurrencyCHYWidget);
   }
 }