@svar-ui/gantt-store 2.2.1 → 2.3.0

package/dist/types/DataStore.d.ts

@@ -129,5 +129,6 @@ export type IDataMethodsConfig = CombineTypes<{
     };
 }, {
     skipProvider?: boolean;
+    [key: string]: any;
 }>;
 export {};

package/dist/types/columns.d.ts

@@ -1,3 +1,3 @@
-import type { GanttColumn } from "./types";
-export declare function normalizeColumns(columns: GanttColumn[]): GanttColumn[];
-export declare const defaultColumns: GanttColumn[];
+import type { IGanttColumn } from "./types";
+export declare function normalizeColumns(columns: IGanttColumn[]): IGanttColumn[];
+export declare const defaultColumns: IGanttColumn[];

package/dist/types/index.d.ts

@@ -9,4 +9,4 @@ export { defaultEditorItems } from "./editorItems";
 export { defaultColumns } from "./columns";
 export { defaultTaskTypes } from "./taskTypes";
 export { normalizeDates } from "./normalizeDates";
-export type { TID, ITask, ILink, IZoomConfig, GanttColumn, TMethodsConfig, } from "./types";
+export type { TID, IApi, ITask, ILink, IConfig, IZoomConfig, IGanttColumn, TMethodsConfig, IGanttTask, } from "./types";

package/dist/types/normalizeDates.d.ts

@@ -1,4 +1,4 @@
-import type { ITask } from "./types";
-export declare function prepareTask(currentTask: Partial<ITask>, task: Partial<ITask>, unit: "day" | "hour"): void;
-export declare function normalizeDates(task: Partial<ITask>, unit: "day" | "hour", edit?: boolean, key?: string): void;
+import type { ITask, TDurationUnit } from "./types";
+export declare function prepareTask(currentTask: Partial<ITask>, task: Partial<ITask>, unit: TDurationUnit): void;
+export declare function normalizeDates(task: Partial<ITask>, unit: TDurationUnit, edit?: boolean, key?: string): void;
 export declare function getFields(isBaseline: boolean): string[];

package/dist/types/scales.d.ts

@@ -1,20 +1,20 @@
-import type { GanttScale, GanttScaleData, IZoomConfig } from "./types";
+import type { IScaleConfig, GanttScaleData, IZoomConfig, TLengthUnit } from "./types";
 import type GanttDataTree from "./GanttDataTree";
-export declare function getMinUnit(scales: GanttScale[]): GanttScale;
+export declare function getMinUnit(scales: IScaleConfig[]): IScaleConfig;
 export declare const units: string[];
 export declare function calcScales(prevStart: Date, prevEnd: Date, autoScale: boolean, minUnit?: string, tasks?: GanttDataTree): {
     _start: Date;
     _end: Date;
 };
