diff --git a/docs/contributing.zh-CN.md b/docs/contributing.zh-CN.md index b97ab0e7a..2c8e24e3c 100644 --- a/docs/contributing.zh-CN.md +++ b/docs/contributing.zh-CN.md @@ -38,7 +38,7 @@ type: Other ## Pull Request -Ng Alain 会关注所有的 pull request，我们会 review 以及合并你的代码，也有可能要求你做一些修改或者告诉你我们为什么不能接受这样的修改。 +NG-ALAIN 会关注所有的 pull request，我们会 review 以及合并你的代码，也有可能要求你做一些修改或者告诉你我们为什么不能接受这样的修改。 **在你发送 Pull Request 之前**，请确认你是按照下面的步骤来做的： diff --git a/schematics/application/schema.json b/schematics/application/schema.json index d6d798cc5..878f2d067 100644 --- a/schematics/application/schema.json +++ b/schematics/application/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainShell", - "title": "Ng Alain Shell Options Schema", + "title": "NG-ALAIN Shell Options Schema", "type": "object", "properties": { "codeStyle": { diff --git a/schematics/curd/schema.json b/schematics/curd/schema.json index a5f59f2ef..c57be18e0 100644 --- a/schematics/curd/schema.json +++ b/schematics/curd/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainCURDComponent", - "title": "Ng Alain CURD Component Options Schema", + "title": "NG-ALAIN CURD Component Options Schema", "type": "object", "properties": { "path": { diff --git a/schematics/edit/schema.json b/schematics/edit/schema.json index 9a494a495..705180c4a 100644 --- a/schematics/edit/schema.json +++ b/schematics/edit/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainEditComponent", - "title": "Ng Alain Edit Component Options Schema", + "title": "NG-ALAIN Edit Component Options Schema", "type": "object", "additionalProperties": true, "properties": { diff --git a/schematics/empty/schema.json b/schematics/empty/schema.json index a7c630c9d..e775f77c9 100644 --- a/schematics/empty/schema.json +++ b/schematics/empty/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainEmptyComponent", - "title": "Ng Alain Empty Component Options Schema", + "title": "NG-ALAIN Empty Component Options Schema", "type": "object", "additionalProperties": true, "properties": { diff --git a/schematics/list/schema.json b/schematics/list/schema.json index 3a7301b35..fef5a465d 100644 --- a/schematics/list/schema.json +++ b/schematics/list/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainListComponent", - "title": "Ng Alain List Component Options Schema", + "title": "NG-ALAIN List Component Options Schema", "type": "object", "additionalProperties": true, "properties": { diff --git a/schematics/module/schema.json b/schematics/module/schema.json index 622c829d5..92eebc34d 100644 --- a/schematics/module/schema.json +++ b/schematics/module/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainModule", - "title": "Ng Alain Module Options Schema", + "title": "NG-ALAIN Module Options Schema", "type": "object", "properties": { "name": { diff --git a/schematics/sta/schema.json b/schematics/sta/schema.json index 06a70ed79..ab3ac6fec 100644 --- a/schematics/sta/schema.json +++ b/schematics/sta/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainSTAComponent", - "title": "Ng Alain Swagger To API Options Schema", + "title": "NG-ALAIN Swagger To API Options Schema", "type": "object", "additionalProperties": true, "properties": { diff --git a/schematics/tpl/schema.json b/schematics/tpl/schema.json index a54e7252f..9e98a8a6d 100644 --- a/schematics/tpl/schema.json +++ b/schematics/tpl/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainTplComponent", - "title": "Ng Alain Tpl Options Schema", + "title": "NG-ALAIN Tpl Options Schema", "type": "object", "additionalProperties": true, "properties": { diff --git a/schematics/view/schema.json b/schematics/view/schema.json index 192b58195..a3137a8b2 100644 --- a/schematics/view/schema.json +++ b/schematics/view/schema.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema", "$id": "SchematicsNgAlainViewComponent", - "title": "Ng Alain View Component Options Schema", + "title": "NG-ALAIN View Component Options Schema", "type": "object", "additionalProperties": true, "properties": { diff --git a/src/app/core/meta.service.ts b/src/app/core/meta.service.ts index 75a4736ce..d4642a05e 100644 --- a/src/app/core/meta.service.ts +++ b/src/app/core/meta.service.ts @@ -202,11 +202,14 @@ export class MetaService { } getPathByUrl(url: string): any { - url = url.split('=')[0].split('?')[0]; + url = url + .split('=')[0] + .split('?')[0] + .replace(/\/(en|zh)$/, '/'); let ret: any; (this._menus || []).forEach((cat: any) => { if (ret) return; - ret = cat.list.find((i: any) => i.url === url); + ret = cat.list.find((i: { url: string }) => i.url.startsWith(url)); }); return ret; } diff --git a/src/app/core/startup.service.ts b/src/app/core/startup.service.ts index 3dbb82bb1..bc1a6ee5e 100644 --- a/src/app/core/startup.service.ts +++ b/src/app/core/startup.service.ts @@ -27,7 +27,7 @@ export class StartupService { if (slowEl) { slowEl.remove(); } - this.injector.get(TitleService).suffix = 'Ng Alain'; + this.injector.get(TitleService).suffix = 'NG-ALAIN'; if (this.platform.isBrowser) { setTimeout(() => this.lazyLoad(), 100); } diff --git a/src/index.html b/src/index.html index 84d1f87ad..7bab1b60b 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - Ng Alain - 一个基于 Antd 中后台前端解决方案 + NG-ALAIN - 一个基于 Antd 中后台前端解决方案