dhx-chart 8.3.10 → 8.3.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/codebase/chart.min.css +1 -1
- package/codebase/chart.min.js +3 -3
- package/codebase/chart.min.js.map +1 -1
- package/codebase/types/ts-grid/sources/Grid.d.ts +1 -1
- package/codebase/types/ts-grid/sources/helpers/data.d.ts +1 -0
- package/codebase/types/ts-grid/sources/types.d.ts +3 -2
- package/codebase/types/ts-grid/sources/ui/Cells.d.ts +3 -4
- package/package.json +1 -1
- package/readme.txt +1 -1
- package/whatsnew.txt +6 -0
|
@@ -79,6 +79,7 @@ export declare class Grid extends View implements IGrid {
|
|
|
79
79
|
};
|
|
80
80
|
protected _normalizeDataType(): void;
|
|
81
81
|
protected _applyLocalFilter(beforePrepareData?: boolean): void;
|
|
82
|
+
protected _normalizeSpans(): void;
|
|
82
83
|
private _canDataParse;
|
|
83
84
|
private _init;
|
|
84
85
|
private _attachDataCollection;
|
|
@@ -90,7 +91,6 @@ export declare class Grid extends View implements IGrid {
|
|
|
90
91
|
private _render;
|
|
91
92
|
private _initHotKey;
|
|
92
93
|
private _normalizeConfig;
|
|
93
|
-
private _normalizeSpans;
|
|
94
94
|
private _autoScroll;
|
|
95
95
|
private _applyAutoWidth;
|
|
96
96
|
}
|
|
@@ -26,3 +26,4 @@ export declare const getMaxColsWidth: (rows: IRow[], cols: ICol[], config?: ICon
|
|
|
26
26
|
export declare function toFormat(value: any, type?: colType, format?: string): any;
|
|
27
27
|
export declare function getEditorOptions(col: ICol, row?: IRow): TOption[];
|
|
28
28
|
export declare function getValueForNumberColumn(col: ICol, value: any): any;
|
|
29
|
+
export declare function getEditorValue(value: any, options: TOption[]): any;
|
|
@@ -107,6 +107,7 @@ interface IFixedRows {
|
|
|
107
107
|
top: IRow[];
|
|
108
108
|
bottom: IRow[];
|
|
109
109
|
}
|
|
110
|
+
type RenderFrom = "leftFixedCols" | "rightFixedCols" | "topFixedRows" | "bottomFixedRows" | "render";
|
|
110
111
|
export interface IRendererConfig extends Required<IGridConfig> {
|
|
111
112
|
scroll?: IScrollState;
|
|
112
113
|
datacollection: any;
|
|
@@ -126,7 +127,7 @@ export interface IRendererConfig extends Required<IGridConfig> {
|
|
|
126
127
|
filterLocation?: string;
|
|
127
128
|
content?: IContentList;
|
|
128
129
|
gridId?: string;
|
|
129
|
-
$renderFrom?:
|
|
130
|
+
$renderFrom?: RenderFrom;
|
|
130
131
|
_events?: IEventSystem<GridSystemEvents>;
|
|
131
132
|
}
|
|
132
133
|
export interface ISortingState {
|
|
@@ -307,9 +308,9 @@ export interface ISpan {
|
|
|
307
308
|
css?: string;
|
|
308
309
|
tooltip?: boolean;
|
|
309
310
|
tooltipTemplate?: (spanValue: any, span: ISpan) => string;
|
|
310
|
-
$type?: colType;
|
|
311
311
|
$rowsVisibility?: number[];
|
|
312
312
|
$colsVisibility?: number[];
|
|
313
|
+
$renderFrom?: RenderFrom[];
|
|
313
314
|
}
|
|
314
315
|
export interface IComboFilterConfig {
|
|
315
316
|
data?: DataCollection<any> | any[];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { GridEvents, GridSystemEvents, ICol, ICoords, IGridConfig, IRendererConfig, ISpan, Split } from "../types";
|
|
2
|
-
import { IDataCollection
|
|
2
|
+
import { IDataCollection } from "../../../ts-data";
|
|
3
3
|
type mouseEvents = GridEvents.cellClick | GridEvents.cellMouseOver | GridEvents.cellMouseDown | GridEvents.cellDblClick | GridEvents.cellRightClick;
|
|
4
4
|
type touchEvents = GridSystemEvents.cellTouchEnd | GridSystemEvents.cellTouchMove;
|
|
5
5
|
declare function handleMouse(rowStart: number, colStart: number, conf: IRendererConfig, type: mouseEvents & touchEvents, e: any): void;
|
|
@@ -17,9 +17,8 @@ export declare function getTreeCell(content: any, row: any, col: ICol, conf: IRe
|
|
|
17
17
|
export declare function getCells(conf: IRendererConfig): any[];
|
|
18
18
|
export declare function getSpans(config: IRendererConfig, mode?: Split): any[];
|
|
19
19
|
export declare function getShifts(conf: IRendererConfig): ICoords;
|
|
20
|
-
export declare function normalizeSpan(span: ISpan, config: IGridConfig, data: IDataCollection
|
|
21
|
-
$renderFrom:
|
|
22
|
-
$type: any;
|
|
20
|
+
export declare function normalizeSpan(span: ISpan, config: IGridConfig, data: IDataCollection): {
|
|
21
|
+
$renderFrom: any[];
|
|
23
22
|
$rowsVisibility: number[];
|
|
24
23
|
$colsVisibility: number[];
|
|
25
24
|
row: import("../../../ts-common/types").Id;
|
package/package.json
CHANGED
package/readme.txt
CHANGED