.github/workflows/deploy-site.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 14.17.0
+          node-version: 16.15.0
 
       - name: checkout
         uses: actions/checkout@master

.nvmrc

@@ -1 +1 @@
-14.17.0
+16.15.0

CHANGELOG.md

@@ -1,3 +1,22 @@
+# [14.3.0](https://github.com/ng-alain/delon/compare/14.2.0...14.3.0) (2022-12-04)
+
+
+### Bug Fixes
+
+* **abc:st:** fix misalignment ([#1556](https://github.com/ng-alain/delon/issues/1556)) ([5a77920](https://github.com/ng-alain/delon/commit/5a77920cae0e5db1d3400d68b13d712514de7a77))
+* **abc:st:** fix miss built-in style in head ([#1560](https://github.com/ng-alain/delon/issues/1560)) ([41fbae0](https://github.com/ng-alain/delon/commit/41fbae0483ec076f5265053736c0286d5f49c0cd))
+* **abc:st:** fix shadow spacing in truncate ([#1558](https://github.com/ng-alain/delon/issues/1558)) ([4b00b21](https://github.com/ng-alain/delon/commit/4b00b213fbf69da060f71618e2e9df8749f71363))
+* **from:** fix can't detect change when call `setValue` ([#1554](https://github.com/ng-alain/delon/issues/1554)) ([bc609b3](https://github.com/ng-alain/delon/commit/bc609b3172ebcf04511e0cc6437f8d8b2bc1d7b2))
+
+
+### Features
+
+* **abc:st:** `columns` support `null`, `undefined` ([#1559](https://github.com/ng-alain/delon/issues/1559)) ([c74c992](https://github.com/ng-alain/delon/commit/c74c992c18167bef7b5f3bc2c3fa4da00414bf53))
+* **abc:sv:** add `hideLabel` property ([#1553](https://github.com/ng-alain/delon/issues/1553)) ([f71351b](https://github.com/ng-alain/delon/commit/f71351bbd6a5841cae4ef077cae62b72255bdc81))
+* **theme:default:** add `LayoutDefaultService` service ([#1561](https://github.com/ng-alain/delon/issues/1561)) ([bf90034](https://github.com/ng-alain/delon/commit/bf9003488508f4221f38174ce25ead2a1da39c7a))
+
+
+
 # [14.2.0](https://github.com/ng-alain/delon/compare/14.1.1...14.2.0) (2022-11-11)
 
 

azure-pipelines.yml

@@ -13,7 +13,7 @@ stages:
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: '14.17.0'
+              versionSpec: '16.15.0'
             displayName: 'Install Node.js'
 
   - stage: build
@@ -22,7 +22,7 @@ stages:
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: '14.17.0'
+              versionSpec: '16.15.0'
             displayName: 'Install Node.js'
           - script: |
               node --version

docs/changelog.en-US.md

@@ -14,6 +14,22 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh-
 
 ---
 
+# [14.3.0](https://github.com/ng-alain/delon/compare/14.2.0...14.3.0) (2022-12-04)
+
+### Bug Fixes
+
+* **abc:st:** fix misalignment when sort and filter can be set ([#1556](https://github.com/ng-alain/delon/issues/1556)) ([5a77920](https://github.com/ng-alain/delon/commit/5a77920cae0e5db1d3400d68b13d712514de7a77))
+* **abc:st:** fix miss built-in style in head ([#1560](https://github.com/ng-alain/delon/issues/1560)) ([41fbae0](https://github.com/ng-alain/delon/commit/41fbae0483ec076f5265053736c0286d5f49c0cd))
+* **abc:st:** fix shadow spacing in truncate mode ([#1558](https://github.com/ng-alain/delon/issues/1558)) ([4b00b21](https://github.com/ng-alain/delon/commit/4b00b213fbf69da060f71618e2e9df8749f71363))
+* **from:** fix can't detect change when call `setValue` ([#1554](https://github.com/ng-alain/delon/issues/1554)) ([bc609b3](https://github.com/ng-alain/delon/commit/bc609b3172ebcf04511e0cc6437f8d8b2bc1d7b2))
+
+### Features
+
+* **abc:st:** `columns` support `null`, `undefined` ([#1559](https://github.com/ng-alain/delon/issues/1559)) ([c74c992](https://github.com/ng-alain/delon/commit/c74c992c18167bef7b5f3bc2c3fa4da00414bf53))
+* **abc:sv:** add `hideLabel` property ([#1553](https://github.com/ng-alain/delon/issues/1553)) ([f71351b](https://github.com/ng-alain/delon/commit/f71351bbd6a5841cae4ef077cae62b72255bdc81))
+* **theme:default:** add `LayoutDefaultService` service of control theme, add hide top options ([#1561](https://github.com/ng-alain/delon/issues/1561)) ([bf90034](https://github.com/ng-alain/delon/commit/bf9003488508f4221f38174ce25ead2a1da39c7a))
+
+
 # [14.2.0](https://github.com/ng-alain/delon/compare/14.1.1...14.2.0) (2022-11-11)
 
 ### Scaffold

docs/changelog.zh-CN.md

@@ -14,6 +14,23 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/)
 
 ---
 
+
+# [14.3.0](https://github.com/ng-alain/delon/compare/14.2.0...14.3.0) (2022-12-04)
+
+### Bug Fixes
+
+* **abc:st:** 修复排序与过滤共享时不对齐 ([#1556](https://github.com/ng-alain/delon/issues/1556)) ([5a77920](https://github.com/ng-alain/delon/commit/5a77920cae0e5db1d3400d68b13d712514de7a77))
+* **abc:st:** 修复内置样式无法适应到标题 ([#1560](https://github.com/ng-alain/delon/issues/1560)) ([41fbae0](https://github.com/ng-alain/delon/commit/41fbae0483ec076f5265053736c0286d5f49c0cd))
+* **abc:st:** 修复宽带模式为截取时阴影间距问题 ([#1558](https://github.com/ng-alain/delon/issues/1558)) ([4b00b21](https://github.com/ng-alain/delon/commit/4b00b213fbf69da060f71618e2e9df8749f71363))
+* **from:** 修复调用 `setValue` 无法触发变更检测 ([#1554](https://github.com/ng-alain/delon/issues/1554)) ([bc609b3](https://github.com/ng-alain/delon/commit/bc609b3172ebcf04511e0cc6437f8d8b2bc1d7b2))
+
+### Features
+
+* **abc:st:** `columns` 允许 `null`, `undefined` 值 ([#1559](https://github.com/ng-alain/delon/issues/1559)) ([c74c992](https://github.com/ng-alain/delon/commit/c74c992c18167bef7b5f3bc2c3fa4da00414bf53))
+* **abc:sv:** 新增 `hideLabel` 隐藏标签属性 ([#1553](https://github.com/ng-alain/delon/issues/1553)) ([f71351b](https://github.com/ng-alain/delon/commit/f71351bbd6a5841cae4ef077cae62b72255bdc81))
+* **theme:default:** 新增 `LayoutDefaultService` 服务用于控件整体布局，新增隐藏顶部、侧边折叠菜单按钮配置 ([#1561](https://github.com/ng-alain/delon/issues/1561)) ([bf90034](https://github.com/ng-alain/delon/commit/bf9003488508f4221f38174ce25ead2a1da39c7a))
+
+
 # [14.2.0](https://github.com/ng-alain/delon/compare/14.1.1...14.2.0) (2022-11-11)
 
 ### Scaffold

docs/upgrade-v14.zh-CN.md

@@ -20,7 +20,7 @@ hot: true
 
 ### 1. 升级相关依赖
 
-- 将项目升级到 Angular 13 运行 `ng update @angular/core@14 @angular/cli@14 @angular-eslint/schematics@14`。
+- 将项目升级到 Angular 14 运行 `ng update @angular/core@14 @angular/cli@14 @angular-eslint/schematics@14`。
 - 如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk@14`
 
 ### 2.升级 NG-ZORRO

package.json

@@ -1,6 +1,6 @@
 {
   "name": "delon",
-  "version": "14.2.0",
+  "version": "14.3.0",
   "description": "Delon is a set of essential modules for NG-ALAIN.",
   "keywords": [
     "delon",
@@ -31,7 +31,7 @@
     "start": "npm run site:gen && ng s -o --hmr",
     "lint": "bash scripts/ci/lint.sh -ts -less",
     "lint:ts": "eslint --cache . --ext .ts,.html",
-    "lint:fix": "eslint --fix --cache . --ext .ts,.html",
+    "lint:fix": "eslint --cache . --ext .ts,.html --fix",
     "lint:style": "npx stylelint 'packages/**/*.less'",
     "test": "ng test --no-progress --browsers=ChromeHeadlessCI --code-coverage --no-watch",
     "test:cli": "bash scripts/ci/build-schematics.sh -t -clone",

packages/abc/st/st-column-source.ts

@@ -372,16 +372,18 @@ export class STColumnSource {
     }
     const rawClassName = item.className;
     if (!rawClassName) {
-      builtInClassNames.push(
-        (
-          {
-            number: 'text-right',
-            currency: 'text-right',
-            date: 'text-center'
-          } as NzSafeAny
-        )[item.type!]
-      );
-      item._className = builtInClassNames.filter(w => !!w);
+      const typeClass = (
+        {
+          number: 'text-right',
+          currency: 'text-right',
+          date: 'text-center'
+        } as NzSafeAny
+      )[item.type!];
+      if (typeClass) {
+        builtInClassNames.push(typeClass);
+      }
+      item._className = builtInClassNames;
+      item._classNameInHeader = builtInClassNames;
       return;
     }
 
@@ -402,8 +404,9 @@ export class STColumnSource {
     list: STColumn[],
     options: STColumnSourceProcessOptions
   ): { columns: _STColumn[]; headers: _STHeader[][]; headerWidths: string[] | null } {
-    if (!list || list.length === 0) throw new Error(`[st]: the columns property muse be define!`);
-
+    if (!list || list.length === 0) {
+      return { columns: [], headers: [], headerWidths: null };
+    }
     const { noIndex } = this.cog;
     let checkboxCount = 0;
     let radioCount = 0;

packages/abc/st/st.component.html

@@ -33,7 +33,7 @@
   [nzFrontPagination]="false"
   [nzBordered]="bordered"
   [nzSize]="size"
-  [nzLoading]="_loading"
+  [nzLoading]="noColumns || _loading"
   [nzLoadingDelay]="loadingDelay"
   [nzLoadingIndicator]="loadingIndicator"
   [nzTitle]="header!"
@@ -54,6 +54,7 @@
   [nzShowTotal]="totalTpl"
   [nzWidthConfig]="_widthConfig"
   (contextmenu)="onContextmenu($event)"
+  [class.st__no-column]="noColumns"
 >
   <thead *ngIf="showHeader">
     <tr *ngFor="let row of _headers; let rowFirst = first">
@@ -66,7 +67,7 @@
           [nzWidth]="$any(_c).width"
           [nzLeft]="_c._left!"
           [nzRight]="_c._right!"
-          [ngClass]="_c.className!"
+          [ngClass]="_c._classNameInHeader"
           [attr.data-col]="_c.indexKey"
           [attr.data-col-index]="index"
           [nzShowSort]="_c._sort.enabled"

packages/abc/st/st.component.ts

@@ -162,7 +162,7 @@ export class STComponent implements AfterViewInit, OnChanges, OnDestroy {
     this.updateTotalTpl();
   }
   @Input() data!: string | STData[] | Observable<STData[]>;
-  @Input() columns: STColumn[] = [];
+  @Input() columns?: STColumn[] | null;
   @Input() contextmenu?: STContextmenuFn | null;
   @Input() @InputNumber() ps = 10;
   @Input() @InputNumber() pi = 1;
@@ -244,6 +244,10 @@ export class STComponent implements AfterViewInit, OnChanges, OnDestroy {
     return this._data;
   }
 
+  get noColumns(): boolean {
+    return this.columns == null;
+  }
+
   constructor(
     @Optional() @Inject(ALAIN_I18N_TOKEN) i18nSrv: AlainI18NService,
     private cdr: ChangeDetectorRef,

packages/abc/st/st.interfaces.ts

@@ -82,7 +82,7 @@ export interface STReq {
    */
   allInBody?: boolean;
   /**
-   * 是否延迟加载数据，即渲染结束后不会主动发起请求，默认：`false`
+   * 是否延迟加载数据，即渲染结束后不会主动发起请求，在适当的时机调用 `resetColumns` 来渲染，默认：`false`
    */
   lazyLoad?: boolean;
   /**

packages/abc/st/st.types.ts

@@ -34,6 +34,7 @@ export interface _STColumn extends STColumn {
    * 校验需要未自定义 `className` 时应检查 `_isTruncate` 是否需要截短行为
    */
   _className?: string | string[] | Set<string> | { [klass: string]: any } | null;
+  _classNameInHeader?: string | string[] | Set<string> | { [klass: string]: any } | null | undefined;
   _sort: STSortMap;
   _width?: number;
   _left?: string | boolean;

packages/abc/st/style/index.less

@@ -80,7 +80,7 @@
     }
   }
   // Title
-  &__has-filter.@{ant-prefix}-table-column-has-sorters {
+  &__has-filter {
     @st-th-icon-width: 12px;
     @st-filter-and-sort-gutter: 4px;
     @st-filter-icon-size: @st-th-icon-width + @st-filter-and-sort-gutter;
@@ -92,12 +92,22 @@
     @{st-prefix}__filter {
       position: absolute;
       top: 0;
-      right: -(@st-sort-size + @st-filter-icon-size);
+      right: 0;
       bottom: 0;
       display: flex;
       align-items: center;
       justify-items: center;
     }
+
+    .@{ant-prefix}-table-filter-trigger {
+      height: 100%;
+    }
+
+    &.@{ant-prefix}-table-column-has-sorters {
+      @{st-prefix}__filter {
+        right: -(@st-sort-size + @st-filter-icon-size);
+      }
+    }
   }
 
   &__head {
@@ -129,8 +139,10 @@
       }
     }
   }
-  // 修复无法显示阴影问题
-  .@{ant-prefix}-table {
+  // 若 `widthMode` 为 `truncate` 会导致固定列的阴影失效，其他情况不存在此情况
+  // 这里使用 `text-truncate` 来区分
+  // https://github.com/ng-alain/ng-alain/issues/2336
+  .text-truncate.@{ant-prefix}-table {
     &-cell-fix-left-first::after,
     &-cell-fix-left-last::after {
       transform: translateX(80%);
@@ -142,6 +154,16 @@
     }
   }
 
+  &__no-column {
+    .@{ant-prefix}-table {
+      height: @st-no-column-height;
+
+      &-content {
+        display: none;
+      }
+    }
+  }
+
   @media screen and (min-width: @nz-table-rep-min-width) {
     &__width {
       &-strict {

packages/abc/st/test/st-column-source.spec.ts

@@ -49,15 +49,12 @@ describe('st: column-source', () => {
     page = new PageObject();
   }
 
-  it('should be throw error when is empty columns', () => {
-    expect(() => {
-      genModule({});
-      srv.process(null!, { widthMode: null!, resizable: {}, safeType: 'safeHtml' });
-    }).toThrow();
-    expect(() => {
-      genModule({});
-      srv.process([], options);
-    }).toThrow();
+  it('should be support empty columns', () => {
+    genModule({});
+    const res = srv.process([], options);
+    expect(res.columns.length).toBe(0);
+    expect(res.headers.length).toBe(0);
+    expect(res.headerWidths).toBe(null);
   });
 
   describe('[columns property]', () => {

packages/abc/st/test/st.spec.ts

@@ -1444,7 +1444,7 @@ describe('abc: st', () => {
             .cd()
             .updateColumn([{ title: '', index: 'id', width: 50, className: 'aaaa' }])
             .expectElCount(`.st__width-strict`, 1)
-            .expectElCount(`.text-truncate`, context.comp._data.length)
+            .expectElCount(`td.text-truncate`, context.comp._data.length)
             .expectElCount(`td.aaaa`, context.comp._data.length)
             .asyncEnd();
         }));

packages/abc/sv/demo/fixed.md

@@ -15,6 +15,8 @@ Use `labelWidth` to make the layout look cleaner
 
 ```ts
 import { Component } from '@angular/core';
+
+import { STColumn } from '@delon/abc/st';
 import { NzMessageService } from 'ng-zorro-antd/message';
 
 @Component({
@@ -34,10 +36,15 @@ import { NzMessageService } from 'ng-zorro-antd/message';
         </ng-template>
         Custom label
       </sv>
+      <sv hideLabel col="1">
+        <st [columns]="columns" size="small"></st>
+      </sv>
     </sv-container>
-  `,
+  `
 })
 export class DemoComponent {
+  columns: STColumn[] = [{ title: 'id' }];
+
   constructor(public msg: NzMessageService) {}
 }
 ```

packages/abc/sv/index.en-US.md

@@ -37,6 +37,7 @@ Viewing grid system is a higher-order components based on the original [Grid Sys
 | `[optionalHelp]` | Label optional help | `string, TemplateRef<void>` | - |
 | `[optionalHelpColor]` | The background color of label optional help	 | `string` | - |
 | `[noColon]` | Whether to not display : after label text | `boolean` | `false` | - |
+| `[hideLabel]` | Whether to hide the current label | `boolean` | `false` |
 
 ### sv-title
 

packages/abc/sv/index.zh-CN.md

@@ -37,6 +37,7 @@ module: import { SVModule } from '@delon/abc/sv';
 | `[optionalHelp]` | 标签可选帮助 | `string, TemplateRef<void>` | - |
 | `[optionalHelpColor]` | 标签可选帮助背景颜色	 | `string` | - |
 | `[noColon]` | 是否不显示 label 后面的冒号 | `boolean` | `false` | - |
+| `[hideLabel]` | 是否隐藏当前 `label` | `boolean` | `false` |
 
 ### sv-title
 

packages/abc/sv/sv.component.html

@@ -1,4 +1,5 @@
 <div
+  *ngIf="!hideLabel"
   class="sv__label"
   [class.sv__label-empty]="!label"
   [class.sv__label-width]="labelWidth !== null && labelWidth !== undefined"

packages/abc/sv/sv.component.ts

@@ -37,6 +37,7 @@ export class SVComponent implements AfterViewInit, OnChanges {
   static ngAcceptInputType_col: NumberInput;
   static ngAcceptInputType_default: BooleanInput;
   static ngAcceptInputType_noColon: BooleanInput;
+  static ngAcceptInputType_hideLabel: BooleanInput;
 
   @ViewChild('conEl', { static: false })
   private conEl!: ElementRef;
@@ -55,6 +56,7 @@ export class SVComponent implements AfterViewInit, OnChanges {
   @Input() @InputBoolean(null) default?: boolean | null;
   @Input() type?: 'primary' | 'success' | 'danger' | 'warning';
   @Input() @InputBoolean(null) noColon?: boolean | null;
+  @Input() @InputBoolean() hideLabel = false;
 
   // #endregion