release(8.0.0-rc.1): release 8.0.0-rc.1 (#638)

CHANGELOG.md

@@ -1,3 +1,21 @@
+# [8.0.0-rc.1](https://github.com/ng-alain/delon/compare/8.0.0-rc.0...8.0.0-rc.1) (2019-06-29)
+
+
+### Bug Fixes
+
+* **abc:st:** ingore `title` required in `STColumn` ([#632](https://github.com/ng-alain/delon/issues/632)) ([69608c5](https://github.com/ng-alain/delon/commit/69608c5))
+* **cli:plugin:icon:** fix unidentified `nzType` property ([#637](https://github.com/ng-alain/delon/issues/637)) ([2784a5a](https://github.com/ng-alain/delon/commit/2784a5a))
+* **form:array:** fix disabled add & remove buttons when `readOnly` is `true` ([#633](https://github.com/ng-alain/delon/issues/633)) ([15194cc](https://github.com/ng-alain/delon/commit/15194cc))
+* **form:array:** fix invalid value subscript of path value ([#628](https://github.com/ng-alain/delon/issues/628)) ([09807f7](https://github.com/ng-alain/delon/commit/09807f7))
+* **form:upload:** fix invalid `showUploadList` property ([#634](https://github.com/ng-alain/delon/issues/634)) ([54c3b90](https://github.com/ng-alain/delon/commit/54c3b90))
+
+
+### Features
+
+* **abc:st:** add `emitReload` of `resetColumns` method ([#635](https://github.com/ng-alain/delon/issues/635)) ([a96123e](https://github.com/ng-alain/delon/commit/a96123e))
+
+
+
 # [8.0.0-rc.0](https://github.com/ng-alain/delon/compare/7.7.1...8.0.0-rc.0) (2019-06-23)
 
 

docs/changelog.en-US.md

@@ -14,9 +14,26 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh-
 
 ---
 
+# [8.0.0-rc.1](https://github.com/ng-alain/delon/compare/8.0.0-rc.0...8.0.0-rc.1) (2019-06-29)
+
+**`8.0.0-rc.x` version has some breaking changes. pls read more [Upgrade Guide](https://ng-alain.com/docs/upgrade-v8/en).**
+
+### Bug Fixes
+
+* **abc:st:** ingore `title` required in `STColumn` ([#632](https://github.com/ng-alain/delon/issues/632)) ([69608c5](https://github.com/ng-alain/delon/commit/69608c5))
+* **cli:plugin:icon:** fix unidentified `nzType` property ([#637](https://github.com/ng-alain/delon/issues/637)) ([2784a5a](https://github.com/ng-alain/delon/commit/2784a5a))
+* **form:array:** fix disabled add & remove buttons when `readOnly` is `true` ([#633](https://github.com/ng-alain/delon/issues/633)) ([15194cc](https://github.com/ng-alain/delon/commit/15194cc))
+* **form:array:** fix invalid value subscript of path value ([#628](https://github.com/ng-alain/delon/issues/628)) ([09807f7](https://github.com/ng-alain/delon/commit/09807f7))
+* **form:upload:** fix invalid `showUploadList` property ([#634](https://github.com/ng-alain/delon/issues/634)) ([54c3b90](https://github.com/ng-alain/delon/commit/54c3b90))
+
+### Features
+
+* **abc:st:** add `emitReload` of `resetColumns` method ([#635](https://github.com/ng-alain/delon/issues/635)) ([a96123e](https://github.com/ng-alain/delon/commit/a96123e))
+
+
 # [8.0.0-rc.0](https://github.com/ng-alain/delon/compare/7.7.1...8.0.0-rc.0) (2019-06-23)
 
-**`8.0.0-rc.0` version has some breaking changes. pls read more [Upgrade Guide](https://ng-alain.com/docs/upgrade-v8/en).**
+**`8.0.0-rc.x` version has some breaking changes. pls read more [Upgrade Guide](https://ng-alain.com/docs/upgrade-v8/en).**
 
 ### Bug Fixes
 

docs/changelog.zh-CN.md

@@ -14,9 +14,26 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/)
 
 ---
 
+# [8.0.0-rc.1](https://github.com/ng-alain/delon/compare/8.0.0-rc.0...8.0.0-rc.1) (2019-06-29)
+
+**`8.0.0-rc.x` 版本有一些破坏性变更，更多请阅读[升级指南](https://ng-alain.com/docs/upgrade-v8/zh)。**
+
+### Bug Fixes
+
+* **abc:st:** 修复忽略 `STColumn` 里 `title` 为非必填性 ([#632](https://github.com/ng-alain/delon/issues/632)) ([69608c5](https://github.com/ng-alain/delon/commit/69608c5))
+* **cli:plugin:icon:** 修复未识别 `nzType` 属性 ([#637](https://github.com/ng-alain/delon/issues/637)) ([2784a5a](https://github.com/ng-alain/delon/commit/2784a5a))
+* **form:array:** 修复 `readOnly: true` 时应禁用添加、移除按钮 ([#633](https://github.com/ng-alain/delon/issues/633)) ([15194cc](https://github.com/ng-alain/delon/commit/15194cc))
+* **form:array:** 修复数组下标值经过增删后混乱问题 ([#628](https://github.com/ng-alain/delon/issues/628)) ([09807f7](https://github.com/ng-alain/delon/commit/09807f7))
+* **form:upload:** 修复 `showUploadList` 无法设置复合参数 ([#634](https://github.com/ng-alain/delon/issues/634)) ([54c3b90](https://github.com/ng-alain/delon/commit/54c3b90))
+
+### Features
+
+* **abc:st:** 新增调用 `resetColumns` 时允许指定是否需要刷新数据 ([#635](https://github.com/ng-alain/delon/issues/635)) ([a96123e](https://github.com/ng-alain/delon/commit/a96123e))
+
+
 # [8.0.0-rc.0](https://github.com/ng-alain/delon/compare/7.7.1...8.0.0-rc.0) (2019-06-23)
 
-**`8.0.0-rc.0` 版本有一些破坏性变更，更多请阅读[升级指南](https://ng-alain.com/docs/upgrade-v8/zh)。**
+**`8.0.0-rc.x` 版本有一些破坏性变更，更多请阅读[升级指南](https://ng-alain.com/docs/upgrade-v8/zh)。**
 
 ### Bug Fixes
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "delon",
-  "version": "8.0.0-rc.0",
+  "version": "8.0.0-rc.1",
   "typings": "index.d.ts",
   "description": "Delon is a set of essential modules for NG-ALAIN.",
   "keywords": [

packages/schematics/application/index.ts

@@ -137,8 +137,10 @@ function addCodeStylesToPackageJson() {
     json.scripts['lint-staged'] = `lint-staged`;
     json.scripts['tslint-check'] = `tslint-config-prettier-check ./tslint.json`;
     json['lint-staged'] = {
-      '*.ts': ['npm run lint:ts', 'git add'],
-      '*.less': ['npm run lint:style', 'git add'],
+      linters: {
+        '*.ts': ['npm run lint:ts', 'git add'],
+        '*.less': ['npm run lint:style', 'git add'],
+      },
       ignore: ['src/assets/*'],
     };
     overwritePackage(host, json);

scripts/site/generate.ts

@@ -32,6 +32,7 @@ const exampleModules: ExampleModules = {
 function generateModule(config: ModuleConfig) {
   const distPath = path.join(rootDir, config.dist);
 
+  // tslint:disable-next-line: prefer-object-spread
   const metas: Meta[] = Object.assign([], config.extraRouteMeta);
   const modules: any = {
     imports: [],
@@ -91,23 +92,15 @@ function generateModule(config: ModuleConfig) {
       }
     });
 
-    const newList = demos.data.filter(
-      w => w.type === 'example' && exampleModules.list.filter(ew => ew.urls === w.urls).length === 0,
-    );
+    const newList = demos.data.filter(w => w.type === 'example' && exampleModules.list.filter(ew => ew.urls === w.urls).length === 0);
 
     exampleModules.list.push(...newList);
   }
 
   config.dir.forEach(dirConfig => {
     const tpl = fs.readFileSync(path.join(rootDir, dirConfig.template.content)).toString('utf8');
 
-    const files = groupFiles(
-      dirConfig.src.map(p => path.join(rootDir, p)),
-      dirConfig,
-      isSyncSpecific,
-      target,
-      siteConfig,
-    );
+    const files = groupFiles(dirConfig.src.map(p => path.join(rootDir, p)), dirConfig, isSyncSpecific, target, siteConfig);
 
     files.forEach(item => {
       // #region generate document file
@@ -137,14 +130,7 @@ function generateModule(config: ModuleConfig) {
       // #endregion
 
       // #region generate demo files
-      const demos = generateDemo(
-        rootDir,
-        item.key,
-        path.join(path.dirname(item.data[defaultLang]), 'demo'),
-        meta.cols,
-        config,
-        siteConfig,
-      );
+      const demos = generateDemo(rootDir, item.key, path.join(path.dirname(item.data[defaultLang]), 'demo'), meta.cols, config, siteConfig);
       // #endregion
 
       // #region generate document file
@@ -187,11 +173,11 @@ function generateModule(config: ModuleConfig) {
 
   // #region generate meta file
 
-  const metaObj = Object.assign({ types: [] }, includeAttributes(config, {}));
+  const metaObj = { types: [], ...includeAttributes(config, {}) };
   metaObj.list = metas;
 
   generateDoc(
-    <MetaTemplateData>{ data: JSON.stringify(metaObj) },
+    { data: JSON.stringify(metaObj) } as MetaTemplateData,
     fs.readFileSync(path.join(rootDir, config.template.meta)).toString('utf8'),
     path.join(distPath, `meta.ts`),
   );

scripts/site/utils/generate-md.ts

@@ -90,9 +90,16 @@ export function toHtml(markdownData: any, codeEscape: boolean = true) {
   const ret: string = pair[1](markdownData);
   if (codeEscape) {
     return ret.replace(
-      /<pre class="hljs language-([html|ts|typescript|diff]+)"><code>([\s\S]*)<\/code><\/pre>/g,
-      (fullWord: any, lang: any, code: any) => {
-        return `<pre class="hljs language-$1"><code>${escapeHTML(code)}</code></pre>`;
+      /<pre class="hljs language-([a-zA-Z0-9]+)"><code>([\s\S]+)<\/code><\/pre>/g,
+      (_fullWord: string, lang: string, code: string) => {
+        if (lang === 'html') {
+          code = escapeHTML(code);
+        } else if ((lang === 'ts' || lang === 'typescript') && code.includes(`template: `)) {
+          code = code.replace(/template: `([^`]+)`/g, (_tFullword: string, tHtml: string) => {
+            return 'template: `' + escapeHTML(tHtml) + '`';
+          });
+        }
+        return `<pre class="hljs language-${lang}"><code>${code}</code></pre>`;
       },
     );
   } else {

scripts/site/utils/utils.ts

@@ -20,7 +20,7 @@ export function escapeHTML(str: string, escapeQuotes: boolean = false) {
   }
 
   let escaped = str
-    .replace(/&/g, '&')
+    // .replace(/&/g, '&')
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;');
 
@@ -95,6 +95,6 @@ export function genComponentName(...names) {
   return `${names.map(key => genUpperName(key)).join('')}Component`;
 }
 
-export function genSelector(...names) {
+export function genSelector(...names: string[]) {
   return `app-${names.join('-')}`;
 }