mdt-client 1.0.32 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mdt-client",
-	"version": "1.0.32",
+	"version": "1.2.0",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -12,7 +12,8 @@
 		"build": "tsc",
 		"types-update": "tsc --project tsconfig.facade-types.json",
 		"update": "tsc --project tsconfig.facade-types.json && tsc",
-		"pub": "npm version patch && npm publish"
+		"pub-patch": "npm version patch && npm publish",
+		"pub-minor": "npm version minor && npm publish"
 	},
 	"repository": {
 		"type": "git",
@@ -22,5 +23,8 @@
 	"license": "ISC",
 	"devDependencies": {
 		"typescript": "^4.2.3"
+	},
+	"dependencies": {
+		"@types/mithril": "^0.0.27"
 	}
 }

package/types/common/Datasource.d.ts

@@ -3,7 +3,7 @@ import { Query } from "../services/api/Query";
 import { ApiRequestOptions } from "../services/api/ApiRequestOptions";
 export interface Datasource {
     fetch(query: Query, table: Table, options?: ApiRequestOptions, batch?: boolean): any;
-    save?(data: any, params?: any, options?: ApiRequestOptions): any;
+    save?(data: any, params?: any, options?: ApiRequestOptions): PromiseLike<any>;
     delete?(ids: any[], table: Table): any;
     table?: Table;
 }

package/types/common/Field.d.ts

