From 4cd3f6dbfe5647e7e3eeb14d7c56e423f24e1453 Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Mon, 29 Nov 2021 09:39:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carorderlist/carorderlist.component.html | 9 ++++ .../carorderlist.component.spec.ts | 24 ++++++++++ .../carorderlist/carorderlist.component.ts | 45 +++++++++++++++++++ src/app/routes/order/order-routing.module.ts | 13 ++++++ src/app/routes/order/order.module.ts | 16 +++++++ src/app/routes/routes-routing.module.ts | 2 +- src/assets/mocks/menu-data.json | 18 +++++++- 7 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 src/app/routes/order/carorderlist/carorderlist.component.html create mode 100644 src/app/routes/order/carorderlist/carorderlist.component.spec.ts create mode 100644 src/app/routes/order/carorderlist/carorderlist.component.ts create mode 100644 src/app/routes/order/order-routing.module.ts create mode 100644 src/app/routes/order/order.module.ts diff --git a/src/app/routes/order/carorderlist/carorderlist.component.html b/src/app/routes/order/carorderlist/carorderlist.component.html new file mode 100644 index 00000000..482ccb06 --- /dev/null +++ b/src/app/routes/order/carorderlist/carorderlist.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/routes/order/carorderlist/carorderlist.component.spec.ts b/src/app/routes/order/carorderlist/carorderlist.component.spec.ts new file mode 100644 index 00000000..ebce2e42 --- /dev/null +++ b/src/app/routes/order/carorderlist/carorderlist.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderCarorderlistComponent } from './carorderlist.component'; + +describe('OrderCarorderlistComponent', () => { + let component: OrderCarorderlistComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderCarorderlistComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderCarorderlistComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order/carorderlist/carorderlist.component.ts b/src/app/routes/order/carorderlist/carorderlist.component.ts new file mode 100644 index 00000000..4531e571 --- /dev/null +++ b/src/app/routes/order/carorderlist/carorderlist.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-order-carorderlist', + templateUrl: './carorderlist.component.html', +}) +export class OrderCarorderlistComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/order/order-routing.module.ts b/src/app/routes/order/order-routing.module.ts new file mode 100644 index 00000000..ca60d673 --- /dev/null +++ b/src/app/routes/order/order-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { OrderCarorderlistComponent } from './carorderlist/carorderlist.component'; + +const routes: Routes = [ + + { path: 'carorderlist', component: OrderCarorderlistComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class OrderRoutingModule { } diff --git a/src/app/routes/order/order.module.ts b/src/app/routes/order/order.module.ts new file mode 100644 index 00000000..16d91fb2 --- /dev/null +++ b/src/app/routes/order/order.module.ts @@ -0,0 +1,16 @@ +import { NgModule, Type } from '@angular/core'; +import { SharedModule } from '@shared'; +import { OrderRoutingModule } from './order-routing.module'; +import { OrderCarorderlistComponent } from './carorderlist/carorderlist.component'; + +const COMPONENTS: Type[] = [ + OrderCarorderlistComponent]; + +@NgModule({ + imports: [ + SharedModule, + OrderRoutingModule + ], + declarations: COMPONENTS, +}) +export class OrderModule { } diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 0f1254e9..48d35291 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -13,7 +13,7 @@ const routes: Routes = [ children: [ { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, { path: 'dashboard', component: DashboardComponent }, - ], + { path: 'order', loadChildren: () => import('./order/order.module').then((m) => m.OrderModule) },], }, // passport { path: '', loadChildren: () => import('./passport/passport.module').then((m) => m.PassportModule) }, diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index dad1d744..c9aa327c 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -15,8 +15,24 @@ "icon": "anticon anticon-rocket", "shortcutRoot": true, "children": [] + + }, + { + "text": "订单管理", + "icon": "anticon anticon-rocket", + "shortcutRoot": true, + "children": [ + { + "text": "整车订单", + "link": "/order/carorderlist" + }, + { + "text": "大宗订单", + "link": "/ctc/order/bigcarorderlist" + } + ] } ] } ] -} +} \ No newline at end of file From a695fc293c646ba46229f90a27d5362a3f6156df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=AD=9D=E6=98=9F?= Date: Mon, 29 Nov 2021 10:02:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=E8=8F=9C=E5=8D=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4cd3f6dbfe5647e7e3eeb14d7c56e423f24e1453 --- .../carorderlist/carorderlist.component.html | 9 ---- .../carorderlist.component.spec.ts | 24 ---------- .../carorderlist/carorderlist.component.ts | 45 ------------------- src/app/routes/order/order-routing.module.ts | 13 ------ src/app/routes/order/order.module.ts | 16 ------- src/app/routes/routes-routing.module.ts | 2 +- src/assets/mocks/menu-data.json | 18 +------- 7 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 src/app/routes/order/carorderlist/carorderlist.component.html delete mode 100644 src/app/routes/order/carorderlist/carorderlist.component.spec.ts delete mode 100644 src/app/routes/order/carorderlist/carorderlist.component.ts delete mode 100644 src/app/routes/order/order-routing.module.ts delete mode 100644 src/app/routes/order/order.module.ts diff --git a/src/app/routes/order/carorderlist/carorderlist.component.html b/src/app/routes/order/carorderlist/carorderlist.component.html deleted file mode 100644 index 482ccb06..00000000 --- a/src/app/routes/order/carorderlist/carorderlist.component.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/app/routes/order/carorderlist/carorderlist.component.spec.ts b/src/app/routes/order/carorderlist/carorderlist.component.spec.ts deleted file mode 100644 index ebce2e42..00000000 --- a/src/app/routes/order/carorderlist/carorderlist.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderCarorderlistComponent } from './carorderlist.component'; - -describe('OrderCarorderlistComponent', () => { - let component: OrderCarorderlistComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ OrderCarorderlistComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(OrderCarorderlistComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/order/carorderlist/carorderlist.component.ts b/src/app/routes/order/carorderlist/carorderlist.component.ts deleted file mode 100644 index 4531e571..00000000 --- a/src/app/routes/order/carorderlist/carorderlist.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; -import { SFSchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; - -@Component({ - selector: 'app-order-carorderlist', - templateUrl: './carorderlist.component.html', -}) -export class OrderCarorderlistComponent implements OnInit { - url = `/user`; - searchSchema: SFSchema = { - properties: { - no: { - type: 'string', - title: '编号' - } - } - }; - @ViewChild('st') private readonly st!: STComponent; - columns: STColumn[] = [ - { title: '编号', index: 'no' }, - { title: '调用次数', type: 'number', index: 'callNo' }, - { title: '头像', type: 'img', width: '50px', index: 'avatar' }, - { title: '时间', type: 'date', index: 'updatedAt' }, - { - title: '', - buttons: [ - // { text: '查看', click: (item: any) => `/form/${item.id}` }, - // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, - ] - } - ]; - - constructor(private http: _HttpClient, private modal: ModalHelper) { } - - ngOnInit(): void { } - - add(): void { - // this.modal - // .createStatic(FormEditComponent, { i: { id: 0 } }) - // .subscribe(() => this.st.reload()); - } - -} diff --git a/src/app/routes/order/order-routing.module.ts b/src/app/routes/order/order-routing.module.ts deleted file mode 100644 index ca60d673..00000000 --- a/src/app/routes/order/order-routing.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { OrderCarorderlistComponent } from './carorderlist/carorderlist.component'; - -const routes: Routes = [ - - { path: 'carorderlist', component: OrderCarorderlistComponent }]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class OrderRoutingModule { } diff --git a/src/app/routes/order/order.module.ts b/src/app/routes/order/order.module.ts deleted file mode 100644 index 16d91fb2..00000000 --- a/src/app/routes/order/order.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule, Type } from '@angular/core'; -import { SharedModule } from '@shared'; -import { OrderRoutingModule } from './order-routing.module'; -import { OrderCarorderlistComponent } from './carorderlist/carorderlist.component'; - -const COMPONENTS: Type[] = [ - OrderCarorderlistComponent]; - -@NgModule({ - imports: [ - SharedModule, - OrderRoutingModule - ], - declarations: COMPONENTS, -}) -export class OrderModule { } diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 48d35291..0f1254e9 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -13,7 +13,7 @@ const routes: Routes = [ children: [ { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, { path: 'dashboard', component: DashboardComponent }, - { path: 'order', loadChildren: () => import('./order/order.module').then((m) => m.OrderModule) },], + ], }, // passport { path: '', loadChildren: () => import('./passport/passport.module').then((m) => m.PassportModule) }, diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index c9aa327c..dad1d744 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -15,24 +15,8 @@ "icon": "anticon anticon-rocket", "shortcutRoot": true, "children": [] - - }, - { - "text": "订单管理", - "icon": "anticon anticon-rocket", - "shortcutRoot": true, - "children": [ - { - "text": "整车订单", - "link": "/order/carorderlist" - }, - { - "text": "大宗订单", - "link": "/ctc/order/bigcarorderlist" - } - ] } ] } ] -} \ No newline at end of file +} From 7649109b2964b27b03ba15dc71d78519056761bd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 29 Nov 2021 20:02:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .husky/.gitignore diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 00000000..31354ec1 --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ From 15e200c7877f55a77f4ef1c1c0b9c063813bef06 Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Fri, 8 Apr 2022 17:46:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customtable/driver/driver.component.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.ts b/src/app/routes/datatable/components/customtable/driver/driver.component.ts index 3050a847..58ca396f 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -130,11 +130,22 @@ export class DatatableDriverComponent implements OnInit { if(result === null) { return } - if (this.mode === 'year') { + // if (this.mode === 'year') { + // this.queryTime = this.datePipe.transform(this.date, 'yyyy') + // } else if (this.mode === 'month') { + // this.queryTime = this.datePipe.transform(this.date, 'yyyy-MM') + // } + + if(this.mode === 'year') { this.queryTime = [this.datePipe.transform(this.date, 'yyyy')] - } else if (this.mode === 'month') { + } else if(this.mode === 'month') { this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM')] + } else if(this.mode === 'date') { + this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM-dd')] + } else{ + this.queryTime = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd'), this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd')] } + this.st.reload({ ...this.reqParams }); } disabledDate = (current: Date): boolean => From 47a4dedb140a8afe1ab9f6d086c64825bb7ea365 Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Fri, 8 Apr 2022 18:06:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatable/components/customtable/driver/driver.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.ts b/src/app/routes/datatable/components/customtable/driver/driver.component.ts index 58ca396f..e24a58c5 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -19,7 +19,7 @@ export class DatatableDriverComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; - queryTime: any = '' + queryTime: any = [new Date().getFullYear()] dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {};