@delon/abc 16.2.1 → 16.3.0

package/st/st.component.d.ts

@@ -1,5 +1,5 @@
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
-import { AfterViewInit, ChangeDetectorRef, ElementRef, EventEmitter, OnChanges, OnDestroy, SimpleChange, SimpleChanges, TemplateRef, TrackByFunction } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, ElementRef, EventEmitter, OnChanges, SimpleChange, SimpleChanges, TemplateRef, TrackByFunction } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { AlainI18NService, DelonLocaleService, DrawerHelper, LocaleData, ModalHelper } from '@delon/theme';
@@ -15,7 +15,7 @@ import { STExport } from './st-export';
 import { STChange, STClickRowClassName, STColumn, STColumnButton, STColumnSelection, STContextmenuFn, STContextmenuItem, STCustomRequestOptions, STData, STError, STExportOptions, STLoadOptions, STPage, STReq, STRes, STResetColumnsOption, STResizable, STRowClassName, STSingleSort, STStatisticalResults, STWidthMode } from './st.interfaces';
 import { _STColumn, _STHeader, _STTdNotify } from './st.types';
 import * as i0 from "@angular/core";
-export declare class STComponent implements AfterViewInit, OnChanges, OnDestroy {
+export declare class STComponent implements AfterViewInit, OnChanges {
     private cdr;
     private el;
     private exportSrv;
@@ -38,9 +38,8 @@ export declare class STComponent implements AfterViewInit, OnChanges, OnDestroy
     static ngAcceptInputType_virtualMaxBufferPx: NumberInput;
     static ngAcceptInputType_virtualMinBufferPx: NumberInput;
     private destroy$;
-    private isDestroy;
-    private data$?;
     private totalTpl;
+    private inied;
     cog: AlainSTConfig;
     private _req;
     private _res;
@@ -68,7 +67,7 @@ export declare class STComponent implements AfterViewInit, OnChanges, OnDestroy
     set res(value: STRes);
     get page(): STPage;
     set page(value: STPage);
-    data: string | STData[] | Observable<STData[]>;
+    data?: string | STData[] | Observable<STData[]>;
     columns?: STColumn[] | null;
     contextmenu?: STContextmenuFn | null;
     ps: number;
@@ -140,7 +139,7 @@ export declare class STComponent implements AfterViewInit, OnChanges, OnDestroy
      * - 本地数据：包含排序、过滤后不分页数据
      * - 远程数据：不传递 `pi`、`ps` 两个参数
      */
-    get filteredData(): Promise<STData[]>;
+    get filteredData(): Observable<STData[]>;
     private updateTotalTpl;
     private setLoading;
     private loadData;
@@ -243,7 +242,8 @@ export declare class STComponent implements AfterViewInit, OnChanges, OnDestroy
     export(newData?: STData[] | true, opt?: STExportOptions): void;
     colResize({ width }: NzResizeEvent, column: _STColumn): void;
     onContextmenu(event: MouseEvent): void;
-    get cdkVirtualScrollViewport(): CdkVirtualScrollViewport;
+    get cdkVirtualScrollViewport(): CdkVirtualScrollViewport | undefined;
+    private _resetColumns;
     resetColumns(options?: STResetColumnsOption): Promise<this>;
     private refreshColumns;
     private optimizeData;
@@ -257,7 +257,6 @@ export declare class STComponent implements AfterViewInit, OnChanges, OnDestroy
     ngOnChanges(changes: {
         [P in keyof this]?: SimpleChange;
     } & SimpleChanges): void;
-    ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<STComponent, [{ optional: true; }, null, null, null, null, null, null, null, null, null]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<STComponent, "st", ["st"], { "req": { "alias": "req"; "required": false; }; "res": { "alias": "res"; "required": false; }; "page": { "alias": "page"; "required": false; }; "data": { "alias": "data"; "required": false; }; "columns": { "alias": "columns"; "required": false; }; "contextmenu": { "alias": "contextmenu"; "required": false; }; "ps": { "alias": "ps"; "required": false; }; "pi": { "alias": "pi"; "required": false; }; "total": { "alias": "total"; "required": false; }; "loading": { "alias": "loading"; "required": false; }; "loadingDelay": { "alias": "loadingDelay"; "required": false; }; "loadingIndicator": { "alias": "loadingIndicator"; "required": false; }; "bordered": { "alias": "bordered"; "required": false; }; "size": { "alias": "size"; "required": false; }; "scroll": { "alias": "scroll"; "required": false; }; "singleSort": { "alias": "singleSort"; "required": false; }; "multiSort": { "alias": "multiSort"; "required": false; }; "rowClassName": { "alias": "rowClassName"; "required": false; }; "clickRowClassName": { "alias": "clickRowClassName"; "required": false; }; "widthMode": { "alias": "widthMode"; "required": false; }; "widthConfig": { "alias": "widthConfig"; "required": false; }; "resizable": { "alias": "resizable"; "required": false; }; "header": { "alias": "header"; "required": false; }; "showHeader": { "alias": "showHeader"; "required": false; }; "footer": { "alias": "footer"; "required": false; }; "bodyHeader": { "alias": "bodyHeader"; "required": false; }; "body": { "alias": "body"; "required": false; }; "expandRowByClick": { "alias": "expandRowByClick"; "required": false; }; "expandAccordion": { "alias": "expandAccordion"; "required": false; }; "expand": { "alias": "expand"; "required": false; }; "noResult": { "alias": "noResult"; "required": false; }; "responsive": { "alias": "responsive"; "required": false; }; "responsiveHideHeaderFooter": { "alias": "responsiveHideHeaderFooter"; "required": false; }; "virtualScroll": { "alias": "virtualScroll"; "required": false; }; "virtualItemSize": { "alias": "virtualItemSize"; "required": false; }; "virtualMaxBufferPx": { "alias": "virtualMaxBufferPx"; "required": false; }; "virtualMinBufferPx": { "alias": "virtualMinBufferPx"; "required": false; }; "customRequest": { "alias": "customRequest"; "required": false; }; "virtualForTrackBy": { "alias": "virtualForTrackBy"; "required": false; }; }, { "error": "error"; "change": "change"; }, never, never, false, never>;
 }

package/st/st.interfaces.d.ts

@@ -2,6 +2,7 @@ import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { ElementRef, TemplateRef } from '@angular/core';
 import { Observable } from 'rxjs';
 import type { ThemeType } from '@ant-design/icons-angular';
+import type { CellOptions } from '@delon/abc/cell';
 import type { ACLCanType } from '@delon/acl';
 import type { DrawerHelperOptions, ModalHelperOptions, YNMode } from '@delon/theme';
 import type { CurrencyFormatOptions } from '@delon/util/format';
@@ -255,9 +256,16 @@ export interface STColumn<T extends STData = any> {
      * - `currency` 货币且居右(若 `className` 存在则优先)
      * - `date` 日期格式且居中(若 `className` 存在则优先)，使用 `dateFormat` 自定义格式
      * - `yn` 将`boolean`类型徽章化 [document](https://ng-alain.com/docs/data-render#yn)
+     * - `cell` 使用 `cell` 组件渲染 [document](https://ng-alain.com/components/cell)
      * - `widget` 使用自定义小部件动态创建
      */
-    type?: '' | 'checkbox' | 'link' | 'badge' | 'tag' | 'enum' | 'radio' | 'img' | 'currency' | 'number' | 'date' | 'yn' | 'no' | 'widget';
+    type?: '' | 'checkbox' | 'link' | 'badge' | 'tag' | 'enum' | 'radio' | 'img' | 'currency' | 'number' | 'date' | 'yn' | 'no' | 'cell' | 'widget';
+    /**
+     * `cell` component options
+     *
+     * `cell` 组件配置项
+     */
+    cell?: CellOptions | ((record: T, column: STColumn) => CellOptions);
     /**
      * 链接回调，若返回一个字符串表示导航URL会自动触发 `router.navigateByUrl`
      */
@@ -970,6 +978,12 @@ export interface STColumnBadgeValue {
      * 徽标颜色值
      */
     color?: 'success' | 'processing' | 'default' | 'error' | 'warning';
+    /**
+     * Text popup tip
+     *
+     * 文字提示
+     */
+    tooltip?: string;
 }
 /**
  * 标签信息
@@ -989,6 +1003,12 @@ export interface STColumnTagValue {
      * - 色值：#f50,#ff0
      */
     color?: 'geekblue' | 'blue' | 'purple' | 'success' | 'red' | 'volcano' | 'orange' | 'gold' | 'lime' | 'green' | 'cyan' | string;
+    /**
+     * Text popup tip
+     *
+     * 文字提示
+     */
+    tooltip?: string;
 }
 export type STChangeType = 'loaded' | 'pi' | 'ps' | 'checkbox' | 'radio' | 'sort' | 'filter' | 'filterChange' | 'click' | 'dblClick' | 'expand' | 'resize';
 /**

package/st/st.module.d.ts

@@ -7,23 +7,24 @@ import * as i5 from "@angular/common";
 import * as i6 from "@angular/forms";
 import * as i7 from "@delon/acl";
 import * as i8 from "@delon/abc/let";
-import * as i9 from "ng-zorro-antd/popconfirm";
-import * as i10 from "ng-zorro-antd/table";
-import * as i11 from "ng-zorro-antd/icon";
-import * as i12 from "ng-zorro-antd/badge";
-import * as i13 from "ng-zorro-antd/checkbox";
-import * as i14 from "ng-zorro-antd/divider";
-import * as i15 from "ng-zorro-antd/dropdown";
-import * as i16 from "ng-zorro-antd/menu";
-import * as i17 from "ng-zorro-antd/radio";
-import * as i18 from "ng-zorro-antd/tag";
-import * as i19 from "ng-zorro-antd/input";
-import * as i20 from "ng-zorro-antd/tooltip";
-import * as i21 from "ng-zorro-antd/resizable";
-import * as i22 from "ng-zorro-antd/input-number";
-import * as i23 from "ng-zorro-antd/date-picker";
+import * as i9 from "@delon/abc/cell";
+import * as i10 from "ng-zorro-antd/popconfirm";
+import * as i11 from "ng-zorro-antd/table";
+import * as i12 from "ng-zorro-antd/icon";
+import * as i13 from "ng-zorro-antd/badge";
+import * as i14 from "ng-zorro-antd/checkbox";
+import * as i15 from "ng-zorro-antd/divider";
+import * as i16 from "ng-zorro-antd/dropdown";
+import * as i17 from "ng-zorro-antd/menu";
+import * as i18 from "ng-zorro-antd/radio";
+import * as i19 from "ng-zorro-antd/tag";
+import * as i20 from "ng-zorro-antd/input";
+import * as i21 from "ng-zorro-antd/tooltip";
+import * as i22 from "ng-zorro-antd/resizable";
+import * as i23 from "ng-zorro-antd/input-number";
+import * as i24 from "ng-zorro-antd/date-picker";
 export declare class STModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<STModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<STModule, [typeof i1.STComponent, typeof i2.STRowDirective, typeof i3.STWidgetHostDirective, typeof i4.STFilterComponent, typeof i1.STTdComponent], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i7.DelonACLModule, typeof i8.LetModule, typeof i9.NzPopconfirmModule, typeof i10.NzTableModule, typeof i11.NzIconModule, typeof i12.NzBadgeModule, typeof i13.NzCheckboxModule, typeof i14.NzDividerModule, typeof i15.NzDropDownModule, typeof i16.NzMenuModule, typeof i17.NzRadioModule, typeof i18.NzTagModule, typeof i19.NzInputModule, typeof i20.NzToolTipModule, typeof i21.NzResizableModule, typeof i22.NzInputNumberModule, typeof i23.NzDatePickerModule], [typeof i1.STComponent, typeof i2.STRowDirective, typeof i3.STWidgetHostDirective]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<STModule, [typeof i1.STComponent, typeof i2.STRowDirective, typeof i3.STWidgetHostDirective, typeof i4.STFilterComponent, typeof i1.STTdComponent], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i7.DelonACLModule, typeof i8.LetModule, typeof i9.CellModule, typeof i10.NzPopconfirmModule, typeof i11.NzTableModule, typeof i12.NzIconModule, typeof i13.NzBadgeModule, typeof i14.NzCheckboxModule, typeof i15.NzDividerModule, typeof i16.NzDropDownModule, typeof i17.NzMenuModule, typeof i18.NzRadioModule, typeof i19.NzTagModule, typeof i20.NzInputModule, typeof i21.NzToolTipModule, typeof i22.NzResizableModule, typeof i23.NzInputNumberModule, typeof i24.NzDatePickerModule], [typeof i1.STComponent, typeof i2.STRowDirective, typeof i3.STWidgetHostDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<STModule>;
 }

package/st/st.types.d.ts

@@ -1,5 +1,6 @@
 import { TemplateRef } from '@angular/core';
 import { SafeHtml } from '@angular/platform-browser';
+import type { CellOptions } from '@delon/abc/cell';
 import type { NgClassType } from 'ng-zorro-antd/core/types';
 import type { STColumn, STColumnButton, STColumnSafeType, STData, STIcon, STOnCellResult, STSortMap } from './st.interfaces';
 /**
@@ -71,7 +72,9 @@ export interface _STDataValue {
     _text: SafeHtml;
     org?: any;
     color?: string;
+    tooltip?: string;
     safeType: STColumnSafeType;
     buttons?: _STColumnButton[];
     props?: STOnCellResult | null;
+    cell?: CellOptions;
 }

package/sv/style/index.less

@@ -229,4 +229,40 @@
   &__no-colon::after {
     content: ' ' !important;
   }
+
+  &__bordered {
+    overflow: hidden;
+    border-top: 1px solid @border-color-split;
+    border-bottom: 1px solid @border-color-split;
+    border-left: 1px solid @border-color-split;
+
+    @{sv-prefix}__item {
+      border-right: 1px solid @border-color-split;
+      border-bottom: 1px solid @border-color-split;
+    }
+
+    @{sv-prefix}__label {
+      background-color: @descriptions-bg;
+      border-right: 1px solid @border-color-split;
+    }
+
+    @{sv-prefix}__label,
+    @{sv-prefix}__detail {
+      padding: @descriptions-middle-padding;
+    }
+
+    &@{sv-prefix}__large {
+      @{sv-prefix}__label,
+      @{sv-prefix}__detail {
+        padding: @descriptions-default-padding;
+      }
+    }
+
+    &@{sv-prefix}__small {
+      @{sv-prefix}__label,
+      @{sv-prefix}__detail {
+        padding: @descriptions-small-padding;
+      }
+    }
+  }
 }

package/sv/sv-container.component.d.ts

@@ -10,9 +10,10 @@ export declare class SVContainerComponent {
     static ngAcceptInputType_colInCon: NumberInput;
     static ngAcceptInputType_default: BooleanInput;
     static ngAcceptInputType_noColon: BooleanInput;
+    static ngAcceptInputType_bordered: BooleanInput;
     colInCon?: REP_TYPE;
     title?: string | TemplateRef<void>;
-    size: 'small' | 'large';
+    size?: 'small' | 'large' | 'default';
     /** 列表项间距，单位为 `px` */
     gutter: number;
     layout: 'horizontal' | 'vertical';
@@ -21,9 +22,13 @@ export declare class SVContainerComponent {
     col: number;
     default: boolean;
     noColon: boolean;
+    bordered: boolean;
+    get margin(): {
+        [k: string]: number;
+    };
     constructor(configSrv: AlainConfigService);
     static ɵfac: i0.ɵɵFactoryDeclaration<SVContainerComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SVContainerComponent, "sv-container, [sv-container]", ["svContainer"], { "colInCon": { "alias": "sv-container"; "required": false; }; "title": { "alias": "title"; "required": false; }; "size": { "alias": "size"; "required": false; }; "gutter": { "alias": "gutter"; "required": false; }; "layout": { "alias": "layout"; "required": false; }; "labelWidth": { "alias": "labelWidth"; "required": false; }; "col": { "alias": "col"; "required": false; }; "default": { "alias": "default"; "required": false; }; "noColon": { "alias": "noColon"; "required": false; }; }, {}, never, ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SVContainerComponent, "sv-container, [sv-container]", ["svContainer"], { "colInCon": { "alias": "sv-container"; "required": false; }; "title": { "alias": "title"; "required": false; }; "size": { "alias": "size"; "required": false; }; "gutter": { "alias": "gutter"; "required": false; }; "layout": { "alias": "layout"; "required": false; }; "labelWidth": { "alias": "labelWidth"; "required": false; }; "col": { "alias": "col"; "required": false; }; "default": { "alias": "default"; "required": false; }; "noColon": { "alias": "noColon"; "required": false; }; "bordered": { "alias": "bordered"; "required": false; }; }, {}, never, ["*"], false, never>;
 }
 export declare class SVTitleComponent implements OnInit {
     private el;

package/sv/sv.component.d.ts

@@ -4,6 +4,7 @@ import { BooleanInput, NumberInput } from '@delon/util/decorator';
 import { SVContainerComponent } from './sv-container.component';
 import * as i0 from "@angular/core";
 export declare class SVComponent implements AfterViewInit, OnChanges {
+    private el;
     parent: SVContainerComponent;
     private rep;
     private ren;
@@ -12,7 +13,6 @@ export declare class SVComponent implements AfterViewInit, OnChanges {
     static ngAcceptInputType_noColon: BooleanInput;
     static ngAcceptInputType_hideLabel: BooleanInput;
     private conEl;
-    private el;
     private clsMap;
     _noColon: boolean;
     optional?: string | TemplateRef<void> | null;
@@ -25,9 +25,9 @@ export declare class SVComponent implements AfterViewInit, OnChanges {
     type?: 'primary' | 'success' | 'danger' | 'warning';
     noColon?: boolean | null;
     hideLabel: boolean;
-    get paddingValue(): number;
+    get paddingValue(): number | null;
     get labelWidth(): number | null | undefined;
-    constructor(el: ElementRef, parent: SVContainerComponent, rep: ResponsiveService, ren: Renderer2);
+    constructor(el: ElementRef<HTMLElement>, parent: SVContainerComponent, rep: ResponsiveService, ren: Renderer2);
     private setClass;
     ngAfterViewInit(): void;
     ngOnChanges(): void;

package/theme-default.less

@@ -57,6 +57,7 @@
 @page-header-bg: #fff;
 @page-header-padding: 16px 32px 0 32px;
 @page-header-wide: 1200px;
+@page-header-title-sub-color: fade(@heading-color, 40%);
 
 // quick-menu
 // --
@@ -103,3 +104,13 @@
 // --
 @tag-select-margin: 16px;
 @tag-select-item-margin-right: 24px;
+
+// cell
+// --
+@cell-default-color: @text-color-secondary;
+@cell-large: 18px;
+@cell-small: 12px;
+@cell-unit-color: @text-color-secondary;
+@cell-unit-font-size: 12px;
+@cell-img-space: 4px;
+@cell-link-disabled-color: @text-color;