r3ui-lib 1.3.10 → 1.3.12

package/dist/types/types/tableInjectKeys.d.ts

@@ -1,28 +1,30 @@
-import type { ComputedRef, InjectionKey, Ref } from 'vue';
+import type { ComputedRef, InjectionKey, Ref } from "vue";
+import type { TableColumnDefinition, TableColumnOptions, TableFilterApplyOperation } from "./table";
+import type { R3uiTableInstance } from "./tableInstance";
 /** Typed API фильтров и таблицы из useTableDefault */
 export type R3uiTableDefaultApi = {
     filterModalVisibility: Ref<boolean>;
     selectedFilterTitles: Readonly<Record<string, string>> | Ref<Record<string, string>>;
     setFilterParamsStrings: (key: string, value: unknown) => void;
-    applyFilters: (table?: unknown) => void | Promise<void>;
+    applyFilters: (table?: unknown, operation?: TableFilterApplyOperation) => void | Promise<void>;
     resetFilters: () => void | Promise<void>;
     tableFilters: Ref<Record<string, unknown>>;
-    table: Ref<unknown>;
+    table: Ref<R3uiTableInstance | null>;
 };
 export declare const r3uiTableDefaultApiKey: InjectionKey<R3uiTableDefaultApi>;
-export declare const setFilterParamsStringsKey: InjectionKey<R3uiTableDefaultApi['setFilterParamsStrings']>;
-export declare const selectedFilterTitlesKey: InjectionKey<R3uiTableDefaultApi['selectedFilterTitles']>;
-export declare const tableFiltersRefKey: InjectionKey<R3uiTableDefaultApi['tableFilters']>;
-export declare const filterModalVisibilityKey: InjectionKey<R3uiTableDefaultApi['filterModalVisibility']>;
-export declare const resetFiltersKey: InjectionKey<R3uiTableDefaultApi['resetFilters']>;
-export declare const applyFiltersKey: InjectionKey<R3uiTableDefaultApi['applyFilters']>;
+export declare const setFilterParamsStringsKey: InjectionKey<R3uiTableDefaultApi["setFilterParamsStrings"]>;
+export declare const selectedFilterTitlesKey: InjectionKey<R3uiTableDefaultApi["selectedFilterTitles"]>;
+export declare const tableFiltersRefKey: InjectionKey<R3uiTableDefaultApi["tableFilters"]>;
+export declare const filterModalVisibilityKey: InjectionKey<R3uiTableDefaultApi["filterModalVisibility"]>;
+export declare const resetFiltersKey: InjectionKey<R3uiTableDefaultApi["resetFilters"]>;
+export declare const applyFiltersKey: InjectionKey<R3uiTableDefaultApi["applyFilters"]>;
 export declare const editTableColumnsModalVisibilityKey: InjectionKey<Ref<boolean>>;
-export declare const tableOptionsKey: InjectionKey<Ref<Record<string, unknown>>>;
+export declare const tableOptionsKey: InjectionKey<Ref<TableColumnOptions>>;
 export declare const editTableColumnVisibilityKey: InjectionKey<(event: Event, code: string) => void | Promise<void>>;
 export declare const isTableCoumnsHiddenKey: InjectionKey<ComputedRef<boolean>>;
 export declare const unselectAllTableColumnCheckboxesKey: InjectionKey<() => void | Promise<void>>;
 export declare const selectAllTableColumnCheckboxesKey: InjectionKey<() => void | Promise<void>>;
-export declare const handleColumnsChangedKey: InjectionKey<(columns: unknown[]) => void>;
+export declare const handleColumnsChangedKey: InjectionKey<(columns: readonly TableColumnDefinition[]) => void>;
 export declare const handleColumnsApplyKey: InjectionKey<() => void>;
-export declare const tableRefKey: InjectionKey<Ref<unknown>>;
+export declare const tableRefKey: InjectionKey<Ref<R3uiTableInstance | null>>;
 //# sourceMappingURL=tableInjectKeys.d.ts.map