-export declare function resetScales(start: Date, end: Date, lengthUnit: string, width: number, height: number, scales: GanttScale[]): GanttScaleData | null;
-export declare function normalizeZoom(zoom: boolean | IZoomConfig, scales: GanttScale[], cellWidth: number): {
+export declare function resetScales(start: Date, end: Date, lengthUnit: TLengthUnit, width: number, height: number, scales: IScaleConfig[]): GanttScaleData | null;
+export declare function normalizeZoom(zoom: boolean | IZoomConfig, scales: IScaleConfig[], cellWidth: number): {
     _zoom: IZoomConfig;
-    scales: GanttScale[];
+    scales: IScaleConfig[];
     cellWidth: number;
 };
-export declare function zoomScale(zoom: IZoomConfig, step: number, level: number, nextUnit: any, lengthUnit: string, scales: GanttScale[], cellWidth: number): {
-    scales: GanttScale[];
+export declare function zoomScale(zoom: IZoomConfig, step: number, level: number, nextUnit: any, lengthUnit: TLengthUnit, scales: IScaleConfig[], cellWidth: number): {
+    scales: IScaleConfig[];
     cellWidth: number;
-    lengthUnit: string;
+    lengthUnit: TLengthUnit;
     zoom: IZoomConfig;
 };

package/dist/types/time.d.ts

@@ -1,4 +1,5 @@
 import { format } from "date-fns";
+import type { GanttScaleUnit } from "./types";
 export declare function getSmallerUnitCount(unit: string, lengthUnit: string, date?: Date): number;
 export declare function isCorrectLengthUnit(minUnit: string, lengthUnit: string): boolean;
 export declare function getDiffer(unit: string): {
@@ -10,7 +11,5 @@ export declare function getAdder(unit: string): {
 export declare function getUnitStart(unit: string, date: Date): Date;
 export declare function getUnitEnd(unit: string, date: Date): Date;
 export declare function isSameUnit(unit: string, a: Date, b: Date): boolean;
-export declare function registerScaleUnit(unit: string, config: {
-    [name: string]: any;
-}): void;
+export declare function registerScaleUnit(unit: string, config: GanttScaleUnit): void;
 export { format };

package/dist/types/types.d.ts

@@ -1,6 +1,8 @@
 import type { IDataMethodsConfig } from "./DataStore";
-import type { DataArray, TID } from "@wx/lib-state";
+import type { DataArray, TID, IEventBus, IPublicWritable, IEventConfig } from "@wx/lib-state";
 import type GanttDataTree from "./GanttDataTree";
+import type DataStore from "./DataStore";
+import type { IApi as ITableApi, IColumn } from "@wx/grid-store";
 export type TMethodsConfig = IDataMethodsConfig;
 export type { GanttDataTree, TID };
 export interface IActionConfig<T = any> {
@@ -8,27 +10,22 @@ export interface IActionConfig<T = any> {
     noSave?: boolean;
 }
 export type TLinkType = "s2s" | "s2e" | "e2s" | "e2e";
-export type TTaskType = "task" | "summary" | "milestone";
-export type TEditorType = "text" | "combo" | "datepicker" | "richselect";
-export interface IColumnEditor {
-    type: TEditorType;
-    config?: {
-        template?: (v: any) => string;
-        cell?: any;
-        options?: any[];
-        buttons?: boolean | string[];
-    };
-}
-export type TEditorHandler = (row?: ITask, column?: any) => TEditorType | IColumnEditor | null;
+export type TTaskType = "task" | "summary" | "milestone" | string;
+export type TLengthUnit = "minute" | "hour" | "day" | "week" | "month" | "quarter" | "year" | string;
+export type TDurationUnit = "day" | "hour";
 export interface ILink {
-    id: TID;
+    id?: TID;
     type: TLinkType;
     source: TID;
     target: TID;
 }
+export interface IGanttLink extends ILink {
+    id: TID;
+    $p: string;
+}
 export interface ITask {
     start?: Date;
-    id: TID;
+    id?: TID;
     end?: Date;
     duration?: number;
     data?: ITask[];
@@ -45,10 +42,20 @@ export interface ITask {
     [key: string]: any;
 }
 export interface IParsedTask extends ITask {
-    parent: TID;
-    data: IParsedTask[];
+    id: TID;
+    parent?: TID;
+    data?: IParsedTask[];
     $level: number;
 }
+export interface IGanttTask extends IParsedTask {
+    $x: number;
+    $y: number;
+    $h: number;
+    $w: number;
+    $x_base?: number;
+    $w_base?: number;
+    $reorder?: boolean;
+}
 export type TDispatch = <A extends keyof TMethodsConfig>(action: A, data: TMethodsConfig[A]) => void;
 export interface IMethodsHash {
     [key: string]: any;
@@ -64,7 +71,7 @@ export interface IVisibleArea {
     end: number;
 }
 export interface IZoomConfig {
-    level: number;
+    level?: number;
     minCellWidth?: number;
     maxCellWidth?: number;
     levels?: Array<IScaleLevel>;
@@ -72,7 +79,7 @@ export interface IZoomConfig {
 export interface IScaleLevel {
     minCellWidth: number;
     maxCellWidth: number;
-    scales: GanttScale[];
+    scales: IScaleConfig[];
 }
 export interface IMarker {
     start: Date;
@@ -80,77 +87,57 @@ export interface IMarker {
     css?: string;
     left?: number;
 }
-export interface IDataConfig {
+export interface IConfig {
+    tasks?: ITask[];
+    links?: any[];
+    taskTypes?: ITaskType[];
     selected?: TID[];
     activeTask?: TID;
-    tasks: ITask[];
-    links: ILink[];
-    start: Date;
-    end: Date;
-    lengthUnit: string;
-    cellWidth: number;
-    cellHeight: number;
-    scaleHeight: number;
-    scales: any[];
-    columns: GanttColumn[];
+    scales?: IScaleConfig[];
+    columns?: IGanttColumn[];
+    start?: Date;
+    end?: Date;
+    lengthUnit?: TLengthUnit;
+    durationUnit?: TDurationUnit;
+    cellWidth?: number;
+    cellHeight?: number;
+    scaleHeight?: number;
+    zoom?: boolean | IZoomConfig;
+    autoScale?: boolean;
+}
+export interface IProConfig extends IConfig {
+    unscheduledTasks?: boolean;
+    baselines?: boolean;
+    markers?: IMarker[];
+}
+export interface IDataConfig extends IProConfig {
     scrollLeft: number;
     scrollTop: number;
     area: IVisibleArea;
-    taskTypes?: ITaskType[];
-    baselines?: boolean;
-    zoom: boolean | IZoomConfig;
-    highlightTime?: (date: Date, unit: "day" | "hour") => string;
     _cellWidth?: number;
     _sort?: TSort[];
-    autoScale?: boolean;
-    unscheduledTasks?: boolean;
-    markers?: IMarker[];
-    durationUnit: "day" | "hour";
     _scrollTask?: TScrollTask;
 }
-export interface IData {
-    selected: TID[];
-    _selected: ITask[];
-    activeTask: TID;
-    _activeTask: ITask;
+export interface IData extends Omit<IDataConfig, "tasks" | "links"> {
+    zoom?: IZoomConfig;
     tasks: GanttDataTree;
-    _tasks: IParsedTask[];
     links: DataArray<ILink>;
+    _tasks: IParsedTask[];
     _links: IGanttLink[];
-    start: Date;
-    _start: Date;
-    end: Date;
-    _end: Date;
-    lengthUnit: string;
-    cellWidth: number;
-    cellHeight: number;
-    scaleHeight: number;
-    scales: GanttScale[];
-    _scales: GanttScaleData;
-    columns: GanttColumn[];
-    scrollTop: number;
-    scrollLeft: number;
-    area: IVisibleArea;
-    taskTypes?: ITaskType[];
-    baselines?: boolean;
-    zoom: IZoomConfig;
-    highlightTime?: (date: Date, unit: "day" | "hour") => string;
-    _cellWidth?: number;
-    _sort?: TSort[];
+    _selected?: ITask[];
+    _activeTask?: ITask;
+    _start?: Date;
+    _end?: Date;
+    _scales?: GanttScaleData;
+    _markers?: IMarker[];
     _scaleDate?: Date;
     _zoomOffset?: number;
-    autoScale?: boolean;
-    markers?: IMarker[];
-    _markers?: IMarker[];
-    unscheduledTasks?: boolean;
-    durationUnit: "day" | "hour";
-    _scrollTask?: TScrollTask;
 }
 export interface DataHash {
     [key: string]: any;
 }
-export type GanttScale = {
-    unit: string;
+export type IScaleConfig = {
+    unit: TLengthUnit;
     step: number;
     format?: {
         (date: Date, next?: Date): string;
@@ -175,49 +162,39 @@ export type GanttScaleData = {
     height: number;
     start: Date;
     end: Date;
-    lengthUnit: string;
+    lengthUnit: TLengthUnit;
     minUnit: string;
     lengthUnitWidth: number;
     diff: {
-        (a: Date, b: Date, lengthUnit?: string, unitSize?: boolean): number;
+        (a: Date, b: Date, lengthUnit?: TLengthUnit, unitSize?: boolean): number;
     };
 };
-export type GanttColumn = {
+export type GanttScaleUnit = {
+    start: (date: Date) => Date;
+    end: (date: Date) => Date;
+    isSame: (date1: Date, date2: Date) => boolean;
+    add: (date: Date, num: number) => Date;
+    diff?: (date1: Date, date2: Date) => number;
+    smallerCount?: {
+        [key: TLengthUnit]: number | ((date: Date) => number);
+    };
+    biggerCount?: {
+        [key: TLengthUnit]: number | ((date: Date) => number);
+    };
+};
+export type IGanttColumn = {
     width?: number;
     align?: "left" | "right" | "center";
     flexgrow?: number;
     resize?: boolean;
-    header: string | {
-        cell?: string;
-        css?: string;
-        text: string;
-    };
-    id: string;
-    action?: string;
-    template?: {
-        (b: any, row: any): string;
-    };
+    header?: IColumn["header"];
+    id?: string;
+    template?: IColumn["template"];
     sort?: boolean;
     cell?: any;
-    editor?: TEditorType | IColumnEditor | TEditorHandler;
-    options?: DataHash[];
+    editor?: IColumn["editor"];
+    options?: IColumn["options"];
 };
-export interface IGanttTask extends IParsedTask {
-    end: Date;
-    duration: number;
-    unscheduled?: boolean;
-    $x: number;
-    $y: number;
-    $h: number;
-    $w: number;
-    $x_base?: number;
-    $w_base?: number;
-    $reorder?: boolean;
-}
-export interface IGanttLink extends ILink {
-    id: TID;
-    $p: string;
-}
 export type TCommonShape = {
     id?: TID;
     key: string;
@@ -273,3 +250,20 @@ export type TScrollTask = {
     id: TID;
     mode?: "x" | "y" | "xy" | boolean;
 };
+export interface IApi {
+    exec: <A extends keyof TMethodsConfig | (string & {})>(action: A, params?: A extends keyof TMethodsConfig ? TMethodsConfig[A] : any) => Promise<any>;
+    on: <A extends keyof TMethodsConfig | (string & {})>(action: A, callback: (config: A extends keyof TMethodsConfig ? TMethodsConfig[A] : any) => any, config?: IEventConfig) => void;
+    intercept: <A extends keyof TMethodsConfig | (string & {})>(action: A, callback: (config: A extends keyof TMethodsConfig ? TMethodsConfig[A] : any) => any, config?: IEventConfig) => void;
+    detach: (tag: IEventConfig["tag"]) => void;
+    getState: () => IData;
+    getReactiveState: () => {
+        [Key in keyof IData]: IPublicWritable<IData[Key]>;
+    };
+    setNext: (ev: IEventBus<TMethodsConfig>) => void;
+    getStores: () => {
+        data: DataStore;
+    };
+    getTable: (waitRender?: boolean) => Promise<ITableApi> | ITableApi;
+    getTask: (id: TID) => ITask;
+    serialize: () => ITask[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@svar-ui/gantt-store",
-	"version": "2.2.1",
+	"version": "2.3.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"module": "dist/index.js",