@delon/abc 16.1.1 → 16.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delon/abc",
-  "version": "16.1.1",
+  "version": "16.2.0",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",
   "repository": {
@@ -28,10 +28,10 @@
     "plyr": "^3.7.8",
     "pdfjs-dist": "~3.6.172",
     "@github/hotkey": "^2.0.1",
-    "ngx-countdown": "^15.0.0",
-    "@delon/theme": "^16.1.1",
-    "@delon/util": "^16.1.1",
-    "@delon/acl": "^16.1.1",
+    "ngx-countdown": "^16.0.0",
+    "@delon/theme": "^16.2.0",
+    "@delon/util": "^16.2.0",
+    "@delon/acl": "^16.2.0",
     "tslib": "^2.3.0"
   },
   "module": "fesm2022/abc.mjs",

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

@@ -1,4 +1,4 @@
-import { REP_TYPE } from '@delon/theme';
+import type { REP_TYPE } from '@delon/theme';
 import { AlainConfigService } from '@delon/util/config';
 import { NumberInput } from '@delon/util/decorator';
 import * as i0 from "@angular/core";

package/st/st-data-source.d.ts

@@ -5,7 +5,7 @@ import { DatePipe, YNPipe, _HttpClient } from '@delon/theme';
 import type { AlainSTConfig } from '@delon/util/config';
 import { CurrencyService } from '@delon/util/format';
 import type { NzSafeAny } from 'ng-zorro-antd/core/types';
-import { STCustomRequestOptions, STData, STMultiSort, STMultiSortResultType, STPage, STReq, STRes, STRowClassName, STSingleSort, STStatisticalResults } from './st.interfaces';
+import type { STColumn, STCustomRequestOptions, STData, STMultiSort, STMultiSortResultType, STOnCellResult, STPage, STReq, STRes, STRowClassName, STSingleSort, STStatisticalResults } from './st.interfaces';
 import { _STColumn } from './st.types';
 import * as i0 from "@angular/core";
 export interface STDataSourceOptions {
@@ -51,6 +51,7 @@ export declare class STDataSource {
     process(options: STDataSourceOptions): Observable<STDataSourceResult>;
     private get;
     private getByRemote;
+    getCell(c: STColumn, item: STData, idx: number): STOnCellResult;
     optimizeData(options: {
         columns: _STColumn[];
         result: STData[];

package/st/st.interfaces.d.ts

@@ -337,9 +337,11 @@ export interface STColumn<T extends STData = any> {
      */
     className?: NgClassType;
     /**
-     * 合并列
+     * Table cell supports `colSpan` and `rowSpan`. When each of them is set to 0, the cell will not be rendered.
+     *
+     * 表格支持行/列合并，若返回的 `colSpan` 或者 `rowSpan` 设值为 0 时表示不会渲染
      */
-    colSpan?: number;
+    onCell?: (item: T, index: number) => STOnCellResult;
     /**
      * 数字格式，`type=number` 有效
      */
@@ -411,6 +413,7 @@ export interface STColumn<T extends STData = any> {
      * 分组表头
      */
     children?: Array<STColumn<T>>;
+    colSpan?: number;
     rowSpan?: number;
     /**
      * 调整表头配置
@@ -692,7 +695,7 @@ export interface STColumnButton<T extends STData = any> {
     /**
      * 图标
      */
-    icon?: string | STIcon;
+    icon?: string | STIcon | ((record: T, btn: STColumnButton<T>) => STIcon | null | undefined);
     /**
      * 按钮类型
      * - `none` 无任何互动
@@ -751,7 +754,7 @@ export interface STColumnButton<T extends STData = any> {
      * - `text-success` 成功色
      * - `text-error` 错误色
      */
-    className?: NgClassType;
+    className?: NgClassType | ((record: T, btn: STColumnButton<T>) => NgClassType | null | undefined);
     [key: string]: any;
 }
 export interface STColumnMaxMultipleButton {
@@ -1150,3 +1153,7 @@ export interface STCustomRequestOptions {
     url: string;
     options: STRequestOptions;
 }
+export interface STOnCellResult {
+    rowSpan?: number | null;
+    colSpan?: number | null;
+}

package/st/st.types.d.ts

@@ -1,6 +1,7 @@
 import { TemplateRef } from '@angular/core';
 import { SafeHtml } from '@angular/platform-browser';
-import { STColumn, STColumnButton, STColumnSafeType, STData, STSortMap } from './st.interfaces';
+import type { NgClassType } from 'ng-zorro-antd/core/types';
+import type { STColumn, STColumnButton, STColumnSafeType, STData, STIcon, STOnCellResult, STSortMap } from './st.interfaces';
 /**
  * @inner
  */
@@ -55,6 +56,11 @@ export interface _STHeader {
  */
 export interface _STColumnButton<T extends STData = any> extends STColumnButton<T> {
     _text?: string;
+    _className?: NgClassType | null;
+    /**
+     * 图标
+     */
+    _icon?: STIcon | null;
     children?: Array<_STColumnButton<T>>;
 }
 /**
@@ -67,4 +73,5 @@ export interface _STDataValue {
     color?: string;
     safeType: STColumnSafeType;
     buttons?: _STColumnButton[];
+    props?: STOnCellResult | null;
 }

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

@@ -1,4 +1,5 @@
 import { ElementRef, OnInit, Renderer2, TemplateRef } from '@angular/core';
+import type { REP_TYPE } from '@delon/theme';
 import { AlainConfigService } from '@delon/util/config';
 import { BooleanInput, NumberInput } from '@delon/util/decorator';
 import * as i0 from "@angular/core";
@@ -6,8 +7,10 @@ export declare class SVContainerComponent {
     static ngAcceptInputType_gutter: NumberInput;
     static ngAcceptInputType_labelWidth: NumberInput;
     static ngAcceptInputType_col: NumberInput;
+    static ngAcceptInputType_colInCon: NumberInput;
     static ngAcceptInputType_default: BooleanInput;
     static ngAcceptInputType_noColon: BooleanInput;
+    colInCon?: REP_TYPE;
     title?: string | TemplateRef<void>;
     size: 'small' | 'large';
     /** 列表项间距，单位为 `px` */
@@ -20,13 +23,13 @@ export declare class SVContainerComponent {
     noColon: boolean;
     constructor(configSrv: AlainConfigService);
     static ɵfac: i0.ɵɵFactoryDeclaration<SVContainerComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SVContainerComponent, "sv-container, [sv-container]", ["svContainer"], { "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; }; }, {}, never, ["*"], false, never>;
 }
 export declare class SVTitleComponent implements OnInit {
+    private el;
     private parent;
     private ren;
-    private el;
-    constructor(el: ElementRef, parent: SVContainerComponent, ren: Renderer2);
+    constructor(el: ElementRef<HTMLElement>, parent: SVContainerComponent, ren: Renderer2);
     private setClass;
     ngOnInit(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SVTitleComponent, [null, { optional: true; host: true; }, null]>;