Skip to content

Commit 7ccecc1

Browse files
committed
refactor(standalone): update some components to standalone components
includes: Find Form Highlight Image Input InputNumber Layout Link List Loading Menu Message
1 parent 390ed18 commit 7ccecc1

File tree

411 files changed

+3370
-2247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

411 files changed

+3370
-2247
lines changed

.prettierrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"printWidth": 100,
2+
"printWidth": 120,
33
"semi": true,
44
"singleQuote": true,
55
"trailingComma": "none"

docs/course/rbac/4-ui-navigation/demo/13__ui/src/layout/index/index.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { SidebarComponent } from './sidebar/sidebar.component';
88
import { TabsComponent } from './tabs/tabs.component';
99
import { RouterModule } from '@angular/router';
1010
import { mainRoutes } from 'src/environments/routes';
11-
import { XMenuModule } from '@ng-nest/ui/menu';
11+
import { XMenuComponent } from '@ng-nest/ui/menu';
1212
import { XSliderModule } from '@ng-nest/ui/slider';
1313
import { XIconComponent } from '@ng-nest/ui/icon';
1414
import { XCrumbModule } from '@ng-nest/ui/crumb';
@@ -17,7 +17,7 @@ import { XCrumbModule } from '@ng-nest/ui/crumb';
1717
declarations: [IndexComponent, ContentComponent, CrumbComponent, HeaderComponent, SidebarComponent, TabsComponent],
1818
imports: [
1919
CommonModule,
20-
XMenuModule,
20+
XMenuComponent,
2121
XSliderModule,
2222
XIconComponent,
2323
XCrumbModule,

docs/course/rbac/4-ui-navigation/demo/9__ui/src/layout/index/index.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import { SidebarComponent } from './sidebar/sidebar.component';
88
import { TabsComponent } from './tabs/tabs.component';
99
import { RouterModule } from '@angular/router';
1010
import { mainRoutes } from 'src/environments/routes';
11-
import { XMenuModule } from '@ng-nest/ui/menu';
11+
import { XMenuComponent } from '@ng-nest/ui/menu';
1212
import { XSliderModule } from '@ng-nest/ui/slider';
1313
import { XIconComponent } from '@ng-nest/ui/icon';
1414

1515
@NgModule({
1616
declarations: [IndexComponent, ContentComponent, CrumbComponent, HeaderComponent, SidebarComponent, TabsComponent],
1717
imports: [
1818
CommonModule,
19-
XMenuModule,
19+
XMenuComponent,
2020
XSliderModule,
2121
XIconComponent,
2222
RouterModule.forChild([

docs/course/rbac/5-user-manage/demo/24__ui/src/main/system/users/user.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router';
55
import { XTableModule } from '@ng-nest/ui/table';
66
import { UserDetailComponent } from './user-detail/user-detail.component';
77
import { XButtonComponent } from '@ng-nest/ui/button';
8-
import { XFormModule } from '@ng-nest/ui/form';
8+
import { XFormComponent } from '@ng-nest/ui/form';
99
import { XMessageModule } from '@ng-nest/ui/message';
1010

1111
@NgModule({
@@ -14,7 +14,7 @@ import { XMessageModule } from '@ng-nest/ui/message';
1414
CommonModule,
1515
XTableModule,
1616
XButtonComponent,
17-
XFormModule,
17+
XFormComponent,
1818
XMessageModule,
1919
RouterModule.forChild([
2020
{ path: '', component: UserComponent },

docs/course/rbac/5-user-manage/demo/25__ui/src/main/system/users/user.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router';
55
import { XTableModule } from '@ng-nest/ui/table';
66
import { UserDetailComponent } from './user-detail/user-detail.component';
77
import { XButtonComponent } from '@ng-nest/ui/button';
8-
import { XFormModule } from '@ng-nest/ui/form';
8+
import { XFormComponent } from '@ng-nest/ui/form';
99
import { XMessageModule } from '@ng-nest/ui/message';
1010
import { XLinkComponent } from '@ng-nest/ui/link';
1111
import { XMessageBoxModule } from '@ng-nest/ui/message-box';
@@ -16,7 +16,7 @@ import { XMessageBoxModule } from '@ng-nest/ui/message-box';
1616
CommonModule,
1717
XTableModule,
1818
XButtonComponent,
19-
XFormModule,
19+
XFormComponent,
2020
XMessageModule,
2121
XLinkComponent,
2222
XMessageBoxModule,

lib/ng-nest/ui/auto-complete/auto-complete-portal.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import { XAutoCompleteNode, XAutoCompletePortalPrefix } from './auto-complete.pr
1515
import { Subject, BehaviorSubject } from 'rxjs';
1616
import { XBoolean, XConnectBaseAnimation, XNumber, XPositionTopBottom } from '@ng-nest/ui/core';
1717
import { filter, takeUntil } from 'rxjs/operators';
18-
import { XListComponent, XListModule } from '@ng-nest/ui/list';
18+
import { XListComponent } from '@ng-nest/ui/list';
1919
import { XInputComponent } from '@ng-nest/ui/input';
2020

2121
@Component({
2222
selector: `${XAutoCompletePortalPrefix}`,
2323
standalone: true,
24-
imports: [XListModule],
24+
imports: [XListComponent],
2525
templateUrl: './auto-complete-portal.component.html',
2626
styleUrls: ['./auto-complete-portal.component.scss'],
2727
encapsulation: ViewEncapsulation.None,

lib/ng-nest/ui/auto-complete/auto-complete.component.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import { XData } from '@ng-nest/ui/core';
1111
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
1212
import { XThemeModule } from '@ng-nest/ui/theme';
1313
import { XRadioModule } from '@ng-nest/ui/radio';
14-
import { XInputModule } from '@ng-nest/ui/input';
14+
import { XInputComponent } from '@ng-nest/ui/input';
1515
import { XSelectModule } from '@ng-nest/ui/select';
1616
import { XCascadeComponent } from '@ng-nest/ui/cascade';
1717
import { XColorPickerComponent } from '@ng-nest/ui/color-picker';
18-
import { XFindModule } from '@ng-nest/ui/find';
18+
import { XFindComponent } from '@ng-nest/ui/find';
1919
import { XTextareaModule } from '@ng-nest/ui/textarea';
2020
import { XTimePickerModule } from '@ng-nest/ui/time-picker';
2121
import { XButtonComponent } from '@ng-nest/ui/button';
@@ -38,10 +38,10 @@ describe(XAutoCompletePrefix, () => {
3838
XRadioModule,
3939
XSelectModule,
4040
XButtonComponent,
41-
XInputModule,
41+
XInputComponent,
4242
XCascadeComponent,
4343
XColorPickerComponent,
44-
XFindModule,
44+
XFindComponent,
4545
XTextareaModule,
4646
XTimePickerModule,
4747
XDatePickerComponent,

lib/ng-nest/ui/auto-complete/auto-complete.component.ts

+42-16
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import {
1313
ViewChild,
1414
inject
1515
} from '@angular/core';
16-
import { XAutoCompleteNode, XAutoCompleteProperty, XAutoCompletePrefix } from './auto-complete.property';
16+
import {
17+
XAutoCompleteNode,
18+
XAutoCompleteProperty,
19+
XAutoCompletePrefix
20+
} from './auto-complete.property';
1721
import {
1822
XIsEmpty,
1923
XIsObservable,
@@ -26,7 +30,7 @@ import {
2630
XParents
2731
} from '@ng-nest/ui/core';
2832
import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal';
29-
import { XInputModule, XInputComponent } from '@ng-nest/ui/input';
33+
import { XInputComponent } from '@ng-nest/ui/input';
3034
import { XAutoCompletePortalComponent } from './auto-complete-portal.component';
3135
import {
3236
Overlay,
@@ -43,7 +47,13 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
4347
@Component({
4448
selector: `${XAutoCompletePrefix}`,
4549
standalone: true,
46-
imports: [FormsModule, ReactiveFormsModule, XInputModule, XControlValueAccessor, XAutoCompletePortalComponent],
50+
imports: [
51+
FormsModule,
52+
ReactiveFormsModule,
53+
XInputComponent,
54+
XControlValueAccessor,
55+
XAutoCompletePortalComponent
56+
],
4757
templateUrl: './auto-complete.component.html',
4858
styleUrls: ['./auto-complete.component.scss'],
4959
encapsulation: ViewEncapsulation.None,
@@ -93,7 +103,13 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
93103
override cdr = inject(ChangeDetectorRef);
94104

95105
ngOnInit() {
96-
this.setFlex(this.autoComplete.nativeElement, this.renderer, this.justify, this.align, this.direction);
106+
this.setFlex(
107+
this.autoComplete.nativeElement,
108+
this.renderer,
109+
this.justify,
110+
this.align,
111+
this.direction
112+
);
97113
this.setClassMap();
98114
this.setSubject();
99115
this.setParantScroll();
@@ -257,10 +273,12 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
257273

258274
setPosition(config: OverlayConfig) {
259275
let position = config.positionStrategy as FlexibleConnectedPositionStrategy;
260-
position.positionChanges.pipe(takeUntil(this._unSubject)).subscribe((pos: ConnectedOverlayPositionChange) => {
261-
const place = XPortalConnectedPosition.get(pos.connectionPair) as XPositionTopBottom;
262-
place !== this.placement && this.positionChange.next(place);
263-
});
276+
position.positionChanges
277+
.pipe(takeUntil(this._unSubject))
278+
.subscribe((pos: ConnectedOverlayPositionChange) => {
279+
const place = XPortalConnectedPosition.get(pos.connectionPair) as XPositionTopBottom;
280+
place !== this.placement && this.positionChange.next(place);
281+
});
264282
}
265283

266284
setInstance() {
@@ -304,7 +322,13 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
304322
setPlacement() {
305323
return this.portalService.setPlacement({
306324
elementRef: this.inputCom.inputRef,
307-
placement: [this.placement as XPositionTopBottom, 'bottom-start', 'bottom-end', 'top-start', 'top-end'],
325+
placement: [
326+
this.placement as XPositionTopBottom,
327+
'bottom-start',
328+
'bottom-end',
329+
'top-start',
330+
'top-end'
331+
],
308332
transformOriginOn: 'x-auto-complete-portal'
309333
});
310334
}
@@ -334,13 +358,15 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
334358
this.icon = 'fto-loader';
335359
this.iconSpin = true;
336360
this.cdr.detectChanges();
337-
XSetData<XAutoCompleteNode>(this.data, this._unSubject, true, value as any).subscribe((x) => {
338-
this.icon = '';
339-
this.iconSpin = false;
340-
this.nodes = x;
341-
this.dataChange.next(this.nodes);
342-
this.cdr.detectChanges();
343-
});
361+
XSetData<XAutoCompleteNode>(this.data, this._unSubject, true, value as any).subscribe(
362+
(x) => {
363+
this.icon = '';
364+
this.iconSpin = false;
365+
this.nodes = x;
366+
this.dataChange.next(this.nodes);
367+
this.cdr.detectChanges();
368+
}
369+
);
344370
}
345371
}
346372
if (!this.onlySelect) {

lib/ng-nest/ui/cascade/cascade-portal.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import { of, Subject } from 'rxjs';
1717
import { delay, takeUntil } from 'rxjs/operators';
1818
import { XInputComponent } from '@ng-nest/ui/input';
1919
import { CommonModule } from '@angular/common';
20-
import { XListModule } from '@ng-nest/ui/list';
20+
import { XListComponent } from '@ng-nest/ui/list';
2121
import { FormsModule } from '@angular/forms';
2222

2323
@Component({
2424
selector: 'x-cascade-portal',
2525
standalone: true,
26-
imports: [CommonModule, FormsModule, XListModule],
26+
imports: [CommonModule, FormsModule, XListComponent],
2727
templateUrl: './cascade-portal.component.html',
2828
styleUrls: ['./cascade-portal.component.scss'],
2929
encapsulation: ViewEncapsulation.None,

lib/ng-nest/ui/cascade/cascade.component.spec.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { interval } from 'rxjs';
22
import { ComponentFixture, TestBed } from '@angular/core/testing';
3-
4-
import { XCascadeComponent } from './cascade.component';
53
import { Component, DebugElement, ChangeDetectorRef } from '@angular/core';
64
import { By } from '@angular/platform-browser';
75
import { XCascadeComponent } from '@ng-nest/ui/cascade';

lib/ng-nest/ui/cascade/cascade.component.ts

+4-14
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,23 @@ import {
2727
XParents,
2828
XConfigService
2929
} from '@ng-nest/ui/core';
30-
import {
31-
XPortalService,
32-
XPortalOverlayRef,
33-
XPortalConnectedPosition
34-
} from '@ng-nest/ui/portal';
35-
import { XInputComponent, XInputModule } from '@ng-nest/ui/input';
30+
import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal';
31+
import { XInputComponent } from '@ng-nest/ui/input';
3632
import {
3733
Overlay,
3834
OverlayConfig,
3935
FlexibleConnectedPositionStrategy,
4036
ConnectedOverlayPositionChange
4137
} from '@angular/cdk/overlay';
4238
import { filter, takeUntil } from 'rxjs/operators';
43-
import { XValueAccessor,XControlValueAccessor } from '@ng-nest/ui/base-form';
39+
import { XValueAccessor, XControlValueAccessor } from '@ng-nest/ui/base-form';
4440
import { CommonModule, DOCUMENT } from '@angular/common';
4541
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
4642

4743
@Component({
4844
selector: 'x-cascade',
4945
standalone: true,
50-
imports: [
51-
CommonModule,
52-
FormsModule,
53-
ReactiveFormsModule,
54-
XInputModule,
55-
XControlValueAccessor
56-
],
46+
imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputComponent, XControlValueAccessor],
5747
templateUrl: './cascade.component.html',
5848
styleUrls: ['./cascade.component.scss'],
5949
encapsulation: ViewEncapsulation.None,

lib/ng-nest/ui/checkbox/checkbox.component.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import { XDatePickerComponent } from '@ng-nest/ui/date-picker';
1515
import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete';
1616
import { XCascadeComponent } from '@ng-nest/ui/cascade';
1717
import { XColorPickerComponent } from '@ng-nest/ui/color-picker';
18-
import { XFindModule } from '@ng-nest/ui/find';
18+
import { XFindComponent } from '@ng-nest/ui/find';
1919
import { XTextareaModule } from '@ng-nest/ui/textarea';
2020
import { XTimePickerModule } from '@ng-nest/ui/time-picker';
21-
import { XInputModule } from '@ng-nest/ui/input';
21+
import { XInputComponent } from '@ng-nest/ui/input';
2222
import { HttpClientTestingModule } from '@angular/common/http/testing';
2323
import { XTagModule } from '@ng-nest/ui/tag';
2424

@@ -39,10 +39,10 @@ describe(XCheckboxPrefix, () => {
3939
XColComponent,
4040
XCascadeComponent,
4141
XColorPickerComponent,
42-
XFindModule,
42+
XFindComponent,
4343
XTextareaModule,
4444
XTimePickerModule,
45-
XInputModule,
45+
XInputComponent,
4646
XTagModule
4747
],
4848
declarations: [

lib/ng-nest/ui/checkbox/examples/en_US/default/perpost/perpost.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox';
44
import { FormsModule } from '@angular/forms';
55
import { XSelectModule } from '@ng-nest/ui/select';
66
import { XButtonComponent } from '@ng-nest/ui/button';
7-
import { XInputModule } from '@ng-nest/ui/input';
7+
import { XInputComponent } from '@ng-nest/ui/input';
88
import { XDatePickerComponent } from '@ng-nest/ui/date-picker';
99
import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete';
1010
import { XCascadeComponent } from '@ng-nest/ui/cascade';
@@ -19,7 +19,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker';
1919
XCheckboxComponent,
2020
XSelectModule,
2121
XButtonComponent,
22-
XInputModule,
22+
XInputComponent,
2323
XDatePickerComponent,
2424
XAutoCompleteComponent,
2525
XCascadeComponent,

lib/ng-nest/ui/checkbox/examples/zh_CN/default/perpost/perpost.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox';
44
import { FormsModule } from '@angular/forms';
55
import { XSelectModule } from '@ng-nest/ui/select';
66
import { XButtonComponent } from '@ng-nest/ui/button';
7-
import { XInputModule } from '@ng-nest/ui/input';
7+
import { XInputComponent } from '@ng-nest/ui/input';
88
import { XDatePickerComponent } from '@ng-nest/ui/date-picker';
99
import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete';
1010
import { XCascadeComponent } from '@ng-nest/ui/cascade';
@@ -19,7 +19,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker';
1919
XCheckboxComponent,
2020
XSelectModule,
2121
XButtonComponent,
22-
XInputModule,
22+
XInputComponent,
2323
XDatePickerComponent,
2424
XAutoCompleteComponent,
2525
XCascadeComponent,

0 commit comments

Comments
 (0)