diff --git a/aio/package.json b/aio/package.json index 51930c2283..cf0adff739 100644 --- a/aio/package.json +++ b/aio/package.json @@ -88,6 +88,7 @@ "chai": "^4.1.2", "classlist.js": "^1.1.20150312", "core-js": "^2.4.1", + "klaw-sync": "^6.0.0", "rxjs": "^6.3.0", "tslib": "^1.9.0", "web-animations-js": "^2.2.5", diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts index 35c42837bb..bdc359362e 100644 --- a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts +++ b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, EventEmitter, HostListener, Input, OnDestroy, Output } from '@angular/core'; -import { Meta, Title } from '@angular/platform-browser'; +import { Title } from '@angular/platform-browser'; import { Observable, of, timer } from 'rxjs'; import { catchError, switchMap, takeUntil, tap } from 'rxjs/operators'; @@ -65,7 +65,6 @@ export class DocViewerComponent implements OnDestroy { elementRef: ElementRef, private logger: Logger, private titleService: Title, - private metaService: Meta, private tocService: TocService, private elementsLoader: ElementsLoader) { this.hostElement = elementRef.nativeElement; diff --git a/aio/tools/transforms/templates/api/directive.template.html b/aio/tools/transforms/templates/api/directive.template.html index cb61e71775..d72a01cfd0 100644 --- a/aio/tools/transforms/templates/api/directive.template.html +++ b/aio/tools/transforms/templates/api/directive.template.html @@ -13,7 +13,7 @@ {% if doc.description or doc.usageNotes %}
-

Description

+

说明

{$ (doc.description or '') | trimBlankLines | marked $} {$ (doc.usageNotes or '') | trimBlankLines | marked $}
diff --git a/aio/tools/transforms/templates/api/includes/class-members.html b/aio/tools/transforms/templates/api/includes/class-members.html index 7faf3ebaa7..8ecc7927d8 100644 --- a/aio/tools/transforms/templates/api/includes/class-members.html +++ b/aio/tools/transforms/templates/api/includes/class-members.html @@ -1,14 +1,14 @@ {% import "lib/memberHelpers.html" as memberHelpers -%} -{$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static properties') $} +{$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', '静态属性') $} -{$ memberHelpers.renderMethodDetails(versionInfo, doc.staticMethods, 'static-methods', 'static-method', 'Static methods') $} +{$ memberHelpers.renderMethodDetails(versionInfo, doc.staticMethods, 'static-methods', 'static-method', '静态方法') $} {% if doc.constructorDoc %} -

Constructor

+

构造函数

{$ memberHelpers.renderMethodDetail(versionInfo, doc.constructorDoc, 'constructor') $} {% endif %} -{$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $} +{$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', '属性') $} -{$ memberHelpers.renderMethodDetails(versionInfo, doc.methods, 'instance-methods', 'instance-method', 'Methods') $} +{$ memberHelpers.renderMethodDetails(versionInfo, doc.methods, 'instance-methods', 'instance-method', '方法') $} diff --git a/aio/tools/transforms/templates/api/includes/export-as.html b/aio/tools/transforms/templates/api/includes/export-as.html index b1769e85e5..d2976f2300 100644 --- a/aio/tools/transforms/templates/api/includes/export-as.html +++ b/aio/tools/transforms/templates/api/includes/export-as.html @@ -1,6 +1,6 @@ {%- if doc.exportAs %}
-

模板变量参考手册

+

模板变量参考手册

diff --git a/aio/tools/transforms/templates/api/includes/selectors.html b/aio/tools/transforms/templates/api/includes/selectors.html index c39aae4651..cdca019e68 100644 --- a/aio/tools/transforms/templates/api/includes/selectors.html +++ b/aio/tools/transforms/templates/api/includes/selectors.html @@ -1,6 +1,6 @@ {%- if doc.selector %}
-

选择器

+

选择器

{% if doc.selectors %} {$ doc.selectors | marked $} {% else %} diff --git a/aio/tools/transforms/templates/api/lib/memberHelpers.html b/aio/tools/transforms/templates/api/lib/memberHelpers.html index c107ba519d..15f0aa3cee 100644 --- a/aio/tools/transforms/templates/api/lib/memberHelpers.html +++ b/aio/tools/transforms/templates/api/lib/memberHelpers.html @@ -53,17 +53,17 @@ {$ ('**Deprecated** ' + overload.deprecated) | marked $} {% endif %} -

参数

+

参数

{$ params.renderParameters(overload.parameterDocs, cssClass + '-parameters', cssClass + '-parameter') $} {% if overload.type or overload.returns.type %} -

返回值

+

返回值

{% marked %}`{$ (overload.type or overload.returns.type) $}`{% if overload.returns %}: {$ overload.returns.description $}{% endif %}{% endmarked %} {% endif %} {% if overload.throws.length %} -

异常

+

异常

{% for error in overload.throws %} {% marked %}`{$ (error.typeList or '错误') $}` {$ error.description $}{% endmarked %} {% endfor %} diff --git a/aio/tools/transforms/templates/api/ngmodule.template.html b/aio/tools/transforms/templates/api/ngmodule.template.html index b87e2526c4..d9ebee31ec 100644 --- a/aio/tools/transforms/templates/api/ngmodule.template.html +++ b/aio/tools/transforms/templates/api/ngmodule.template.html @@ -62,7 +62,7 @@ {$ memberHelpers.renderProperties(doc.staticProperties, 'static-properties', 'static-property', 'Static properties') $} {$ memberHelpers.renderMethodDetails(versionInfo, doc.staticMethods, 'static-methods', 'static-method', 'Static methods') $} {% if doc.constructorDoc %} -

Constructor

+

构造函数

{$ memberHelpers.renderMethodDetail(versionInfo, doc.constructorDoc, 'constructor') $}{% endif %} {$ memberHelpers.renderProperties(doc.properties, 'instance-properties', 'instance-property', 'Properties') $} diff --git a/aio/tools/transforms/templates/api/package.template.html b/aio/tools/transforms/templates/api/package.template.html index 59b8dcc3f7..6e80d31c5a 100644 --- a/aio/tools/transforms/templates/api/package.template.html +++ b/aio/tools/transforms/templates/api/package.template.html @@ -37,12 +37,16 @@ {% include "includes/see-also.html" %} {% if doc.isPrimaryPackage %} -

入口点

+

入口点

{$ listItems([doc.packageInfo.primary], '主要', '#primary-entry-point-exports') $} {$ listItems(doc.packageInfo.secondary, '次要') $} {% endif %} -

{% if doc.isPrimaryPackage %}主入口{% else %}入口{% endif %}点的导出

+ {% if doc.isPrimaryPackage %} +

主入口点的导出

+ {% else %} +

入口点的导出

+ {% endif %} {% include "includes/deprecation.html" %} {$ listItems(doc.ngmodules, '模块') $} {$ listItems(doc.classes, '类') $} diff --git a/aio/yarn.lock b/aio/yarn.lock index 87a5f48986..fe97124f89 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -6577,6 +6577,13 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + klaw@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"