ng-alain 14.1.1 → 14.3.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/application/files/i18n/en-US.json +1 -1
- package/application/files/i18n/zh-CN.json +1 -1
- package/application/files/i18n/zh-TW.json +1 -1
- package/application/files/root/.nvmrc +1 -1
- package/application/files/src/app/layout/basic/widgets/search.component.ts +1 -0
- package/application/files/src/assets/color.less +591 -2027
- package/application/files/src/assets/tmp/i18n/en-US.json +1 -1
- package/application/files/src/assets/tmp/i18n/zh-CN.json +1 -1
- package/application/files/src/assets/tmp/i18n/zh-TW.json +1 -1
- package/docs/sta.en-US.md +21 -0
- package/docs/sta.zh-CN.md +21 -0
- package/package.json +2 -2
- package/sta/index.js +17 -3
- package/sta/index.js.map +1 -1
- package/sta/index.spec.ts +8 -2
- package/sta/index.ts +17 -8
- package/sta/schema.json +7 -0
- package/sta/types.ts +5 -0
- package/utils/lib-versions.js +1 -1
- package/utils/lib-versions.ts +1 -1
- package/utils/versions.js +1 -1
- package/utils/versions.ts +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"menu.search.placeholder": "Search for people, file, photos...",
|
|
2
|
+
"menu.search.placeholder": "Search for people, file, photos... (Press F1 to focus)",
|
|
3
3
|
"menu.fullscreen": "Fullscreen",
|
|
4
4
|
"menu.fullscreen.exit": "Exit Fullscreen",
|
|
5
5
|
"menu.clear.local.storage": "Clear Local Storage",
|
package/docs/sta.en-US.md
CHANGED
|
@@ -29,6 +29,27 @@ ng g ng-alain:sta --name=<Swagger name> --url=<Remote URL> --filePath=<Local Swa
|
|
|
29
29
|
| `modelTypePrefix` | - | Model name prefix |
|
|
30
30
|
| `httpClientType` | `delon` | HttpClient request method, 1. `delon` use `_HttpClient` of `@delon/theme`, 2. `angular` use `HttpClient` |
|
|
31
31
|
| `generateApiOptions` | - | swagger-typescript-api [options](https://github.com/acacode/swagger-typescript-api#-usage) |
|
|
32
|
+
| `tagsMapping` | - | Swagger tag mapping dictionary |
|
|
33
|
+
|
|
34
|
+
## Use config file
|
|
35
|
+
|
|
36
|
+
Add `sta.json` to the project root directory:
|
|
37
|
+
|
|
38
|
+
````json
|
|
39
|
+
{
|
|
40
|
+
"$schema": "./node_modules/ng-alain/sta/schema.json",
|
|
41
|
+
"filePath": "swagger.json",
|
|
42
|
+
"tagsMapping": {
|
|
43
|
+
"部门": "Dept"
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
````
|
|
47
|
+
|
|
48
|
+
Run:
|
|
49
|
+
|
|
50
|
+
```bash
|
|
51
|
+
ng g ng-alain:sta
|
|
52
|
+
````
|
|
32
53
|
|
|
33
54
|
## FAQ
|
|
34
55
|
|
package/docs/sta.zh-CN.md
CHANGED
|
@@ -29,6 +29,27 @@ ng g ng-alain:sta --name=<Swagger name> --url=<远程URL地址> --filePath=<本
|
|
|
29
29
|
| `modelTypePrefix` | - | 数据契约名称前缀 |
|
|
30
30
|
| `httpClientType` | `delon` | HttpClient 请求方式，1. `delon` 使用 `@delon/theme` 的 `_HttpClient`，2. `angular` 使用 `HttpClient` |
|
|
31
31
|
| `generateApiOptions` | - | swagger-typescript-api [options](https://github.com/acacode/swagger-typescript-api#-usage) |
|
|
32
|
+
| `tagsMapping` | - | Swagger标签映射字典，当标签为中文时，可以指定用于转换成更加符合规范 Service 名 |
|
|
33
|
+
|
|
34
|
+
## 使用配置文件
|
|
35
|
+
|
|
36
|
+
在项目根目录增加 `sta.json`：
|
|
37
|
+
|
|
38
|
+
```json
|
|
39
|
+
{
|
|
40
|
+
"$schema": "./node_modules/ng-alain/sta/schema.json",
|
|
41
|
+
"filePath": "swagger.json",
|
|
42
|
+
"tagsMapping": {
|
|
43
|
+
"部门": "Dept"
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
```
|
|
47
|
+
|
|
48
|
+
执行：
|
|
49
|
+
|
|
50
|
+
```bash
|
|
51
|
+
ng g ng-alain:sta
|
|
52
|
+
```
|
|
32
53
|
|
|
33
54
|
## 常见问题
|
|
34
55
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ng-alain",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.3.0",
|
|
4
4
|
"description": "Schematics specific to ng-alain",
|
|
5
5
|
"author": "cipchk<cipchk@qq.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
],
|
|
23
23
|
"schematics": "./collection.json",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"swagger-typescript-api": "^
|
|
25
|
+
"swagger-typescript-api": "^11.1.3"
|
|
26
26
|
},
|
|
27
27
|
"ng-update": {
|
|
28
28
|
"migrations": "./migration.json",
|
package/sta/index.js
CHANGED
|
@@ -52,7 +52,22 @@ function cleanOutput(p) {
|
|
|
52
52
|
}
|
|
53
53
|
catch (e) { }
|
|
54
54
|
}
|
|
55
|
-
function
|
|
55
|
+
function tagsMapping(res, config) {
|
|
56
|
+
var _a;
|
|
57
|
+
if (config.tagsMapping != null && Object.keys(config.tagsMapping).length <= 0)
|
|
58
|
+
return;
|
|
59
|
+
(_a = res.configuration.routes.combined) === null || _a === void 0 ? void 0 : _a.forEach(v => {
|
|
60
|
+
const newModuleName = config.tagsMapping[v.moduleName];
|
|
61
|
+
if (newModuleName != null) {
|
|
62
|
+
v.moduleName = newModuleName;
|
|
63
|
+
v.routes.forEach(route => {
|
|
64
|
+
route.raw.moduleName = newModuleName;
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
function fix(output, res, tree, context, config) {
|
|
70
|
+
tagsMapping(res, config);
|
|
56
71
|
const indexList = [`models`, `_base.service`];
|
|
57
72
|
const basePath = (0, core_1.normalize)((0, path_1.join)(project.root, output.replace(process.cwd(), '')));
|
|
58
73
|
try {
|
|
@@ -160,7 +175,7 @@ function genProxy(config) {
|
|
|
160
175
|
(0, swagger_typescript_api_1.generateApi)(options)
|
|
161
176
|
.then((res) => {
|
|
162
177
|
cleanOutput(output);
|
|
163
|
-
fix(output, res, tree, context);
|
|
178
|
+
fix(output, res, tree, context, config);
|
|
164
179
|
resolve();
|
|
165
180
|
})
|
|
166
181
|
.catch(ex => {
|
|
@@ -190,7 +205,6 @@ function tryLoadConfig(context, configPath) {
|
|
|
190
205
|
}
|
|
191
206
|
function default_1(options) {
|
|
192
207
|
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
193
|
-
context.logger.info(colors.yellow(`The ng g ng-alain:sta is currently in testing status and may change before the major version of '13'`));
|
|
194
208
|
project = (yield (0, workspace_1.getProject)(tree, options.project)).project;
|
|
195
209
|
const config = Object.assign(Object.assign({ name: 'sta' }, options), tryLoadConfig(context, options.config));
|
|
196
210
|
if (typeof config.generateApiOptions === 'string') {
|
package/sta/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sta/index.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;;;;;;;;AAEvD,+CAAiD;AAEjD,2DAAsG;AACtG,sCAAsC;AACtC,2BAAoE;AACpE,+CAAqC;AACrC,+BAAqC;AACrC,mEAA2F;AAE3F,wCAAoD;AACpD,kDAAgD;AAIhD,IAAI,OAA0B,CAAC;AAE/B,MAAM,UAAU,GAAG;;;;;;;;CAQlB,CAAC;AAEF,SAAS,iBAAiB,CAAC,IAAY;IACrC,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;QAChE,IAAI,IAAI,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK;YAAE,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACzC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,CAAC,YAAY,IAAI,QAAQ,CAAC,CAAC;QAC/C,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;QAC7C,IAAA,gBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,CAAS;IAC5B,IAAI;QACF,IAAA,cAAS,EAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClC,IAAA,cAAS,EAAC,CAAC,CAAC,CAAC;KACd;IAAC,OAAO,CAAC,EAAE,GAAE;AAChB,CAAC;AAED,SAAS,GAAG,CAAC,MAAc,EAAE,GAAsB,EAAE,IAAU,EAAE,OAAyB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sta/index.ts"],"names":[],"mappings":"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"}
|
package/sta/index.spec.ts
CHANGED
|
@@ -46,8 +46,7 @@ describe('Schematic: sta', () => {
|
|
|
46
46
|
|
|
47
47
|
beforeEach(async () => ({ runner, tree } = await createAlainAndModuleApp()));
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
xit('should be working', async () => {
|
|
49
|
+
it('should be working', async () => {
|
|
51
50
|
await run();
|
|
52
51
|
[`_base.service.ts`, `models.ts`, `index.ts`].forEach(name => {
|
|
53
52
|
expect(tree.exists(`/projects/foo/src/app/_sta/${name}`)).toBe(true);
|
|
@@ -55,4 +54,11 @@ describe('Schematic: sta', () => {
|
|
|
55
54
|
const tsConfig = tree.readContent(`tsconfig.json`);
|
|
56
55
|
expect(tsConfig).toContain(`@sta`);
|
|
57
56
|
});
|
|
57
|
+
|
|
58
|
+
it('#tagsMapping', async () => {
|
|
59
|
+
tree = await runner.runSchematicAsync('sta', { spec: SPEC, tagsMapping: { user: 'AA' } }, tree).toPromise();
|
|
60
|
+
const newModulePath = '/projects/foo/src/app/_sta/AA/service.ts';
|
|
61
|
+
expect(tree.exists(newModulePath)).toBe(true);
|
|
62
|
+
expect(tree.readContent(newModulePath)).toContain(`export class AaService`);
|
|
63
|
+
});
|
|
58
64
|
});
|
package/sta/index.ts
CHANGED
|
@@ -47,7 +47,22 @@ function cleanOutput(p: string): void {
|
|
|
47
47
|
} catch (e) {}
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
function
|
|
50
|
+
function tagsMapping(res: GenerateApiOutput, config: STAConfig): void {
|
|
51
|
+
if (config.tagsMapping != null && Object.keys(config.tagsMapping).length <= 0) return;
|
|
52
|
+
|
|
53
|
+
res.configuration.routes.combined?.forEach(v => {
|
|
54
|
+
const newModuleName = config.tagsMapping[v.moduleName];
|
|
55
|
+
if (newModuleName != null) {
|
|
56
|
+
v.moduleName = newModuleName;
|
|
57
|
+
v.routes.forEach(route => {
|
|
58
|
+
route.raw.moduleName = newModuleName;
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function fix(output: string, res: GenerateApiOutput, tree: Tree, context: SchematicContext, config: STAConfig): void {
|
|
65
|
+
tagsMapping(res, config);
|
|
51
66
|
const indexList = [`models`, `_base.service`];
|
|
52
67
|
const basePath = normalize(join(project.root, output.replace(process.cwd(), '')));
|
|
53
68
|
try {
|
|
@@ -185,7 +200,7 @@ function genProxy(config: STAConfig): Rule {
|
|
|
185
200
|
generateApi(options)
|
|
186
201
|
.then((res: GenerateApiOutput) => {
|
|
187
202
|
cleanOutput(output);
|
|
188
|
-
fix(output, res, tree, context);
|
|
203
|
+
fix(output, res, tree, context, config);
|
|
189
204
|
resolve();
|
|
190
205
|
})
|
|
191
206
|
.catch(ex => {
|
|
@@ -217,12 +232,6 @@ function tryLoadConfig(context: SchematicContext, configPath?: string): STAConfi
|
|
|
217
232
|
|
|
218
233
|
export default function (options: Schema): Rule {
|
|
219
234
|
return async (tree: Tree, context: SchematicContext) => {
|
|
220
|
-
context.logger.info(
|
|
221
|
-
colors.yellow(
|
|
222
|
-
`The ng g ng-alain:sta is currently in testing status and may change before the major version of '13'`
|
|
223
|
-
)
|
|
224
|
-
);
|
|
225
|
-
|
|
226
235
|
project = (await getProject(tree, options.project)).project;
|
|
227
236
|
const config: STAConfig = {
|
|
228
237
|
name: 'sta',
|
package/sta/schema.json
CHANGED
package/sta/types.ts
CHANGED
package/utils/lib-versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ZORROVERSION = exports.VERSION = void 0;
|
|
4
|
-
exports.VERSION = '^14.
|
|
4
|
+
exports.VERSION = '^14.3.0';
|
|
5
5
|
exports.ZORROVERSION = '^14.0.0';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/lib-versions.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '^14.
|
|
1
|
+
export const VERSION = '^14.3.0';
|
|
2
2
|
export const ZORROVERSION = '^14.0.0';
|
package/utils/versions.js
CHANGED
|
@@ -38,7 +38,7 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
|
|
|
38
38
|
`prettier@^2.7.1`,
|
|
39
39
|
`husky@^7.0.4`,
|
|
40
40
|
`ng-alain@${version}`,
|
|
41
|
-
`ng-alain-plugin-theme@^
|
|
41
|
+
`ng-alain-plugin-theme@^14.0.0`,
|
|
42
42
|
`source-map-explorer@^2.5.2`,
|
|
43
43
|
`@angular/language-service@^14.2.0`,
|
|
44
44
|
`@delon/testing@${version}`
|
package/utils/versions.ts
CHANGED
|
@@ -34,7 +34,7 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
|
|
|
34
34
|
`prettier@^2.7.1`,
|
|
35
35
|
`husky@^7.0.4`,
|
|
36
36
|
`ng-alain@${version}`,
|
|
37
|
-
`ng-alain-plugin-theme@^
|
|
37
|
+
`ng-alain-plugin-theme@^14.0.0`,
|
|
38
38
|
`source-map-explorer@^2.5.2`,
|
|
39
39
|
`@angular/language-service@^14.2.0`,
|
|
40
40
|
`@delon/testing@${version}`
|