@@ -1,8 +1,9 @@
+import { FieldCode } from "mdtScripts/helpers/types";
 import { Record } from "./Record";
 import { Table } from "./Table";
 export interface Field extends Record {
     id?: any;
-    code?: string;
+    code?: FieldCode;
     title?: string;
     type?: string;
     codeLowered?: string;

package/types/components/baseFormControls/input/inputView.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import "./inputView.less";
 import { ComponentSize } from "mdtScripts/helpers/utils/stringifyControlSize";
 import { KeyboardActions } from "mdtScripts/helpers/ui/elementModificators/focusableComponent";
+import { CSSClassName } from "mdtScripts/helpers/types";
 export declare function inputView({ attrs, hasError, size, ...options }: InputOptions): _mithril.MithrilVirtualElement;
 export interface InputOptions {
     id?: string;
@@ -15,6 +18,7 @@ export interface InputOptions {
     readonly?: boolean;
     hasError?: boolean;
     keyboardActions?: KeyboardActions;
+    className?: CSSClassName;
     /**
      *
      * @deprecated

package/types/components/icon/iconOptions.d.ts

@@ -1,7 +1,13 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
+import { CSSClassName } from "mdtScripts/helpers/types";
 import { FormattedText } from "../../helpers/formattedText";
 export declare type Icon = string;
-export interface IconOptions {
+export interface BaseIconOptions {
     size?: "2xs" | "xs" | "sm" | "lg" | "xl" | "2xl" | "1x" | "2x" | "3x" | "4x" | "5x" | "6x" | "7x" | "8x" | "9x" | "10x";
+    className?: CSSClassName;
+}
+export interface IconOptions extends BaseIconOptions {
     fixedWidth?: boolean;
     rotate?: "90" | "180" | "270";
     flip?: "horizontal" | "vertical" | "both";
@@ -10,7 +16,7 @@ export interface IconOptions {
     attrs?: _mithril.MithrilAttributes;
     title?: string;
     tooltip?: FormattedText;
-    className?: string;
     onmousedown?: () => void;
     onclick?: (e?: MouseEvent) => void;
 }
+export declare type IconElOptions = BaseIconOptions;

package/types/helpers/types.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 export interface AnyObject {
     [key: string]: any;
 }
@@ -9,18 +11,18 @@ declare type CSSSizeUnit = string;
 export declare type NotifierType = "log" | "error" | "warn" | "info" | "success";
 export interface NotifierOptions {
     type?: NotifierType;
-    msg?: string;
+    msg?: MessageText;
     icon?: string;
 }
 export interface Notifier {
-    notify(title: string, options?: NotifierOptions): void;
+    notify(title: MessageText, options?: NotifierOptions): void;
 }
 export declare type ViewElement = _mithril.MithrilVirtualElement | _mithril.MithrilVirtualElement[] | string;
 export declare type CommandEvent = Event | _mithril.MithrilEvent;
 export declare type CSSClassName = string;
 export declare type MithrilControl = ViewControl | ContentControl;
 export interface ViewControl {
-    $view(): _mithril.MithrilVirtualElement | string;
+    $view(): ViewElement | string;
     [key: string]: any;
 }
 export interface ContentControl {
@@ -28,6 +30,7 @@ export interface ContentControl {
     [key: string]: any;
 }
 export declare type Markdown = string;
+export declare type MessageText = Markdown | string;
 export declare type ColorStyle = "default" | "primary" | "success" | "info" | "warning" | "danger" | "fatal";
 export declare type ButtonStyle = ColorStyle;
 export declare type ObjectCode = string;
@@ -45,9 +48,12 @@ export declare type MithrilAttributes = _mithril.MithrilAttributes & {
 };
 export declare type AnyError = any;
 export declare type FieldPath = string;
-export declare type FieldLogicTypeCode = string;
+export declare type FieldId = number;
+export declare type FieldCode = string;
 export declare type KeyboardKeyCode = string;
 export declare type LanguageCode = "ru" | "en";
 export declare type LanguageId = number;
+export declare type GConstructor<T = Record<string, unknown>, A extends Array<any> = any> = new (...args: A) => T;
 export declare type URLString = string;
+export declare type JSONString = string;
 export {};

package/types/helpers/ui/elementModificators/focusableComponent.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { ComponentConfigParams } from "./modificatorsTypes";
 export declare function getFocusableComponentAttrs(): _mithril.MithrilAttributes;
 declare type KeyboardAction = (e: KeyboardEvent) => void;
@@ -7,12 +9,4 @@ export interface KeyboardActions {
     clear?: KeyboardAction;
 }
 export declare function setKeyboardActions(actions: KeyboardActions, configParams: ComponentConfigParams): void;
-interface EventModifierKeys {
-    shift: boolean;
-    meta: boolean;
-    alt: boolean;
-    ctrl: boolean;
-}
-declare type ModifierKey = keyof EventModifierKeys;
-export declare function checkKeydownModifiers(e: KeyboardEvent, pressedModifierKeys?: ModifierKey[]): boolean;
 export {};

package/types/helpers/ui/keyboardUtils/keyboardUtils.d.ts

@@ -0,0 +1,16 @@
+export declare type KeyCode = string;
+interface EventModifierKeys {
+    shift: boolean;
+    meta: boolean;
+    alt: boolean;
+    ctrl: boolean;
+}
+declare type ModifierKey = keyof EventModifierKeys;
+export declare function checkKeydownModifiers(e: KeyboardEvent, pressedModifierKeys?: ModifierKey[]): boolean;
+interface KeydownEventKeyCheckingOptions {
+    requiredModifiers?: ModifierKey[];
+    /** @default true */
+    checkModifiers?: boolean;
+}
+export declare function checkKeydownEventKeys(e: KeyboardEvent, keyCode: KeyCode, options?: KeydownEventKeyCheckingOptions): boolean;
+export {};

package/types/helpers/zone/IZone.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { MithrilControl } from "../types";
 export interface IZone {
     remove(content: MithrilControl): void;

package/types/security/PermissionLevel.d.ts

@@ -1,3 +1,4 @@
+import { IFilterGroup } from "mdtServices/IFilter";
 import { MdtField } from "../common/MdtField";
 import { MdtObject } from "../common/MdtObject";
 import { Record } from "../common/Record";
@@ -20,7 +21,7 @@ export interface PrincipalPermission extends Record {
     ID_Field$?: MdtField;
     LevelGrant?: PermissionLevel;
     LevelDeny?: PermissionLevel;
-    Filter?: string;
+    Filter?: IFilterGroup;
 }
 export interface Permission extends Record {
     id?: number;

package/types/services/IFilter.d.ts

@@ -4,25 +4,37 @@
  * @default { "op": "eq", "p1": "", "p2": "" }
  */
 export declare type IFilter = IFilterItem | IFilterGroup | IFilterIn;
+export declare type FilterKeys = keyof IFilter | keyof IFilterItem | keyof IFilterGroup;
+export declare type FilterUserIdOp = "userId";
+export declare type FilterOp = "eq" | "ne" | "gt" | "ge" | "lt" | "le" | "startsWith" | "endsWith" | "contains" | "fulltext" | "equalTemplate" | "queryIn" | "notStartsWith" | "notContains" | "notEndsWith" | "null" | "notNull" | FilterUserIdOp | FilterInOperation;
+export declare type FilterGroupOp = "and" | "or";
+export declare type AnyFilterOp = FilterOp | FilterGroupOp;
+export interface QueryInValue {
+    table?: string;
+    field?: string;
+    args?: string;
+    filter?: IFilter;
+}
 /** Группировка фильтров */
 export interface IFilterGroup {
-    op: "and" | "or";
+    op: FilterGroupOp;
     groups: IFilter[];
     not?: boolean;
 }
 /** Фильтр */
 export interface IFilterItem {
-    op: "eq" | "ne" | "gt" | "ge" | "lt" | "le" | "startsWith" | "endsWith" | "contains" | "fulltext" | "equalTemplate";
+    op: FilterOp;
     /** Поле, по которому происходит фильтрация */
     p1: string;
     /** Значение фильтра */
-    p2: string | number | Date;
+    p2: string | number | Date | QueryInValue;
     not?: boolean;
     cast?: "date";
 }
+export declare type FilterInOperation = "in";
 /** Фильтр */
 export interface IFilterIn extends Omit<IFilterItem, "op" | "p2"> {
-    op: "in";
+    op: FilterInOperation;
     p2: {
         table: string;
         field: string;
@@ -74,4 +86,6 @@ export declare class Filter {
     static queryIn(field: any, table: any, subField: any, filter: any, args?: any): IFilterIn;
     static cast(filter: any, cast: any): IFilter;
     static equalTemplate(p1: any, p2: any): IFilter;
+    static isFilterGroup(filter: IFilter): filter is IFilterGroup;
+    static isFilterItem(filter: IFilter): filter is IFilterItem;
 }

package/types/services/customModules/facades/Form/IFormControlFacade.d.ts

@@ -50,7 +50,7 @@ export interface IFormControlFacade extends ParentCtrl {
     /** Установить флаг доступности редактирования формы */
     setReadonly(readonly: boolean): void;
     /** Изменить свойства существующей кнопки */
-    updateCommand(findCondition: () => boolean, command: Partial<ButtonFacade>): void;
+    updateCommand(findCondition: (button: ButtonFacade) => boolean, command: Partial<ButtonFacade>): void;
     /** Повторно инициализировать форму */
     reinit(): void;
     /** Сохранить форму */
@@ -61,4 +61,6 @@ export interface IFormControlFacade extends ParentCtrl {
     getZones(): FormZones;
     /** Подписаться на событие обновление значения поля формы */
     onUpdated<V = string>(callback: (field: IFieldFacade, value: V) => void): void;
+    /** Закрыть форму */
+    close(): void;
 }

package/types/services/customModules/facades/Form/IFormFacade.d.ts

@@ -1,13 +1,13 @@
 import { MdtRecord } from "mdtScripts/common/Record";
+import { FormattedText } from "mdtScripts/helpers/formattedText";
+import { Valued } from "mdtScripts/helpers/types";
 import { Field } from "../../../../common/Field";
 import { IButton } from "../../../../views/form/controls/monacoEditor/jsonSchemas/Button.schema";
 import { RecordId } from "../utils/IApiFacade";
 import { IFormControlFacade } from "./IFormControlFacade";
 export declare type ActionButton = IButton & {
     /** Всплывающая подсказка */
-    description?: string | {
-        (): string;
-    };
+    description?: Valued<FormattedText>;
     /** Подписка на событие нажатия на кнопку */
     execute?: () => void;
     /** Активность кнопки */
@@ -56,6 +56,10 @@ export interface IFormServiceFacade {
     onCreated(callback: (form: IFormControlFacade) => void): void;
     /** Добавить настройки для полей формы */
     addFieldOptions(tableCode: string, options: IFormInitOptions): void;
+    /** Зарегистрировать расширение формы
+     * @param {string} alias - Имя свойства, которое можно использовать для установки опций экстендера
+     */
+    registerExtender<T>(extender: IFormExtenderFacade<T>, alias: string): void;
 }
 export interface ICustomField extends Field {
     /** Опции контрола поля */

package/types/services/customModules/facades/IMdtFacade.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { FilterConstructor } from "../../../services/IFilter";
 import { IFieldControlFacadeContstructor } from "./Form/IFieldControlFacade";
 import { IFieldControlManagerFacade } from "./Form/IFieldControlManagerFacade";
@@ -17,6 +19,9 @@ import { IUiFacade } from "./utils/IUiFacade";
 import { IUtilsFacade } from "./utils/IUtilsFacade";
 import { IPageFacade } from "./IPageFacade";
 import { CommandManagerFacade } from "./services/CommandManagerFacade";
+export declare type ModulePackageInfo = {
+    version: string;
+};
 export interface IMDTFacade {
     /** Mithril библиотека */
     m: _mithril.MithrilStatic;
@@ -56,5 +61,5 @@ export interface IMDTFacade {
     /** Управление командами */
     CommandManager: CommandManagerFacade;
     /** Зарегистрировать модуль */
-    registerModule(callback: () => void): void;
+    registerModule(callback: () => void, moduleData: ModulePackageInfo): void;
 }

package/types/services/customModules/facades/List/IListControlFacade.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { FilterSetterOptions, IFilter } from "../../../../services/IFilter";
 import { ButtonFacade } from "../Form/IFormFacade";
 import { ParentCtrl } from "../utils/IUiFacade";
@@ -32,7 +34,7 @@ export interface IListControlFacade extends ParentCtrl {
     /** Установить расширения списка */
     setExtOptions(extOptions: any): void;
     /** Изменить свойства существующей кнопки */
-    updateCommand(findCondition: () => boolean, command: Partial<ButtonFacade>): void;
+    updateCommand(findCondition: (button: ButtonFacade) => boolean, command: Partial<ButtonFacade>): void;
     /** Открыть форму добавления записи */
     openNewRecordForm(): void;
     /** Удалить выделенные строки */

package/types/services/customModules/facades/components/ModalFacade.d.ts

@@ -0,0 +1,4 @@
+export interface IModalFacade {
+    /** Закрыть модальное окно */
+    close(): void;
+}

package/types/services/customModules/facades/schema/IObjectFacade.d.ts

@@ -1,3 +1,4 @@
+import { ObjectId } from "mdtScripts/helpers/types";
 import { IFieldFacade } from "./IFieldFacade";
 export interface IObjectFacade {
     getCode(): string;
@@ -6,4 +7,5 @@ export interface IObjectFacade {
     getPrimaryField(): IFieldFacade;
     isReadonly(): boolean;
     getField(code: string, check?: boolean): IFieldFacade;
+    getId(): ObjectId;
 }

package/types/services/customModules/facades/utils/IUiComponentsFacade.d.ts

@@ -1,15 +1,18 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { ProcessPrincipalsListItem } from "../../../../components/processPrincipalsList/ProcessPrincipalsListItem";
-import { Markdown, MithrilAttributes, Valued } from "../../../../helpers/types";
-import { Icon, IconOptions } from "../../../../components/icon/iconOptions";
+import { Markdown, MithrilAttributes, Valued, ViewElement } from "../../../../helpers/types";
+import { Icon, IconElOptions, IconOptions } from "../../../../components/icon/iconOptions";
 import { InputOptions } from "../../../../components/baseFormControls/input/inputView";
 import { CommonControlOptions } from "../../../../views/form/controls/commonControl/ICommonControl";
 import { ButtonFacade } from "../Form/IFormFacade";
 import { DropdownInputItemOptions } from "../../../../components/dropdown/menu/item/dropdownInputItemOptions";
 import { DropdownItemViewOptions } from "../../../../components/dropdown/menu/item/dropdownItemWrapOptions";
 export interface IUiComponentsFacade {
-    button(button: ButtonFacade, translate?: boolean): _mithril.MithrilVirtualElement;
+    button(button: ButtonFacade, translate?: boolean): ViewElement;
     topNavButton(options: TopNavButton): _mithril.MithrilVirtualElement;
     icon(code: string, options?: IconOptions): _mithril.MithrilVirtualElement;
+    iconHTML(icon: Icon, options?: IconElOptions): HTMLElement;
     processFormBlock(options: IProcessFormBlockOptions): _mithril.MithrilVirtualElement;
     commonControl(options: CommonControlOptions): _mithril.MithrilVirtualElement;
     unstyledInput(options: InputOptions): _mithril.MithrilVirtualElement;

package/types/services/customModules/facades/utils/IUiFacade.d.ts

@@ -1,7 +1,10 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { MithrilControl } from "../../../../helpers/types";
 import { DropdownOptions } from "../../../dropdown/IDropDownMenu";
 import { ButtonFacade } from "../Form/IFormFacade";
 import { DropdownTargetContext, IDropdownMenu } from "mdtServices/dropdown/IDropDownMenu";
+import { IModalFacade } from "../components/ModalFacade";
 export declare type onModalResizeCallback = (data: IModalSizingState) => void;
 export interface IType<T> {
     new (...args: any[]): T;
@@ -25,7 +28,7 @@ export interface IUiFacade {
     /** Вызвать окно уведомления */
     showNotification(msg: CustomNotification, duration?: number): any;
     /** Вызвать модальное окно */
-    showModal(ctrl: MithrilControl | ParentCtrl, options?: IModalOptions): any;
+    showModal(ctrl: MithrilControl | ParentCtrl, options?: IModalOptions): IModalFacade;
     /** Вызвать боковую панель */
     showSidebar(ctrl: MithrilControl | ParentCtrl, options?: IPanelOptions): any;
     /** Создать выпадающее меню */
@@ -53,6 +56,8 @@ export interface IModalOptions {
     initialSizingState?: IModalSizingState;
     /** Тип модального окна */
     type?: ModalTypes;
+    /** Дополнительные кнопки на окне */
+    buttons?: ButtonFacade[];
 }
 export interface IPanelOptions {
     /** Отображать боковую панель в расширенном на весь экран виде */

package/types/services/customModules/facades/utils/ImUtilsFacade.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { MithrilControl } from "mdtScripts/helpers/types";
 export declare type ConfigFunction = (element: HTMLElement, isInitialized: boolean, context?: any) => void;
 export interface ImUtilsFacade {

package/types/services/dropdown/IDropDownMenu.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { MithrilContext, MithrilControl } from "../../helpers/types";
 export declare class IDropdownMenu<I> {
     constructor(items: I[], uid: string, options?: DropdownOptions<I>);

package/types/views/form/controls/commonControl/ICommonControl.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { Valued, ViewElement } from "../../../../helpers/types";
 export interface Action {
     icon?: Valued<string>;

package/types/views/list/IListView.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="../../../../mithril" />
+/// <reference types="mithril" />
 import { Field } from "../../common/Field";
 import { IListControlFacade } from "../../services/customModules/facades/List/IListControlFacade";
 export interface ICellTransformerCtx {

package/types/views/list/schema/ListPageOptions.schema.d.ts

@@ -32,7 +32,10 @@ export interface ListPageOptions {
     fkLinks?: boolean;
     /** Разрешить редактирование форм, открытых по нажатию на ссылки на внешние таблицы */
     fkLinksEditable?: boolean;
-    /** Запретить редактирование записей */
+    /**
+     * @title Запретить редактирование o2m полей в списке
+     * @TJS-type boolean
+     */
     readonly?: any;
     /** Запрашивать дополнительную информацию по путям, не отображающимся в списке */
     addSelect?: string[];