ng-alain 13.0.0-beta.1 → 13.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/application/files/root/.husky/pre-commit +1 -1
- package/application/files/root/.stylelintrc +1 -0
- package/application/files/src/app/core/i18n/i18n.service.ts +1 -1
- package/application/files/src/app/core/net/default.interceptor.ts +1 -1
- package/application/files/src/app/layout/basic/widgets/fullscreen.component.ts +4 -7
- package/application/files/src/app/layout/passport/passport.component.less +15 -1
- package/application/files/src/app/routes/exception/exception.component.ts +1 -1
- package/application/files/src/app/routes/passport/callback.component.ts +1 -1
- package/application/files/src/app/routes/passport/lock/lock.component.less +1 -0
- package/application/files/src/app/routes/passport/login/login.component.less +13 -3
- package/application/files/src/app/routes/passport/login/login.component.ts +4 -4
- package/application/files/src/app/routes/passport/register/register.component.less +10 -1
- package/application/files/src/app/routes/passport/register/register.component.ts +5 -5
- package/application/files/src/app/routes/passport/register-result/register-result.component.ts +1 -1
- package/application/files/src/styles/theme.less +1 -1
- package/application/files/src/styles.less +5 -5
- package/application/files/src/test.ts +3 -1
- package/application/index.js +2 -1
- package/application/index.js.map +1 -1
- package/application/index.ts +4 -1
- package/curd/index.js +1 -1
- package/curd/index.js.map +1 -1
- package/curd/index.ts +1 -1
- package/curd/schema.json +16 -0
- package/curd/schema.ts +1 -0
- package/docs/generate.en-US.md +3 -0
- package/docs/generate.zh-CN.md +3 -0
- package/edit/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template +9 -0
- package/edit/schema.json +16 -0
- package/edit/schema.ts +1 -0
- package/empty/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template +9 -0
- package/empty/index.spec.ts +25 -5
- package/empty/schema.json +16 -0
- package/empty/schema.ts +1 -0
- package/list/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template +9 -0
- package/list/index.spec.ts +7 -0
- package/list/schema.json +16 -0
- package/list/schema.ts +1 -0
- package/module/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template +9 -0
- package/module/index.js +29 -3
- package/module/index.js.map +1 -1
- package/module/index.spec.ts +16 -0
- package/module/index.ts +33 -5
- package/module/schema.json +16 -0
- package/module/schema.ts +3 -1
- package/ng-update/upgrade-rules/v13/index.js +59 -3
- package/ng-update/upgrade-rules/v13/index.js.map +1 -1
- package/ng-update/upgrade-rules/v13/index.spec.ts +13 -0
- package/ng-update/upgrade-rules/v13/index.ts +75 -4
- package/package.json +1 -1
- package/utils/alain.js +34 -8
- package/utils/alain.js.map +1 -1
- package/utils/alain.ts +44 -8
- package/utils/code-style.js +1 -1
- package/utils/code-style.js.map +1 -1
- package/utils/code-style.ts +1 -1
- package/utils/lib-versions.js +1 -1
- package/utils/lib-versions.ts +1 -1
- package/utils/log.js +3 -3
- package/utils/log.js.map +1 -1
- package/utils/log.ts +3 -3
- package/utils/versions.js +5 -1
- package/utils/versions.js.map +1 -1
- package/utils/versions.ts +5 -1
- package/utils/workspace.js +20 -1
- package/utils/workspace.js.map +1 -1
- package/utils/workspace.ts +15 -0
- package/view/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template +9 -0
- package/view/schema.json +16 -0
- package/view/schema.ts +1 -0
package/README.md
CHANGED
|
@@ -8,7 +8,7 @@ Angular CLI Schematics of ng-alain.
|
|
|
8
8
|
|
|
9
9
|
## Links
|
|
10
10
|
|
|
11
|
-
+ [Document](https://ng-alain.com/cli) ([Surge Mirror](https://ng-alain-doc.surge.sh/cli)
|
|
11
|
+
+ [Document](https://ng-alain.com/cli) ([Surge Mirror](https://ng-alain-doc.surge.sh/cli)
|
|
12
12
|
+ [@delon Source](https://github.com/ng-alain/delon)
|
|
13
13
|
+ [DEMO](https://ng-alain.surge.sh) ([国内镜像](https://ng-alain.gitee.io/))
|
|
14
14
|
|
|
@@ -59,7 +59,7 @@ const LANGS: { [key: string]: LangConfigData } = {
|
|
|
59
59
|
|
|
60
60
|
@Injectable({ providedIn: 'root' })
|
|
61
61
|
export class I18NService extends AlainI18nBaseService {
|
|
62
|
-
protected _defaultLang = DEFAULT;
|
|
62
|
+
protected override _defaultLang = DEFAULT;
|
|
63
63
|
private _langs = Object.keys(LANGS).map(code => {
|
|
64
64
|
const item = LANGS[code];
|
|
65
65
|
return { code, text: item.text, abbr: item.abbr };
|
|
@@ -80,7 +80,7 @@ export class DefaultInterceptor implements HttpInterceptor {
|
|
|
80
80
|
*/
|
|
81
81
|
private refreshTokenRequest(): Observable<any> {
|
|
82
82
|
const model = this.tokenSrv.get();
|
|
83
|
-
return this.http.post(`/api/auth/refresh`, null, null, { headers: { refresh_token: model?.refresh_token || '' } });
|
|
83
|
+
return this.http.post(`/api/auth/refresh`, null, null, { headers: { refresh_token: model?.['refresh_token'] || '' } });
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
// #region 刷新Token方式一：使用 401 重新刷新 Token
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChangeDetectionStrategy, Component, HostListener } from '@angular/core';
|
|
2
|
-
import
|
|
2
|
+
import screenfull from 'screenfull';
|
|
3
3
|
|
|
4
4
|
@Component({
|
|
5
5
|
selector: 'header-fullscreen',
|
|
@@ -14,19 +14,16 @@ import * as screenfull from 'screenfull';
|
|
|
14
14
|
})
|
|
15
15
|
export class HeaderFullScreenComponent {
|
|
16
16
|
status = false;
|
|
17
|
-
private get sf(): screenfull.Screenfull {
|
|
18
|
-
return screenfull as screenfull.Screenfull;
|
|
19
|
-
}
|
|
20
17
|
|
|
21
18
|
@HostListener('window:resize')
|
|
22
19
|
_resize(): void {
|
|
23
|
-
this.status =
|
|
20
|
+
this.status = screenfull.isFullscreen;
|
|
24
21
|
}
|
|
25
22
|
|
|
26
23
|
@HostListener('click')
|
|
27
24
|
_click(): void {
|
|
28
|
-
if (
|
|
29
|
-
|
|
25
|
+
if (screenfull.isEnabled) {
|
|
26
|
+
screenfull.toggle();
|
|
30
27
|
}
|
|
31
28
|
}
|
|
32
29
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
@import '
|
|
1
|
+
@import '@delon/theme/index';
|
|
2
|
+
|
|
2
3
|
:host ::ng-deep {
|
|
3
4
|
.container {
|
|
4
5
|
display: flex;
|
|
@@ -6,11 +7,13 @@
|
|
|
6
7
|
min-height: 100%;
|
|
7
8
|
background: #f0f2f5;
|
|
8
9
|
}
|
|
10
|
+
|
|
9
11
|
.langs {
|
|
10
12
|
width: 100%;
|
|
11
13
|
height: 40px;
|
|
12
14
|
line-height: 44px;
|
|
13
15
|
text-align: right;
|
|
16
|
+
|
|
14
17
|
.anticon {
|
|
15
18
|
margin-top: 24px;
|
|
16
19
|
margin-right: 24px;
|
|
@@ -19,10 +22,12 @@
|
|
|
19
22
|
cursor: pointer;
|
|
20
23
|
}
|
|
21
24
|
}
|
|
25
|
+
|
|
22
26
|
.wrap {
|
|
23
27
|
flex: 1;
|
|
24
28
|
padding: 32px 0;
|
|
25
29
|
}
|
|
30
|
+
|
|
26
31
|
.ant-form-item {
|
|
27
32
|
display: flex;
|
|
28
33
|
justify-content: space-between;
|
|
@@ -36,24 +41,30 @@
|
|
|
36
41
|
background-position: center 110px;
|
|
37
42
|
background-size: 100%;
|
|
38
43
|
}
|
|
44
|
+
|
|
39
45
|
.wrap {
|
|
40
46
|
padding: 32px 0 24px;
|
|
41
47
|
}
|
|
42
48
|
}
|
|
49
|
+
|
|
43
50
|
.top {
|
|
44
51
|
text-align: center;
|
|
45
52
|
}
|
|
53
|
+
|
|
46
54
|
.header {
|
|
47
55
|
height: 44px;
|
|
48
56
|
line-height: 44px;
|
|
57
|
+
|
|
49
58
|
a {
|
|
50
59
|
text-decoration: none;
|
|
51
60
|
}
|
|
52
61
|
}
|
|
62
|
+
|
|
53
63
|
.logo {
|
|
54
64
|
height: 44px;
|
|
55
65
|
margin-right: 16px;
|
|
56
66
|
}
|
|
67
|
+
|
|
57
68
|
.title {
|
|
58
69
|
position: relative;
|
|
59
70
|
color: @heading-color;
|
|
@@ -62,6 +73,7 @@
|
|
|
62
73
|
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
|
|
63
74
|
vertical-align: middle;
|
|
64
75
|
}
|
|
76
|
+
|
|
65
77
|
.desc {
|
|
66
78
|
margin-top: 12px;
|
|
67
79
|
margin-bottom: 40px;
|
|
@@ -75,9 +87,11 @@
|
|
|
75
87
|
.container {
|
|
76
88
|
background: #141414;
|
|
77
89
|
}
|
|
90
|
+
|
|
78
91
|
.title {
|
|
79
92
|
color: fade(@white, 85%);
|
|
80
93
|
}
|
|
94
|
+
|
|
81
95
|
.desc {
|
|
82
96
|
color: fade(@white, 45%);
|
|
83
97
|
}
|
|
@@ -9,7 +9,7 @@ import { ExceptionType } from '@delon/abc/exception';
|
|
|
9
9
|
})
|
|
10
10
|
export class ExceptionComponent {
|
|
11
11
|
get type(): ExceptionType {
|
|
12
|
-
return this.route.snapshot.data
|
|
12
|
+
return this.route.snapshot.data['type'];
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
constructor(private route: ActivatedRoute) {}
|
|
@@ -14,7 +14,7 @@ export class CallbackComponent implements OnInit {
|
|
|
14
14
|
constructor(private socialService: SocialService, private settingsSrv: SettingsService, private route: ActivatedRoute) {}
|
|
15
15
|
|
|
16
16
|
ngOnInit(): void {
|
|
17
|
-
this.type = this.route.snapshot.params
|
|
17
|
+
this.type = this.route.snapshot.params['type'];
|
|
18
18
|
this.mockModel();
|
|
19
19
|
}
|
|
20
20
|
|
|
@@ -1,39 +1,48 @@
|
|
|
1
|
-
@import '
|
|
1
|
+
@import '@delon/theme/index';
|
|
2
|
+
|
|
2
3
|
:host {
|
|
3
4
|
display: block;
|
|
4
5
|
width: 368px;
|
|
5
6
|
margin: 0 auto;
|
|
7
|
+
|
|
6
8
|
::ng-deep {
|
|
7
9
|
.ant-tabs .ant-tabs-bar {
|
|
8
10
|
margin-bottom: 24px;
|
|
9
11
|
text-align: center;
|
|
10
12
|
border-bottom: 0;
|
|
11
13
|
}
|
|
14
|
+
|
|
12
15
|
.ant-tabs-tab {
|
|
13
16
|
font-size: 16px;
|
|
14
17
|
line-height: 24px;
|
|
15
18
|
}
|
|
19
|
+
|
|
16
20
|
.ant-input-affix-wrapper .ant-input:not(:first-child) {
|
|
17
21
|
padding-left: 4px;
|
|
18
22
|
}
|
|
23
|
+
|
|
19
24
|
.icon {
|
|
20
25
|
margin-left: 16px;
|
|
21
|
-
color:
|
|
26
|
+
color: rgb(0 0 0 / 20%);
|
|
22
27
|
font-size: 24px;
|
|
23
28
|
vertical-align: middle;
|
|
24
29
|
cursor: pointer;
|
|
25
30
|
transition: color 0.3s;
|
|
31
|
+
|
|
26
32
|
&:hover {
|
|
27
33
|
color: @primary-color;
|
|
28
34
|
}
|
|
29
35
|
}
|
|
36
|
+
|
|
30
37
|
.other {
|
|
31
38
|
margin-top: 24px;
|
|
32
39
|
line-height: 22px;
|
|
33
40
|
text-align: left;
|
|
41
|
+
|
|
34
42
|
nz-tooltip {
|
|
35
43
|
vertical-align: middle;
|
|
36
44
|
}
|
|
45
|
+
|
|
37
46
|
.register {
|
|
38
47
|
float: right;
|
|
39
48
|
}
|
|
@@ -44,7 +53,8 @@
|
|
|
44
53
|
[data-theme='dark'] {
|
|
45
54
|
:host ::ng-deep {
|
|
46
55
|
.icon {
|
|
47
|
-
color:
|
|
56
|
+
color: rgb(255 255 255 / 20%);
|
|
57
|
+
|
|
48
58
|
&:hover {
|
|
49
59
|
color: #fff;
|
|
50
60
|
}
|
|
@@ -42,16 +42,16 @@ export class UserLoginComponent implements OnDestroy {
|
|
|
42
42
|
// #region fields
|
|
43
43
|
|
|
44
44
|
get userName(): AbstractControl {
|
|
45
|
-
return this.form.
|
|
45
|
+
return this.form.get('userName')!;
|
|
46
46
|
}
|
|
47
47
|
get password(): AbstractControl {
|
|
48
|
-
return this.form.
|
|
48
|
+
return this.form.get('password')!;
|
|
49
49
|
}
|
|
50
50
|
get mobile(): AbstractControl {
|
|
51
|
-
return this.form.
|
|
51
|
+
return this.form.get('mobile')!;
|
|
52
52
|
}
|
|
53
53
|
get captcha(): AbstractControl {
|
|
54
|
-
return this.form.
|
|
54
|
+
return this.form.get('captcha')!;
|
|
55
55
|
}
|
|
56
56
|
form: FormGroup;
|
|
57
57
|
error = '';
|
|
@@ -1,22 +1,27 @@
|
|
|
1
|
-
@import '
|
|
1
|
+
@import '@delon/theme/index';
|
|
2
|
+
|
|
2
3
|
:host {
|
|
3
4
|
display: block;
|
|
4
5
|
width: 368px;
|
|
5
6
|
margin: 0 auto;
|
|
7
|
+
|
|
6
8
|
::ng-deep {
|
|
7
9
|
h3 {
|
|
8
10
|
margin-bottom: 20px;
|
|
9
11
|
font-size: 16px;
|
|
10
12
|
}
|
|
13
|
+
|
|
11
14
|
.submit {
|
|
12
15
|
width: 50%;
|
|
13
16
|
}
|
|
17
|
+
|
|
14
18
|
.login {
|
|
15
19
|
float: right;
|
|
16
20
|
line-height: @btn-height-lg;
|
|
17
21
|
}
|
|
18
22
|
}
|
|
19
23
|
}
|
|
24
|
+
|
|
20
25
|
::ng-deep {
|
|
21
26
|
.register-password-cdk {
|
|
22
27
|
.success,
|
|
@@ -24,15 +29,19 @@
|
|
|
24
29
|
.error {
|
|
25
30
|
transition: color 0.3s;
|
|
26
31
|
}
|
|
32
|
+
|
|
27
33
|
.success {
|
|
28
34
|
color: @success-color;
|
|
29
35
|
}
|
|
36
|
+
|
|
30
37
|
.warning {
|
|
31
38
|
color: @warning-color;
|
|
32
39
|
}
|
|
40
|
+
|
|
33
41
|
.error {
|
|
34
42
|
color: @error-color;
|
|
35
43
|
}
|
|
44
|
+
|
|
36
45
|
.progress-pass > .progress {
|
|
37
46
|
.ant-progress-bg {
|
|
38
47
|
background-color: @warning-color;
|
|
@@ -32,19 +32,19 @@ export class UserRegisterComponent implements OnDestroy {
|
|
|
32
32
|
// #region fields
|
|
33
33
|
|
|
34
34
|
get mail(): AbstractControl {
|
|
35
|
-
return this.form.
|
|
35
|
+
return this.form.get('mail')!;
|
|
36
36
|
}
|
|
37
37
|
get password(): AbstractControl {
|
|
38
|
-
return this.form.
|
|
38
|
+
return this.form.get('password')!;
|
|
39
39
|
}
|
|
40
40
|
get confirm(): AbstractControl {
|
|
41
|
-
return this.form.
|
|
41
|
+
return this.form.get('confirm')!;
|
|
42
42
|
}
|
|
43
43
|
get mobile(): AbstractControl {
|
|
44
|
-
return this.form.
|
|
44
|
+
return this.form.get('mobile')!;
|
|
45
45
|
}
|
|
46
46
|
get captcha(): AbstractControl {
|
|
47
|
-
return this.form.
|
|
47
|
+
return this.form.get('captcha')!;
|
|
48
48
|
}
|
|
49
49
|
form: FormGroup;
|
|
50
50
|
error = '';
|
package/application/files/src/app/routes/passport/register-result/register-result.component.ts
CHANGED
|
@@ -10,6 +10,6 @@ export class UserRegisterResultComponent {
|
|
|
10
10
|
params = { email: '' };
|
|
11
11
|
email = '';
|
|
12
12
|
constructor(route: ActivatedRoute, public msg: NzMessageService) {
|
|
13
|
-
this.params.email = this.email = route.snapshot.queryParams
|
|
13
|
+
this.params.email = this.email = route.snapshot.queryParams['email'] || 'ng-alain@example.com';
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// - `default` Default theme
|
|
3
3
|
// - `dark` Import the official dark less style file
|
|
4
4
|
// - `compact` Import the official compact less style file
|
|
5
|
-
@import '
|
|
5
|
+
@import '@delon/theme/theme-default.less';
|
|
6
6
|
|
|
7
7
|
// ==========The following is the custom theme variable area==========
|
|
8
8
|
// The theme paraments can be generated at https://ng-alain.github.io/ng-alain/
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
@import '
|
|
2
|
-
@import '
|
|
3
|
-
@import '
|
|
4
|
-
@import '
|
|
5
|
-
@import '
|
|
1
|
+
@import '@delon/theme/system/index';
|
|
2
|
+
@import '@delon/abc/index';
|
|
3
|
+
@import '@delon/chart/index';
|
|
4
|
+
@import '@delon/theme/layout-default/style/index';
|
|
5
|
+
@import '@delon/theme/layout-blank/style/index';
|
|
6
6
|
|
|
7
7
|
@import './styles/index';
|
|
8
8
|
@import './styles/theme';
|
|
@@ -13,7 +13,9 @@ declare const require: any;
|
|
|
13
13
|
// First, initialize the Angular testing environment.
|
|
14
14
|
getTestBed().initTestEnvironment(
|
|
15
15
|
BrowserDynamicTestingModule,
|
|
16
|
-
platformBrowserDynamicTesting()
|
|
16
|
+
platformBrowserDynamicTesting(), {
|
|
17
|
+
teardown: { destroyAfterEach: false }
|
|
18
|
+
}
|
|
17
19
|
);
|
|
18
20
|
|
|
19
21
|
// Then we find all the tests.
|
package/application/index.js
CHANGED
|
@@ -57,6 +57,7 @@ function fixAngularJson(options) {
|
|
|
57
57
|
initial.maximumError = '3mb';
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
+
(0, utils_1.addStylePreprocessorOptionsToAllProject)(workspace);
|
|
60
61
|
}));
|
|
61
62
|
}
|
|
62
63
|
function addDependenciesToPackageJson(options) {
|
|
@@ -111,7 +112,7 @@ function addCodeStylesToPackageJson() {
|
|
|
111
112
|
return tree;
|
|
112
113
|
json.scripts.lint = `npm run lint:ts && npm run lint:style`;
|
|
113
114
|
json.scripts['lint:ts'] = `ng lint --fix`;
|
|
114
|
-
json.scripts['lint:style'] = `stylelint \"src/**/*.less\" --
|
|
115
|
+
json.scripts['lint:style'] = `npx stylelint \"src/**/*.less\" --fix`;
|
|
115
116
|
json.scripts['prepare'] = 'husky install';
|
|
116
117
|
(0, utils_1.writePackage)(tree, json);
|
|
117
118
|
// fix polyfills.ts
|
package/application/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAA2D;AAE3D,2DAaoC;AACpC,qEAAwE;AAExE,qDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
package/application/index.ts
CHANGED
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
addHeadStyle,
|
|
24
24
|
addHtmlToBody,
|
|
25
25
|
addPackage,
|
|
26
|
+
addStylePreprocessorOptionsToAllProject,
|
|
26
27
|
BUILD_TARGET_BUILD,
|
|
27
28
|
BUILD_TARGET_SERVE,
|
|
28
29
|
getProject,
|
|
@@ -86,6 +87,8 @@ function fixAngularJson(options: ApplicationOptions): Rule {
|
|
|
86
87
|
initial.maximumError = '3mb';
|
|
87
88
|
}
|
|
88
89
|
}
|
|
90
|
+
|
|
91
|
+
addStylePreprocessorOptionsToAllProject(workspace);
|
|
89
92
|
});
|
|
90
93
|
}
|
|
91
94
|
|
|
@@ -139,7 +142,7 @@ function addCodeStylesToPackageJson(): Rule {
|
|
|
139
142
|
if (json == null) return tree;
|
|
140
143
|
json.scripts.lint = `npm run lint:ts && npm run lint:style`;
|
|
141
144
|
json.scripts['lint:ts'] = `ng lint --fix`;
|
|
142
|
-
json.scripts['lint:style'] = `stylelint \"src/**/*.less\" --
|
|
145
|
+
json.scripts['lint:style'] = `npx stylelint \"src/**/*.less\" --fix`;
|
|
143
146
|
json.scripts['prepare'] = 'husky install';
|
|
144
147
|
writePackage(tree, json);
|
|
145
148
|
// fix polyfills.ts
|
package/curd/index.js
CHANGED
|
@@ -6,7 +6,7 @@ function default_1(options) {
|
|
|
6
6
|
const name = options.name || 'list';
|
|
7
7
|
delete options.name;
|
|
8
8
|
[
|
|
9
|
-
{ name: 'list', options: { name, modal: false } },
|
|
9
|
+
{ name: 'list', options: { name, modal: false, service: options.service } },
|
|
10
10
|
{ name: 'edit', options: { name: 'edit', modal: true, target: name } },
|
|
11
11
|
{ name: 'view', options: { name: 'view', modal: true, target: name } }
|
|
12
12
|
].forEach(item => rules.push((0, schematics_1.schematic)(item.name, Object.assign(Object.assign({}, options), item.options))));
|
package/curd/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/curd/index.ts"],"names":[],"mappings":";;AAAA,2DAAoE;AAIpE,mBAAyB,OAAoB;IAC3C,MAAM,KAAK,GAAW,EAAE,CAAC;IAEzB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;IACpC,OAAO,OAAO,CAAC,IAAI,CAAC;IAEpB;QACE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/curd/index.ts"],"names":[],"mappings":";;AAAA,2DAAoE;AAIpE,mBAAyB,OAAoB;IAC3C,MAAM,KAAK,GAAW,EAAE,CAAC;IAEzB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;IACpC,OAAO,OAAO,CAAC,IAAI,CAAC;IAEpB;QACE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE;QAC3E,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QACtE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;KACvE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,IAAI,CAAC,IAAI,kCAAO,OAAO,GAAK,IAAI,CAAC,OAAO,EAAG,CAAC,CAAC,CAAC;IAErF,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAbD,4BAaC"}
|
package/curd/index.ts
CHANGED
|
@@ -9,7 +9,7 @@ export default function (options: CURDOptions): Rule {
|
|
|
9
9
|
delete options.name;
|
|
10
10
|
|
|
11
11
|
[
|
|
12
|
-
{ name: 'list', options: { name, modal: false } },
|
|
12
|
+
{ name: 'list', options: { name, modal: false, service: options.service } },
|
|
13
13
|
{ name: 'edit', options: { name: 'edit', modal: true, target: name } },
|
|
14
14
|
{ name: 'view', options: { name: 'view', modal: true, target: name } }
|
|
15
15
|
].forEach(item => rules.push(schematic(item.name, { ...options, ...item.options })));
|
package/curd/schema.json
CHANGED
|
@@ -139,6 +139,22 @@
|
|
|
139
139
|
"type": "string",
|
|
140
140
|
"description": "指定目标路径，支持 `bus/list` 写法 (Specifies relative path, could be set like `bus/list`.)",
|
|
141
141
|
"alias": "t"
|
|
142
|
+
},
|
|
143
|
+
"service": {
|
|
144
|
+
"type": "string",
|
|
145
|
+
"description": "The service file to use in the new component.",
|
|
146
|
+
"default": "ignore",
|
|
147
|
+
"enum": ["ignore", "none", "root"],
|
|
148
|
+
"x-prompt": {
|
|
149
|
+
"message": "Which service injectors would you like to use?",
|
|
150
|
+
"type": "list",
|
|
151
|
+
"items": [
|
|
152
|
+
{ "value": "ignore", "label": "Ignore generation of Service files" },
|
|
153
|
+
{ "value": "root", "label": "Use \"@Injectable({ providedIn: 'root' })\"" },
|
|
154
|
+
{ "value": "none", "label": "Use \"@Injectable()\" (Should be automatically register to the nearest module)" }
|
|
155
|
+
]
|
|
156
|
+
},
|
|
157
|
+
"x-user-analytics": 20
|
|
142
158
|
}
|
|
143
159
|
},
|
|
144
160
|
"required": ["name", "module"]
|
package/curd/schema.ts
CHANGED
package/docs/generate.en-US.md
CHANGED
|
@@ -24,6 +24,8 @@ Examples:
|
|
|
24
24
|
ng g ng-alain:module trade
|
|
25
25
|
# Generate a TradeListComponent List component under the trade module
|
|
26
26
|
ng g ng-alain:list list -m=trade
|
|
27
|
+
# Generate a TradeListComponent List component and TradeService class under the trade module
|
|
28
|
+
ng g ng-alain:list list -m=trade --service=root
|
|
27
29
|
# Generate a ListComponent List component under the trade module
|
|
28
30
|
ng g ng-alain:list list -m=trade --withoutModulePrefixInComponentName=true
|
|
29
31
|
# Generate a TradeEditComponent Edit component under the trade module
|
|
@@ -39,6 +41,7 @@ ng g ng-alain:edit edit -m=trade
|
|
|
39
41
|
| `--modal` | Specifies using modal mode |
|
|
40
42
|
| `--withoutPrefix` | Without prefix to selectors |
|
|
41
43
|
| `--withoutModulePrefixInComponentName` | Without prefix to component name |
|
|
44
|
+
| `--service` | Specifies how to generate service classes, can be set: `ignore`, `root`, `none` |
|
|
42
45
|
|
|
43
46
|
## Module
|
|
44
47
|
|
package/docs/generate.zh-CN.md
CHANGED
|
@@ -38,6 +38,8 @@ ng g ng-alain:[command name] [name] [options]
|
|
|
38
38
|
ng g ng-alain:module trade
|
|
39
39
|
# trade 模块下生成一个 TradeListComponent List组件
|
|
40
40
|
ng g ng-alain:list list -m=trade
|
|
41
|
+
# trade 模块下生成一个 TradeEditComponent List组件 及 TradeService 服务类
|
|
42
|
+
ng g ng-alain:list list -m=trade --service=root
|
|
41
43
|
# trade 模块下生成一个 ListComponent List组件
|
|
42
44
|
ng g ng-alain:list list -m=trade --withoutModulePrefixInComponentName=true
|
|
43
45
|
# trade 模块下生成一个 TradeEditComponent Edit组件
|
|
@@ -53,6 +55,7 @@ ng g ng-alain:edit edit -m=trade
|
|
|
53
55
|
| `--modal` | 指定是否使用模态框 |
|
|
54
56
|
| `--withoutPrefix` | 指定选择器名不加前缀 |
|
|
55
57
|
| `--withoutModulePrefixInComponentName` | 组件名不加模块名前缀 |
|
|
58
|
+
| `--service` | 指定如何生成服务类，包含：`ignore`、`root`、`none` |
|
|
56
59
|
|
|
57
60
|
## Module 模块
|
|
58
61
|
|
package/edit/schema.json
CHANGED
|
@@ -146,6 +146,22 @@
|
|
|
146
146
|
"default": true,
|
|
147
147
|
"description": "指定是否使用模态框 (Specifies using modal mode)",
|
|
148
148
|
"x-prompt": "Would you like to modal mode?"
|
|
149
|
+
},
|
|
150
|
+
"service": {
|
|
151
|
+
"type": "string",
|
|
152
|
+
"description": "The service file to use in the new component.",
|
|
153
|
+
"default": "ignore",
|
|
154
|
+
"enum": ["ignore", "none", "root"],
|
|
155
|
+
"x-prompt": {
|
|
156
|
+
"message": "Which service injectors would you like to use?",
|
|
157
|
+
"type": "list",
|
|
158
|
+
"items": [
|
|
159
|
+
{ "value": "ignore", "label": "Ignore generation of Service files" },
|
|
160
|
+
{ "value": "root", "label": "Use \"@Injectable({ providedIn: 'root' })\"" },
|
|
161
|
+
{ "value": "none", "label": "Use \"@Injectable()\" (Should be automatically register to the nearest module)" }
|
|
162
|
+
]
|
|
163
|
+
},
|
|
164
|
+
"x-user-analytics": 20
|
|
149
165
|
}
|
|
150
166
|
},
|
|
151
167
|
"required": ["name", "module"]
|
package/edit/schema.ts
CHANGED