package/dist/types/types/tableInjectKeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableInjectKeys.d.ts","sourceRoot":"","sources":["../../../src/types/tableInjectKeys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1D,sDAAsD;AACtD,MAAM,MAAM,mBAAmB,GAAG;IAChC,qBAAqB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrF,sBAAsB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9D,YAAY,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,YAAY,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,mBAAmB,CACtC,CAAC;AAEhC,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAClD,mBAAmB,CAAC,wBAAwB,CAAC,CACX,CAAC;AAErC,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAChD,mBAAmB,CAAC,sBAAsB,CAAC,CACX,CAAC;AAEnC,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,CACzD,CAAC;AAEzB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CACjD,mBAAmB,CAAC,uBAAuB,CAAC,CACX,CAAC;AAEpC,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,CACtD,CAAC;AAEzB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,CACtD,CAAC;AAEzB,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAC/B,CAAC;AAE5C,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAC/C,CAAC;AAEzB,eAAO,MAAM,4BAA4B,EAAE,YAAY,CACrD,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CACf,CAAC;AAExC,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CACvC,CAAC;AAEhC,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAC5D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CACkB,CAAC;AAE/C,eAAO,MAAM,iCAAiC,EAAE,YAAY,CAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CACgB,CAAC;AAE7C,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,CAC/C,CAAC;AAEjC,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,MAAM,IAAI,CAC7B,CAAC;AAE/B,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAmB,CAAC"}
+{"version":3,"file":"tableInjectKeys.d.ts","sourceRoot":"","sources":["../../../src/types/tableInjectKeys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAClB,yBAAyB,EAC1B,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,sDAAsD;AACtD,MAAM,MAAM,mBAAmB,GAAG;IAChC,qBAAqB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,oBAAoB,EAChB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAChC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChC,sBAAsB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9D,YAAY,EAAE,CACZ,KAAK,CAAC,EAAE,OAAO,EACf,SAAS,CAAC,EAAE,yBAAyB,KAClC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,YAAY,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,KAAK,EAAE,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,mBAAmB,CAEpE,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAClD,mBAAmB,CAAC,wBAAwB,CAAC,CACX,CAAC;AAErC,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAChD,mBAAmB,CAAC,sBAAsB,CAAC,CACX,CAAC;AAEnC,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAC3C,mBAAmB,CAAC,cAAc,CAAC,CACX,CAAC;AAE3B,eAAO,MAAM,wBAAwB,EAAE,YAAY,CACjD,mBAAmB,CAAC,uBAAuB,CAAC,CACX,CAAC;AAEpC,eAAO,MAAM,eAAe,EAAE,YAAY,CACxC,mBAAmB,CAAC,cAAc,CAAC,CACX,CAAC;AAE3B,eAAO,MAAM,eAAe,EAAE,YAAY,CACxC,mBAAmB,CAAC,cAAc,CAAC,CACX,CAAC;AAE3B,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAC/B,CAAC;AAE5C,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAC1C,CAAC;AAEzB,eAAO,MAAM,4BAA4B,EAAE,YAAY,CACrD,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CACf,CAAC;AAExC,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CACvC,CAAC;AAEhC,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAC5D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CACkB,CAAC;AAE/C,eAAO,MAAM,iCAAiC,EAAE,YAAY,CAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CACgB,CAAC;AAE7C,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAChD,CAAC,OAAO,EAAE,SAAS,qBAAqB,EAAE,KAAK,IAAI,CACnB,CAAC;AAEnC,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,MAAM,IAAI,CAC7B,CAAC;AAE/B,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CACnD,CAAC"}

package/dist/types/types/tableInstance.d.ts

@@ -0,0 +1,10 @@
+import type { Tabulator } from "tabulator-tables";
+/** Сигнатуры возможностей таблицы сохраняют контракт установленного Tabulator. */
+export interface R3uiTableInstance extends Pick<Tabulator, "setColumns" | "setHeaderFilterValue" | "setSort" | "getPage" | "getPageSize" | "getHeaderFilters" | "getSorters" | "getColumnLayout" | "replaceData" | "setPage">, Partial<Pick<Tabulator, "getSelectedData" | "selectRow" | "deselectRow" | "hideColumn" | "showColumn">> {
+    options: {
+        ajaxURL?: string;
+        columns?: unknown;
+    };
+}
+export declare function assertR3uiTableInstance(value: unknown): asserts value is R3uiTableInstance;
+//# sourceMappingURL=tableInstance.d.ts.map

package/dist/types/types/tableInstance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableInstance.d.ts","sourceRoot":"","sources":["../../../src/types/tableInstance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,kFAAkF;AAClF,MAAM,WAAW,iBACf,SAAQ,IAAI,CACR,SAAS,EACP,YAAY,GACZ,sBAAsB,GACtB,SAAS,GACT,SAAS,GACT,aAAa,GACb,kBAAkB,GAClB,YAAY,GACZ,iBAAiB,GACjB,aAAa,GACb,SAAS,CACZ,EACD,OAAO,CACL,IAAI,CACF,SAAS,EACP,iBAAiB,GACjB,WAAW,GACX,aAAa,GACb,YAAY,GACZ,YAAY,CACf,CACF;IACH,OAAO,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAClD;AAsBD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,KAAK,IAAI,iBAAiB,CAepC"}

package/dist/types/utils/tableAdapter.d.ts

@@ -1,22 +1,78 @@
+import type { TableOperation } from "./tableOperation";
+import type { TableColumnDefinition, TableColumn } from "../types/table";
+import type { R3uiTableInstance } from "../types/tableInstance";
 export interface TableColumnLayout {
     field: string;
     width?: number;
     visible?: boolean;
 }
-export interface RestorableTable {
+/** Редактор получает подготовленные копии; колонки без field остаются только в таблице. */
+export declare function toTableEditorColumns(columns: readonly TableColumnDefinition[]): TableColumn[];
+/** Layout снимка содержит только колонки с устойчивым ключом и фактической шириной. */
+export type TableSnapshotLayoutInput = {
+    title?: string;
+    field?: string;
+    width?: number | string | null;
+    visible?: boolean;
+};
+export interface TableSnapshotSource {
     getPage(): number | false;
-    replaceData(url: string, params: Record<string, unknown>): Promise<unknown>;
-    setPage(page: number): Promise<unknown>;
+    getPageSize(): number | true;
+    getHeaderFilters(): readonly {
+        field: string;
+        value: unknown;
+    }[];
+    getSorters(): readonly {
+        field: string;
+        dir: "asc" | "desc";
+    }[];
+    getColumnLayout(): readonly TableSnapshotLayoutInput[];
+    getSelectedData?(): readonly {
+        id?: string | number;
+    }[];
 }
+export type TableSnapshot = {
+    page: number;
+    size: number;
+    filters: Array<{
+        field: string;
+        value: unknown;
+    }>;
+    sort: Array<{
+        column: string;
+        dir: "asc" | "desc";
+    }>;
+    layout: TableColumnLayout[];
+    selected: Array<string | number>;
+};
+export declare function normalizeTableColumnLayout(layout: readonly TableSnapshotLayoutInput[]): TableColumnLayout[];
+export declare function captureTableSnapshot(instance: TableSnapshotSource, { resetContext, resetPage, includeSelection, layout, }?: {
+    resetContext?: boolean;
+    resetPage?: boolean;
+    includeSelection?: boolean;
+    layout?: readonly TableSnapshotLayoutInput[];
+}): TableSnapshot;
+export type RestorableTable = Pick<R3uiTableInstance, "getPage" | "replaceData" | "setPage">;
 export interface TableRestoreOperation {
+    readonly signal?: AbortSignal;
+    readonly owner?: TableOperation;
     isCurrent(): boolean;
     beforeRequest(): void;
 }
 export declare function mergeColumnLayout<Column extends {
-    field: string;
+    field?: string;
     width?: number | string;
     visible?: boolean;
 }>(columns: readonly Column[], layout?: readonly TableColumnLayout[]): Column[];
+/** Флажки черновика перекрывают видимость layout, сохраняя его порядок и ширину. */
+export declare function applyColumnVisibility<Column extends {
+    field?: string;
+    width?: number | string;
+    visible?: boolean;
+}>(columns: readonly Column[], draft: readonly {
+    field: string;
+    visible: boolean;
+}[], layout?: readonly TableSnapshotLayoutInput[]): Column[];
 /** Владелец может отменить только свой снимок; поздний finally не затрагивает новую операцию. */
 export declare function createSnapshotOwner<State>(getPending: () => State | undefined, clearPending: () => void): {
     track(state: State, isSameContext: () => boolean, operation: {
@@ -28,4 +84,8 @@ export declare function restoreTableData(instance: RestorableTable, state: {
     page: number;
     size: number;
 }, url: string, operation: TableRestoreOperation): Promise<"restored" | "superseded" | "cancelled">;
+/** Новый результат операции; строковый контракт restoreTableData сохранён для существующих адаптеров. */
+export declare function restoreTableOperationData(...args: Parameters<typeof restoreTableData>): Promise<{
+    status: "applied" | "cancelled" | "superseded";
+}>;
 //# sourceMappingURL=tableAdapter.d.ts.map

package/dist/types/utils/tableAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableAdapter.d.ts","sourceRoot":"","sources":["../../../src/utils/tableAdapter.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,IAAI,MAAM,GAAG,KAAK,CAAC;IAC1B,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,IAAI,OAAO,CAAC;IACrB,aAAa,IAAI,IAAI,CAAC;CACvB;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,SAAS;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,EAE5E,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,GAAE,SAAS,iBAAiB,EAAO,GACxC,MAAM,EAAE,CAqBV;AAED,iGAAiG;AACjG,wBAAgB,mBAAmB,CAAC,KAAK,EACvC,UAAU,EAAE,MAAM,KAAK,GAAG,SAAS,EACnC,YAAY,EAAE,MAAM,IAAI;iBAUb,KAAK,iBACG,MAAM,OAAO;+BANM,MAAM,OAAO;;;EAyBpD;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,UAAU,GAAG,YAAY,GAAG,WAAW,CAAC,CAqBlD"}
+{"version":3,"file":"tableAdapter.d.ts","sourceRoot":"","sources":["../../../src/utils/tableAdapter.ts"],"names":[],"mappings":"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"}

package/dist/types/utils/tableCancellation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableCancellation.d.ts","sourceRoot":"","sources":["../../../src/utils/tableCancellation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGhD,KAAK,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;AACvD,KAAK,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;AAExD,sFAAsF;AACtF,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,OAAO,EACvB,WAAW,EAAE,MAAM,IAAI;;4BAuBQ,WAAW,KAAG,WAAW;6BAyB7B,OAAO;gCAOJ,MAAM,UAAU,MAAM;EAKrD;AAgBD,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE;IACV,iBAAiB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAC/C,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/D,GACA,IAAI,CAgCN"}
+{"version":3,"file":"tableCancellation.d.ts","sourceRoot":"","sources":["../../../src/utils/tableCancellation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAShD,KAAK,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;AACvD,KAAK,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;AAExD,sFAAsF;AACtF,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,OAAO,EACvB,WAAW,EAAE,MAAM,IAAI;;4BAuBQ,WAAW,KAAG,WAAW;6BAyB7B,OAAO;gCAOJ,MAAM,UAAU,MAAM;EAKrD;AAgBD,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE;IACV,iBAAiB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAC/C,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/D,GACA,IAAI,CAgCN"}

package/dist/types/utils/tableColumnStorage.d.ts

@@ -0,0 +1,16 @@
+export interface StoredTableColumnLayout {
+    field: string;
+    width?: number | string;
+    minWidth?: number | string;
+    visible?: boolean;
+}
+/** Читает старые определения и новые layout, оставляя только сохраняемые примитивы. */
+export declare function normalizeStoredColumnLayout(value: unknown): StoredTableColumnLayout[];
+/** Заголовки, callbacks и служебные колонки всегда берутся из актуальных определений. */
+export declare function restoreStoredTableColumns<Column extends {
+    field?: string;
+    width?: number | string;
+    minWidth?: number | string;
+    visible?: boolean;
+}>(columns: readonly Column[], value: unknown): Column[];
+//# sourceMappingURL=tableColumnStorage.d.ts.map

package/dist/types/utils/tableColumnStorage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableColumnStorage.d.ts","sourceRoot":"","sources":["../../../src/utils/tableColumnStorage.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAuBD,uFAAuF;AACvF,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,OAAO,GACb,uBAAuB,EAAE,CA6B3B;AAED,yFAAyF;AACzF,wBAAgB,yBAAyB,CACvC,MAAM,SAAS;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,EACD,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAgBtD"}

package/dist/types/utils/tableLoad.d.ts

@@ -1,20 +1,26 @@
+import { type TableOperation } from "./tableOperation";
 export type TableLoadOutcome = {
     status: "applied" | "cancelled" | "superseded";
 } | {
     status: "failed";
     error: unknown;
 };
+/** Граница одной загрузки; транспорт подписывается, движок публикует итог после применения. */
+export declare function createTableLoadBoundary(): {
+    subscribe(listener: (result: TableLoadOutcome) => void): void;
+    finish(result: TableLoadOutcome): void;
+};
+export type TableLoadBoundary = ReturnType<typeof createTableLoadBoundary>;
+export declare function getTableLoadBoundary(table: object | null | undefined): {
+    subscribe(listener: (result: TableLoadOutcome) => void): void;
+    finish(result: TableLoadOutcome): void;
+} | undefined;
+export declare function withTableLoadBoundary<T>(table: object, boundary: TableLoadBoundary, action: () => T): T;
 type Load = () => Promise<unknown>;
 type Tracker = (load: Load) => Promise<TableLoadOutcome>;
+export declare function getTableRequestOperation(table: object | null | undefined): TableOperation<unknown> | undefined;
 /** Регистрация принадлежит экземпляру Table, включая его Vue proxy. */
 export declare function registerTableLoadTracker(table: object, tracker: Tracker): void;
-export declare function trackTableLoad(table: object, load: Load): Promise<{
-    status: "applied" | "cancelled" | "superseded";
-} | {
-    status: "failed";
-    error: unknown;
-} | {
-    readonly status: "applied";
-}>;
+export declare function trackTableLoad(table: object, load: Load, signal?: AbortSignal, operation?: TableOperation): Promise<TableLoadOutcome>;
 export {};
 //# sourceMappingURL=tableLoad.d.ts.map

package/dist/types/utils/tableLoad.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableLoad.d.ts","sourceRoot":"","sources":["../../../src/utils/tableLoad.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GACxB;IAAE,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,YAAY,CAAA;CAAE,GAClD;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzC,KAAK,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,KAAK,OAAO,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAGzD,uEAAuE;AACvE,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,QAEvE;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI;YAZhD,SAAS,GAAG,WAAW,GAAG,YAAY;;YACtC,QAAQ;WAAS,OAAO;;;GAiBrC"}
+{"version":3,"file":"tableLoad.d.ts","sourceRoot":"","sources":["../../../src/utils/tableLoad.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE9E,MAAM,MAAM,gBAAgB,GACxB;IAAE,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,YAAY,CAAA;CAAE,GAClD;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzC,+FAA+F;AAC/F,wBAAgB,uBAAuB;wBAIf,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI;mBAIvC,gBAAgB;EAQlC;AACD,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE3E,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;wBAf7C,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI;mBAIvC,gBAAgB;cAalC;AACD,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,iBAAiB,EAC3B,MAAM,EAAE,MAAM,CAAC,GACd,CAAC,CAUH;AAED,KAAK,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,KAAK,OAAO,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAGzD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,uCAExE;AAGD,uEAAuE;AACvE,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,QAEvE;AAED,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,IAAI,EACV,MAAM,CAAC,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,cAAc,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAwB3B"}

package/dist/types/utils/tableOperation.d.ts

@@ -0,0 +1,43 @@
+/** Общая граница актуальности, совместимая с прежними обработчиками таблицы. */
+export interface TableOperationGuard {
+    readonly signal: AbortSignal;
+    isCurrent(): boolean;
+}
+export type TableOperationKind = "filters" | "columns" | "restore" | "request";
+export type TableOperationResult = {
+    status: "applied" | "cancelled" | "superseded";
+};
+export interface TableOperation<Context = unknown> extends TableOperationGuard {
+    readonly id: number;
+    readonly parentId?: number;
+    readonly kind: TableOperationKind;
+    readonly generation: number;
+    readonly revision: number;
+    readonly context?: Context;
+}
+/** Сигналы связываются явно; dispose снимает подписки, не отменяя уже принятый ответ. */
+export declare function createTableOperation<Context = unknown>(options: {
+    kind: TableOperationKind;
+    generation: number;
+    revision: number;
+    context?: Context;
+    parent?: TableOperation;
+    signal?: AbortSignal | null;
+    signals?: readonly (AbortSignal | undefined)[];
+    isCurrent(): boolean;
+}): {
+    operation: TableOperation<Context>;
+    abort: (reason?: "cancelled" | "superseded") => void;
+    dispose: () => void;
+};
+export declare function tableOperationStopped(operation: TableOperationGuard): {
+    status: "cancelled" | "superseded";
+};
+/** Поздние resolve/reject обработаны даже после отмены; action не запускается для устаревшего владельца. */
+export declare function waitForTableOperation<T>(action: () => T | PromiseLike<T>, operation: TableOperationGuard): Promise<{
+    status: "applied";
+    value: T;
+} | {
+    status: "cancelled" | "superseded";
+}>;
+//# sourceMappingURL=tableOperation.d.ts.map

package/dist/types/utils/tableOperation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableOperation.d.ts","sourceRoot":"","sources":["../../../src/utils/tableOperation.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,SAAS,IAAI,OAAO,CAAC;CACtB;AACD,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAC/E,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,YAAY,CAAC;CAChD,CAAC;AACF,MAAM,WAAW,cAAc,CAAC,OAAO,GAAG,OAAO,CAAE,SAAQ,mBAAmB;IAC5E,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAGD,yFAAyF;AACzF,wBAAgB,oBAAoB,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE;IAC/D,IAAI,EAAE,kBAAkB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IAC/C,SAAS,IAAI,OAAO,CAAC;CACtB;;qBAGwB,WAAW,GAAG,YAAY;;EAoClD;AACD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,mBAAmB,GAAG;IACrE,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;CACpC,CAOA;AAED,4GAA4G;AAC5G,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,EAChC,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CACR;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,WAAW,GAAG,YAAY,CAAA;CAAE,CACzE,CAmCA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "r3ui-lib",
   "private": false,
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "Modern Vue 3 UI component library with TypeScript support",
   "keywords": [
     "vue",