chore: merge branch 'master' into feat-theme-pipe-custom

ng-alain · Aug 2, 2024 · 0a830fe · 0a830fe
2 parents fe1a786 + 6389ec1
commit 0a830fe
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 0 deletions.
diff --git a/packages/abc/let/index.en-US.md b/packages/abc/let/index.en-US.md
@@ -5,8 +5,11 @@ title: let
 subtitle: Let
 cols: 1
 module: import { LetModule } from '@delon/abc/let';
+deprecated: 19.0.0
 ---
 
+# Will be removed in v19, Please use `@let` instead.
+
 Allows to reuse computed value in several places in template to avoid recalculations of getters or many `async` pipes.
 
 ```html

diff --git a/packages/abc/let/index.zh-CN.md b/packages/abc/let/index.zh-CN.md
@@ -5,8 +5,11 @@ title: let
 subtitle: 定义
 cols: 1
 module: import { LetModule } from '@delon/abc/let';
+deprecated: 19.0.0
 ---
 
+# Will be removed in v19, Please use `@let` instead.
+
 允许在模板内复用计算值（包含异步），避免重复重新计算。
 
 ```html

diff --git a/packages/abc/let/let.directive.ts b/packages/abc/let/let.directive.ts
@@ -14,6 +14,9 @@ export class LetContext<T> {
   }
 }
 
+/**
+ * @deprecated Will be removed in v19, Please use `@let` instead.
+ */
 @Directive({ selector: '[let]', standalone: true })
 export class LetDirective<T> {
   @Input({ required: true }) let!: T;

diff --git a/packages/abc/let/let.module.ts b/packages/abc/let/let.module.ts
@@ -4,6 +4,9 @@ import { LetDirective } from './let.directive';
 
 const DIRECTIVES = [LetDirective];
 
+/**
+ * @deprecated Will be removed in v19, Please use `@let` instead.
+ */
 @NgModule({
   imports: DIRECTIVES,
   exports: DIRECTIVES

diff --git a/packages/abc/result/index.en-US.md b/packages/abc/result/index.en-US.md
@@ -4,8 +4,11 @@ title: result
 subtitle: Result
 cols: 1
 module: import { ResultModule } from '@delon/abc/result';
+deprecated: 20.0.0
 ---
 
+# Will be removed in v20, Please use `nz-result` instead.
+
 Used to feedback the processing results of a series of tasks performed by the user.
 
 ## API

diff --git a/packages/abc/result/index.zh-CN.md b/packages/abc/result/index.zh-CN.md
@@ -4,8 +4,11 @@ title: result
 subtitle: 处理结果
 cols: 1
 module: import { ResultModule } from '@delon/abc/result';
+deprecated: 20.0.0
 ---
 
+# Will be removed in v20, Please use `nz-result` instead.
+
 结果页用于对用户进行的一系列任务处理结果进行反馈。
 
 ## API

diff --git a/packages/abc/result/result.component.ts b/packages/abc/result/result.component.ts
@@ -15,6 +15,9 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { NzStringTemplateOutletDirective } from 'ng-zorro-antd/core/outlet';
 import { NzIconDirective } from 'ng-zorro-antd/icon';
 
+/**
+ * @deprecated Will be removed in v20, Please use `nz-result` instead.
+ */
 @Component({
   selector: 'result',
   exportAs: 'result',

diff --git a/packages/abc/result/result.module.ts b/packages/abc/result/result.module.ts
@@ -8,6 +8,9 @@ import { ResultComponent } from './result.component';
 
 const COMPONENTS = [ResultComponent];
 
+/**
+ * @deprecated Will be removed in v20, Please use `nz-result` instead.
+ */
 @NgModule({
   imports: [CommonModule, NzIconModule, NzOutletModule, ...COMPONENTS],
   exports: COMPONENTS

diff --git a/packages/abc/st/index.en-US.md b/packages/abc/st/index.en-US.md
@@ -83,6 +83,7 @@ When an exception is thrown when parsing column data, *INVALID DATA* will be for
 | `[expandRowByClick]` | Whether to expand row by clicking anywhere in the whole row | `boolean` | `false` | ✅ |
 | `[expandAccordion]` | Accordion mode | `boolean` | `false` | ✅ |
 | `[expand]` | Whether current column include expand icon | `TemplateRef<void>` | - | - |
+| `[expandIcon]`   | Custom expand icon | `TemplateRef<void>` | - |
 | `[responsive]` | Whether to turn on responsive | `boolean` | `true` | ✅ |
 | `[responsiveHideHeaderFooter]` | Whether to display the header and footer under the small screen | `boolean` | `false` | ✅ |
 | `[resizable]` | Resize header of the current table, **Multiple headers not supported** | `STResizable, boolean` | - | - |

diff --git a/packages/abc/st/index.zh-CN.md b/packages/abc/st/index.zh-CN.md
@@ -83,6 +83,7 @@ module: import { STModule } from '@delon/abc/st';
 | `[expandRowByClick]` | 通过点击行来展开子行 | `boolean` | `false` | ✅ |
 | `[expandAccordion]` | 手风琴模式 | `boolean` | `false` | ✅ |
 | `[expand]` | 当前列是否包含展开按钮，当数据源中包括 `expand` 表示展开状态 | `TemplateRef<void>` | - | - |
+| `[expandIcon]`   | 自定义展开图标 | `TemplateRef<void>` | - |
 | `[responsive]` | 是否开启响应式 | `boolean` | `true` | ✅ |
 | `[responsiveHideHeaderFooter]` | 是否在小屏幕下才显示顶部与底部 | `boolean` | `false` | ✅ |
 | `[resizable]` | 当前表格所有列的调整表头配置项，**不支持多表头** | `STResizable, boolean` | - | - |

diff --git a/packages/abc/st/st.component.html b/packages/abc/st/st.component.html
@@ -160,6 +160,7 @@
           <td
             [nzShowExpand]="expand && i.showExpand !== false"
             [nzExpand]="i.expand"
+            [nzExpandIcon]="expandIcon"
             (nzExpandChange)="_expandChange(i, $event)"
             (click)="_stopPropagation($event)"
             nzWidth="50px"

diff --git a/packages/abc/st/st.component.ts b/packages/abc/st/st.component.ts
@@ -214,6 +214,7 @@ export class STComponent implements AfterViewInit, OnChanges {
   @Input({ transform: booleanAttribute }) expandRowByClick = false;
   @Input({ transform: booleanAttribute }) expandAccordion = false;
   @Input() expand: TemplateRef<{ $implicit: NzSafeAny; index: number }> | null = null;
+  @Input() expandIcon: TemplateRef<void> | null = null;
   @Input() noResult?: string | TemplateRef<void> | null;
   @Input({ transform: booleanAttribute }) responsive: boolean = true;
   @Input({ transform: booleanAttribute }) responsiveHideHeaderFooter?: boolean;

diff --git a/packages/theme/system/theme-dark.less b/packages/theme/system/theme-dark.less
@@ -8,3 +8,5 @@
 
 @sf-optional-color: darken(@text-color, 50%);
 @sf-widget-array-type-card-remove-bg: rgba(0, 0, 0, 0.66);
+
+@scrollbar-track-color: fade(@white, 30%);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,5 @@

		@sf-optional-color: darken(@text-color, 50%);
		@sf-widget-array-type-card-remove-bg: rgba(0, 0, 0, 0.66);

		@scrollbar-track-color: fade(@white, 30%);