mdt-client 31.3.16 → 31.3.17

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 import { IFieldControlFacade as IFieldControlFacadeOrig } from "../types/services/customModules/facades/Form/IFieldControlFacade";
 import { IMDTFacade } from "../types/services/customModules/facades/IMdtFacade";
 export declare const MDT: IMDTFacade;
-export declare const Navigation: import("../types/services/customModules/facades/services/INavigationFacade").INavigationFacade, SecurityManager: import("../types/services/customModules/facades/services/ISecurityFacade").ISecurityFacade, ListService: import("../types/services/customModules/facades/List/IListServiceFacade").IListServiceFacade, List: import("../types/services/customModules/facades/List/IListControlFacade").IListControlFacadeContstructor, FormService: import("../types/services/customModules/facades/Form/IFormFacade").IFormServiceFacade, Form: import("../types/services/customModules/facades/Form/IFormControlFacade").IFormControlFacadeContstructor, ControlManager: import("../types/services/customModules/facades/Form/IFieldControlManagerFacade").IFieldControlManagerFacade<any>, FieldControl: import("../types/services/customModules/facades/Form/IFieldControlFacade").IFieldControlFacadeContstructor<any>, mUtils: import("../types/services/customModules/facades/utils/ImUtilsFacade").ImUtilsFacade, Utils: import("../types/services/customModules/facades/utils/IUtilsFacade").IUtilsFacade, Ui: import("../types/services/customModules/facades/utils/IUiFacade").IUiFacade, Api: import("../types/services/customModules/facades/utils/IApiFacade").IApiFacade, m: _mithril.MithrilStatic, Filter: import("../types/services/IFilter").FilterConstructor, Auth: import("../types/services/customModules/facades/IAuthFacade").IAuthFacade, Page: import("../types/services/customModules/facades/IPageFacade").IPageFacade, CommandManager: import("../types/services/customModules/facades/services/CommandManagerFacade").CommandManagerFacade, RecordManager: import("../types/services/customModules/facades/record/IRecordManagerFacade").IRecordManagerFacade, ModuleRegistry: import("../types/services/customModules/facades/IModuleRegistryFacade").IModuleRegistryFacade, UiComponents: import("../types/services/customModules/facades/utils/IUiComponentsFacade").IUiComponentsFacade, Schema: import("../types/services/customModules/facades/schema/ISchemaFacade").ISchemaFacade, App: import("../types/services/customModules/facades/IAppFacade").IAppFacade, modules: import("../types/services/customModules/facades/internalModules/modulesFacadeTypes").InternalModulesFacade, legacy: import("../types/services/customModules/facades/ILegacyFacade").ILegacyFacade;
+export declare const Navigation: import("../types/services/customModules/facades/services/INavigationFacade").INavigationFacade, SecurityManager: import("../types/services/customModules/facades/services/ISecurityFacade").ISecurityFacade, ListService: import("../types/services/customModules/facades/List/IListServiceFacade").IListServiceFacade, List: import("../types/services/customModules/facades/List/IListControlFacade").IListControlFacadeContstructor, FormService: import("../types/services/customModules/facades/Form/IFormFacade").IFormServiceFacade, Form: import("../types/services/customModules/facades/Form/IFormControlFacade").IFormControlFacadeContstructor, FormDashboard: import("../types/services/customModules/facades/formDashboard/IFormDashboard").IFormDashboard, ControlManager: import("../types/services/customModules/facades/Form/IFieldControlManagerFacade").IFieldControlManagerFacade<any>, FieldControl: import("../types/services/customModules/facades/Form/IFieldControlFacade").IFieldControlFacadeContstructor<any>, mUtils: import("../types/services/customModules/facades/utils/ImUtilsFacade").ImUtilsFacade, Utils: import("../types/services/customModules/facades/utils/IUtilsFacade").IUtilsFacade, Ui: import("../types/services/customModules/facades/utils/IUiFacade").IUiFacade, Api: import("../types/services/customModules/facades/utils/IApiFacade").IApiFacade, m: _mithril.MithrilStatic, Filter: import("../types/services/IFilter").FilterConstructor, Auth: import("../types/services/customModules/facades/IAuthFacade").IAuthFacade, Page: import("../types/services/customModules/facades/IPageFacade").IPageFacade, CommandManager: import("../types/services/customModules/facades/services/CommandManagerFacade").CommandManagerFacade, RecordManager: import("../types/services/customModules/facades/record/IRecordManagerFacade").IRecordManagerFacade, ModuleRegistry: import("../types/services/customModules/facades/IModuleRegistryFacade").IModuleRegistryFacade, UiComponents: import("../types/services/customModules/facades/utils/IUiComponentsFacade").IUiComponentsFacade, Schema: import("../types/services/customModules/facades/schema/ISchemaFacade").ISchemaFacade, App: import("../types/services/customModules/facades/IAppFacade").IAppFacade, modules: import("../types/services/customModules/facades/internalModules/modulesFacadeTypes").InternalModulesFacade, legacy: import("../types/services/customModules/facades/ILegacyFacade").ILegacyFacade;
 interface ModuleContext {
     name: string;
 }

package/dist/index.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerModule = exports.legacy = exports.modules = exports.App = exports.Schema = exports.UiComponents = exports.ModuleRegistry = exports.RecordManager = exports.CommandManager = exports.Page = exports.Auth = exports.Filter = exports.m = exports.Api = exports.Ui = exports.Utils = exports.mUtils = exports.FieldControl = exports.ControlManager = exports.Form = exports.FormService = exports.List = exports.ListService = exports.SecurityManager = exports.Navigation = exports.MDT = void 0;
+exports.registerModule = exports.legacy = exports.modules = exports.App = exports.Schema = exports.UiComponents = exports.ModuleRegistry = exports.RecordManager = exports.CommandManager = exports.Page = exports.Auth = exports.Filter = exports.m = exports.Api = exports.Ui = exports.Utils = exports.mUtils = exports.FieldControl = exports.ControlManager = exports.FormDashboard = exports.Form = exports.FormService = exports.List = exports.ListService = exports.SecurityManager = exports.Navigation = exports.MDT = void 0;
 var package_json_1 = __importDefault(require("../package.json"));
 exports.MDT = window.MDT;
-exports.Navigation = exports.MDT.Navigation, exports.SecurityManager = exports.MDT.SecurityManager, exports.ListService = exports.MDT.ListService, exports.List = exports.MDT.List, exports.FormService = exports.MDT.FormService, exports.Form = exports.MDT.Form, exports.ControlManager = exports.MDT.ControlManager, exports.FieldControl = exports.MDT.FieldControl, exports.mUtils = exports.MDT.mUtils, exports.Utils = exports.MDT.Utils, exports.Ui = exports.MDT.Ui, exports.Api = exports.MDT.Api, exports.m = exports.MDT.m, exports.Filter = exports.MDT.Filter, exports.Auth = exports.MDT.Auth, exports.Page = exports.MDT.Page, exports.CommandManager = exports.MDT.CommandManager, exports.RecordManager = exports.MDT.RecordManager, exports.ModuleRegistry = exports.MDT.ModuleRegistry, exports.UiComponents = exports.MDT.UiComponents, exports.Schema = exports.MDT.Schema, exports.App = exports.MDT.App, exports.modules = exports.MDT.modules, exports.legacy = exports.MDT.legacy;
+exports.Navigation = exports.MDT.Navigation, exports.SecurityManager = exports.MDT.SecurityManager, exports.ListService = exports.MDT.ListService, exports.List = exports.MDT.List, exports.FormService = exports.MDT.FormService, exports.Form = exports.MDT.Form, exports.FormDashboard = exports.MDT.FormDashboard, exports.ControlManager = exports.MDT.ControlManager, exports.FieldControl = exports.MDT.FieldControl, exports.mUtils = exports.MDT.mUtils, exports.Utils = exports.MDT.Utils, exports.Ui = exports.MDT.Ui, exports.Api = exports.MDT.Api, exports.m = exports.MDT.m, exports.Filter = exports.MDT.Filter, exports.Auth = exports.MDT.Auth, exports.Page = exports.MDT.Page, exports.CommandManager = exports.MDT.CommandManager, exports.RecordManager = exports.MDT.RecordManager, exports.ModuleRegistry = exports.MDT.ModuleRegistry, exports.UiComponents = exports.MDT.UiComponents, exports.Schema = exports.MDT.Schema, exports.App = exports.MDT.App, exports.modules = exports.MDT.modules, exports.legacy = exports.MDT.legacy;
 function registerModule(callback, context) {
     exports.MDT.registerModule(callback, {
         version: package_json_1.default.version,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAEA,iEAA0C;AAE7B,QAAA,GAAG,GAAgB,MAAc,CAAC,GAAG,CAAC;AAGlD,QAAA,UAAU,GAwBP,WAAG,aAvBN,QAAA,eAAe,GAuBZ,WAAG,kBAtBN,QAAA,WAAW,GAsBR,WAAG,cArBN,QAAA,IAAI,GAqBD,WAAG,OApBN,QAAA,WAAW,GAoBR,WAAG,cAnBN,QAAA,IAAI,GAmBD,WAAG,OAlBN,QAAA,cAAc,GAkBX,WAAG,iBAjBN,QAAA,YAAY,GAiBT,WAAG,eAhBN,QAAA,MAAM,GAgBH,WAAG,SAfN,QAAA,KAAK,GAeF,WAAG,QAdN,QAAA,EAAE,GAcC,WAAG,KAbN,QAAA,GAAG,GAaA,WAAG,MAZN,QAAA,CAAC,GAYE,WAAG,IAXN,QAAA,MAAM,GAWH,WAAG,SAVN,QAAA,IAAI,GAUD,WAAG,OATN,QAAA,IAAI,GASD,WAAG,OARN,QAAA,cAAc,GAQX,WAAG,iBAPN,QAAA,aAAa,GAOV,WAAG,gBANN,QAAA,cAAc,GAMX,WAAG,iBALN,QAAA,YAAY,GAKT,WAAG,eAJN,QAAA,MAAM,GAIH,WAAG,SAHN,QAAA,GAAG,GAGA,WAAG,MAFN,QAAA,OAAO,GAEJ,WAAG,UADN,QAAA,MAAM,GACH,WAAG,QAAC;AAMR,SAAgB,cAAc,CAAC,QAAoB,EAAE,OAAuB;IAC3E,WAAG,CAAC,cAAc,CAAC,QAAQ,EAAE;QAC5B,OAAO,EAAE,sBAAW,CAAC,OAAO;QAC5B,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;KACnB,CAAC,CAAC;AACJ,CAAC;AALD,wCAKC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAEA,iEAA0C;AAE7B,QAAA,GAAG,GAAgB,MAAc,CAAC,GAAG,CAAC;AAGlD,QAAA,UAAU,GAyBP,WAAG,aAxBN,QAAA,eAAe,GAwBZ,WAAG,kBAvBN,QAAA,WAAW,GAuBR,WAAG,cAtBN,QAAA,IAAI,GAsBD,WAAG,OArBN,QAAA,WAAW,GAqBR,WAAG,cApBN,QAAA,IAAI,GAoBD,WAAG,OAnBN,QAAA,aAAa,GAmBV,WAAG,gBAlBN,QAAA,cAAc,GAkBX,WAAG,iBAjBN,QAAA,YAAY,GAiBT,WAAG,eAhBN,QAAA,MAAM,GAgBH,WAAG,SAfN,QAAA,KAAK,GAeF,WAAG,QAdN,QAAA,EAAE,GAcC,WAAG,KAbN,QAAA,GAAG,GAaA,WAAG,MAZN,QAAA,CAAC,GAYE,WAAG,IAXN,QAAA,MAAM,GAWH,WAAG,SAVN,QAAA,IAAI,GAUD,WAAG,OATN,QAAA,IAAI,GASD,WAAG,OARN,QAAA,cAAc,GAQX,WAAG,iBAPN,QAAA,aAAa,GAOV,WAAG,gBANN,QAAA,cAAc,GAMX,WAAG,iBALN,QAAA,YAAY,GAKT,WAAG,eAJN,QAAA,MAAM,GAIH,WAAG,SAHN,QAAA,GAAG,GAGA,WAAG,MAFN,QAAA,OAAO,GAEJ,WAAG,UADN,QAAA,MAAM,GACH,WAAG,QAAC;AAMR,SAAgB,cAAc,CAAC,QAAoB,EAAE,OAAuB;IAC3E,WAAG,CAAC,cAAc,CAAC,QAAQ,EAAE;QAC5B,OAAO,EAAE,sBAAW,CAAC,OAAO;QAC5B,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;KACnB,CAAC,CAAC;AACJ,CAAC;AALD,wCAKC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mdt-client",
-	"version": "31.3.16",
+	"version": "31.3.17",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/types/common/Field.d.ts

@@ -39,6 +39,12 @@ export interface Field extends Record {
     flagHiddenByDefault?: boolean;
     min?: number;
     max?: number;
+    /**
+     * `FieldSettings` {@link module ui/_core/scripts/common/FieldSettings.schema} в JSON формате.
+     * Задается через форму редактирования поля в пользовательском интерфейсе, приходит с API в виде строки.
+     * Не следует использовать напрямую, вместо этого используйте SchemaManager.getFieldSettings.
+     */
+    settings?: string;
     dynamicFkObjectPath?: string;
     id_DynamicFkRecordObjectField?: number;
     dynamicFkRecordObjectFieldCode?: string;

package/types/common/FieldSettings.schema.d.ts

@@ -0,0 +1,8 @@
+import IMask from "imask";
+export interface FieldSettings {
+    /**
+     * Маска отображает значение в заданном формате в списке и на форме. Например, число можно отобразить как "1 234,56" или "1234.56".
+     * [Подробнее о маске в документации](https://ics-it.gram.ax/mdt/content/list/dataView/formatMask).
+     */
+    maskOptions?: IMask.AnyMaskedOptions;
+}

package/types/components/baseFormControls/maskedInput/MaskFormatter.types.d.ts

@@ -0,0 +1,2 @@
+import IMask from "imask";
+export declare type MaskOptions = IMask.AnyMaskedOptions;

package/types/helpers/formatOptions.d.ts

@@ -1,6 +1,14 @@
+import { MaskOptions } from "mdtScripts/components/baseFormControls/maskedInput/MaskFormatter.types";
 export interface FormatOptions {
     type?: string;
     title?: string;
     empty?: string;
+    /**
+     * @deprecated
+     */
     mask?: string;
+    /**
+     * Настройки маски
+     */
+    maskOptions?: MaskOptions;
 }

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

@@ -0,0 +1,2 @@
+export declare type KeySymbolCode = "Cmd" | "Option" | "Alt" | "Shift" | "Ctrl" | "Enter" | "Left" | "Right" | "Up" | "Down";
+export declare function getKeySymbol(key: KeySymbolCode): string;

package/types/helpers/utils/memoization/memoize.d.ts

@@ -0,0 +1,18 @@
+export declare class Memoize<A extends any[] = any[], R = any> {
+    private calculate;
+    private store;
+    constructor(calculate: (...args: A) => R);
+    exec(args: A): R;
+}
+export declare class MemoizeStore {
+    private store;
+    exec<A extends any[] = any[], R = any>(key: string, calculate: (...args: A) => R, args: A): R;
+    clearKey(key: string): void;
+}
+export declare class MultiMemoize<A extends any[] = any[], R = any> {
+    private calculate;
+    private store;
+    constructor(calculate: (...args: A) => R);
+    exec(...args: A): R;
+    clear(): void;
+}

package/types/helpers/utils/object.d.ts

@@ -1,3 +1,4 @@
 export declare function hasOwnProperty(object: Record<never, unknown>, name: string): boolean;
 export declare function shallowCopy<T>(obj: T): T;
 export declare function copyWithIgnore<T, K extends keyof T = null>(obj: T, ignore: K[]): Omit<T, K>;
+export declare function shallowEqual(objA: Record<never, unknown>, objB: Record<never, unknown>): boolean;

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

@@ -1,15 +1,23 @@
 /// <reference types="../../../../mithril" />
 /// <reference types="mithril" />
+import { E2eServiceType } from "mdtServices/e2e/e2eServiceType";
 import { FilterConstructor } from "../../../services/IFilter";
 import { IFieldControlFacadeContstructor } from "./Form/IFieldControlFacade";
 import { IFieldControlManagerFacade } from "./Form/IFieldControlManagerFacade";
 import { IFormControlFacadeContstructor } from "./Form/IFormControlFacade";
+import { IFormDashboard } from "./formDashboard/IFormDashboard";
 import { IFormServiceFacade } from "./Form/IFormFacade";
+import { IAppFacade } from "./IAppFacade";
 import { IAuthFacade } from "./IAuthFacade";
+import { ILegacyFacade } from "./ILegacyFacade";
 import { IModuleRegistryFacade } from "./IModuleRegistryFacade";
-import { ISchemaFacade } from "./schema/ISchemaFacade";
+import { InternalModulesFacade } from "./internalModules/modulesFacadeTypes";
+import { IPageFacade } from "./IPageFacade";
 import { IListControlFacadeContstructor } from "./List/IListControlFacade";
 import { IListServiceFacade } from "./List/IListServiceFacade";
+import { IRecordManagerFacade } from "./record/IRecordManagerFacade";
+import { ISchemaFacade } from "./schema/ISchemaFacade";
+import { CommandManagerFacade } from "./services/CommandManagerFacade";
 import { INavigationFacade } from "./services/INavigationFacade";
 import { ISecurityFacade } from "./services/ISecurityFacade";
 import { IApiFacade } from "./utils/IApiFacade";
@@ -17,13 +25,6 @@ import { ImUtilsFacade } from "./utils/ImUtilsFacade";
 import { IUiComponentsFacade } from "./utils/IUiComponentsFacade";
 import { IUiFacade } from "./utils/IUiFacade";
 import { IUtilsFacade } from "./utils/IUtilsFacade";
-import { IPageFacade } from "./IPageFacade";
-import { CommandManagerFacade } from "./services/CommandManagerFacade";
-import { IRecordManagerFacade } from "./record/IRecordManagerFacade";
-import { ILegacyFacade } from "./ILegacyFacade";
-import { IAppFacade } from "./IAppFacade";
-import { InternalModulesFacade } from "./internalModules/modulesFacadeTypes";
-import { E2eServiceType } from "../../../services/e2e/e2eServiceType";
 export declare type ModulePackageInfo = {
     version: string;
     name?: string;
@@ -48,6 +49,8 @@ export interface IMDTFacade {
     ControlManager: IFieldControlManagerFacade;
     /** Компонент контрола */
     FieldControl: IFieldControlFacadeContstructor;
+    /** Управление дашбордом */
+    FormDashboard: IFormDashboard;
     /** Утилиты для Mithril */
     mUtils: ImUtilsFacade;
     /** Утилиты */

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

@@ -1,3 +1,4 @@
+import { ApiV2 } from "mdtServices/api/ApiAccessor/apiV2Types";
 import { Field } from "../../../../../scripts/common/Field";
 import { ObjectCode, ViewControl } from "../../../../helpers/types";
 import { MdtRecord } from "../utils/IApiFacade";
@@ -39,10 +40,14 @@ export interface CustomListOptions<R = MdtRecord> {
     code: ObjectCode;
     /** Поля списка */
     fields: Field[];
-    /** Записи списка */
-    records: R[];
+    /**
+     * Записи списка
+     */
+    records?: R[];
     /** Опции списка */
     listOptions?: any;
     /** Настройки расширений списка */
     extConfig?: any;
+    /** Функция для получения записей списка с возможностью обновления данных или использования пользовательского API */
+    fetch?: (query: ApiV2.Request.Fetch | ApiV2.Request.Fetch[]) => Promise<MdtRecord[]>;
 }

package/types/services/customModules/facades/formDashboard/IFormDashboard.d.ts

@@ -0,0 +1,15 @@
+import { MithrilControl } from "mdtScripts/helpers/types";
+export interface IFormDashboard {
+    /**
+     * Настройка дашборда. Возвращает объект для управления дашбордом.
+     * @param code - Код дашборда. Его можно узнать в настройках узла навигации в "Расширенной конфигурации"
+     */
+    setup: (code: string) => IFormDashboardFacade;
+}
+export declare type ComponentPosition = "title-right";
+export interface IFormDashboardFacade {
+    /**
+     * Добавляет компонент на дашборд в указанную позицию
+     */
+    addComponent: (component: () => MithrilControl, position: ComponentPosition) => void;
+}

package/types/services/customModules/facades/internalModules/importFormCtrl.types.d.ts

@@ -4,10 +4,10 @@ import { Field } from "mdtScripts/common/Field";
 import { Table } from "mdtScripts/common/Table";
 import { FieldPath } from "mdtScripts/helpers/types";
 interface ImportMapping {
-    columns: {
+    columns?: {
         [fieldPath: string]: string;
     };
-    keys: string[];
+    keys?: string[];
 }
 export interface ImportUploadData {
     /** id записи */

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

@@ -1,3 +1,4 @@
+import { FieldSettings } from "mdtScripts/common/FieldSettings.schema";
 export interface IFieldFacade {
     getCode(): string;
     getTitle(): string | undefined;
@@ -7,3 +8,4 @@ export interface IFieldFacade {
     isOne2Many(): boolean;
     isHistory(): boolean;
 }
+export declare type IFieldSettings = FieldSettings;

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

@@ -1,8 +1,11 @@
+import { IFieldSettings } from "./IFieldFacade";
 import { IObjectFacade } from "./IObjectFacade";
 declare const allFieldPhysicalTypes: readonly ["bigint", "binary", "bit", "char", "date", "datetime", "datetime2", "datetimeoffset", "decimal", "float", "geography", "geometry", "hierarchyid", "image", "int", "money", "nchar", "ntext", "numeric", "nvarchar", "real", "smalldatetime", "smallint", "smallmoney", "sql_variant", "sysname", "text", "time", "timestamp", "tinyint", "uniqueidentifier", "varbinary", "varchar", "xml"];
 export declare type FieldPhysicalType = typeof allFieldPhysicalTypes[number];
 export interface ISchemaFacade {
     /** Получить объект по коду или по ID */
     getObject(idOrCode: string | number, check?: boolean): IObjectFacade;
+    /** Установить настройки для поля */
+    setFieldSettings(objectCode: string, settings: Record<string, IFieldSettings>): void;
 }
 export {};

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

@@ -1,4 +1,10 @@
-import { URLString, Valued } from "mdtScripts/helpers/types";
+import { AnyObject, URLString, Valued } from "mdtScripts/helpers/types";
+export interface CustomPageCtrl {
+    new (node: ICustomNodeNavigationFacade): any;
+}
+export interface ICustomNodeNavigationFacade {
+    getSettings<T = AnyObject>(): T;
+}
 /** Управление навигацией */
 export interface INavigationFacade {
     /** Добавить узел навигации */
@@ -13,7 +19,7 @@ export interface INavigationFacade {
      * Зарегистрировать новый контрол для узла навигации.
      * Использование: Чтобы отобразить контрол на странице, нужно в узле навигации указать название контрола в поле "Идентификатор подключаемого элемента" (Control)
      */
-    registerPageCtrl: (ctrl: Function, name: string) => void;
+    registerPageCtrl: (ctrl: CustomPageCtrl, name: string) => void;
     /**
      * Очистить кеш отображения верхней и боковой навигации.
      * Используется в случае, если условия отображения узлов навигации изменились.

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

@@ -14,9 +14,9 @@ import { CodeEditorFacade, CodeEditorFacadeOptions } from "../components/CodeEdi
 import { FileInputFacadeOptions } from "../../../../views/form/controls/fileupload/FileInputFacade.types";
 import { FieldViewOptions } from "../../../../components/form/fieldView/fieldViewOptions";
 import { ComponentConfigParams } from "mdtScripts/helpers/ui/elementModificators/modificatorsTypes";
-import { FormattedText } from "mdtScripts/helpers/formattedText";
-import { ChartFormControlFacadeOptions, IChartControlFacade } from "mdtScripts/views/page/charts/facade/IСhartControlFacade";
-import { IMultiPickerFacade, MultiPickerFacadeOptions, MultiPickerItem } from "mdtScripts/views/form/controls/picker/multiPickerFacade/IMultiPickerFacade";
+import { FormattedText } from "../../../../helpers/formattedText";
+import { ChartFormControlFacadeOptions, IChartControlFacade } from "../../../../views/page/charts/facade/IСhartControlFacade";
+import { IMultiPickerFacade, MultiPickerFacadeOptions, MultiPickerItem } from "../../../../views/form/controls/picker/multiPickerFacade/IMultiPickerFacade";
 export interface IUiComponentsFacade {
     button(button: ButtonFacade, translate?: boolean): ViewElement;
     topNavButton(options: TopNavButton): _mithril.MithrilVirtualElement;
@@ -43,6 +43,18 @@ export interface IUiComponentsFacade {
      * @deprecated
      */
     multiPicker<T extends MultiPickerItem = MultiPickerItem>(options: MultiPickerFacadeOptions<T>): IMultiPickerFacade<T>;
+    /**
+     *
+     * **Пример**
+     *
+     * ```js
+     * const markdownText = 'Удалено записей: **9**';
+     * Ui.showModal({
+     * 	$view: () => UiComponents.markdown(markdownText)
+     * })
+     * ```
+     */
+    markdown(content: string): ViewElement;
 }
 export interface IProcessFormBlockOptions {
     title: string;

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

@@ -19,6 +19,7 @@ export interface IUtilsFacade {
      */
     downloadFile(url: string): void;
     getValued: typeof getValued;
+    mergeDeep<T = AnyObject>(object1: T, object2: T): void;
     EventEmitter: typeof EventEmitter;
     Pipeline: typeof Pipeline;
     ImmutableArgPipeline: typeof ImmutableArgPipeline;

package/types/views/form/controls/picker/multiPickerFacade/IMultiPickerFacade.d.ts

@@ -1,6 +1,6 @@
-import { EventEmitterSubscribeController } from "mdtScripts/helpers/events/EventEmitter";
-import { FormattedText } from "mdtScripts/helpers/formattedText";
-import { Valued, ViewControl } from "mdtScripts/helpers/types";
+import { EventEmitterSubscribeController } from "../../../../../helpers/events/EventEmitter";
+import { FormattedText } from "../../../../../helpers/formattedText";
+import { Valued, ViewControl } from "../../../../../helpers/types";
 interface FetchQuery {
     searchString?: string;
 }

package/types/views/page/charts/ChartControlOptions.schema.d.ts

@@ -7,6 +7,7 @@ declare type Title = string | TitleFunction;
 export declare type Orientation = "horizontal" | "vertical";
 declare type AxisPosition = "start" | "end";
 export declare type AxisLabelPosition = "vertical" | "horizontal";
+export declare type TwoDimChartLegendPosition = "top" | "bottom";
 declare type ChartField = string;
 export declare type TwoDimensionalValueField = ChartField | {
     name: string;
@@ -223,6 +224,9 @@ export interface Axes {
         formatValue?: string;
         /** @title Размер отступа между подписями в px */
         stepSize?: number;
+        line?: {
+            visible?: boolean;
+        };
     };
 }
 interface BaseChartBlockOptions {
@@ -254,11 +258,6 @@ interface GraphicChartBlockOptions extends BaseChartBlockOptions {
      * @default 50
      */
     maxRecordCount?: number;
-    /**
-     * @title Отображение легенды
-     * @description По умолчанию для круговых диаграмм отображается всегда, а для двумерных диаграмм - когда количество полей значений больше одного
-     */
-    legend?: boolean;
 }
 export interface CommonCanvasOptions {
     bar?: BarCanvasOptions;
@@ -296,6 +295,10 @@ export interface TwoDimensionalOptions extends GraphicChartBlockOptions {
      * @title Общие параметры холста графика
      */
     commonCanvasOptions?: CommonCanvasOptions;
+    legend?: boolean | {
+        show?: boolean;
+        position?: TwoDimChartLegendPosition;
+    };
 }
 /**
  * @title Круговая диаграмма
@@ -314,8 +317,13 @@ export interface PolarOptions extends GraphicChartBlockOptions {
      * @description Наименование поля, в котором хранится цвет для сегментов диаграммы.
      */
     colorField?: string;
+    /**
+     * @title Отображение легенды
+     * @description По умолчанию для круговых диаграмм отображается всегда
+     */
+    legend?: boolean;
 }
-export declare type TwoDimensionalChart = BarChart | LineChart | AreaChart;
+export declare type TwoDimensionalChart = BarChart | LineChart | AreaChart | DotChart;
 interface TwoDimensionalChartOptions {
     /**
      * @title Параметры данных, привязанных к диаграмме
@@ -331,6 +339,10 @@ interface TwoDimensionalChartOptions {
      * @title Отображение диаграммы в сегментированном виде
      */
     isSegmented?: boolean;
+    /**
+     * @title Отображение подписей значений на диаграмме
+     */
+    valueLabels?: boolean;
 }
 /**
  * @title Гистограмма
@@ -423,6 +435,10 @@ interface BarChart extends TwoDimensionalChartOptions {
     labels?: boolean;
     /** @title Отображать в заштрихованном виде */
     hatched?: boolean;
+    borderRadius?: BarChartBorderRadius;
+}
+interface BarChartBorderRadius {
+    value?: number;
 }
 /**
  * @title Линейная диаграмма
@@ -439,6 +455,8 @@ interface AreaChart extends LineAreaChart {
      * @title Тип 2D-диаграммы
      */
     type: "area";
+    /** @title Включить градиент */
+    gradient?: boolean;
 }
 interface LineChart extends LineAreaChart {
     /**
@@ -447,6 +465,7 @@ interface LineChart extends LineAreaChart {
     type: "line";
     /** @title Управление пунктиром */
     dash?: LineDash;
+    width?: number;
 }
 interface LineDash {
     /** @title Включить пунктир */
@@ -456,6 +475,9 @@ interface LineDash {
     /** @title Размер между чертами в px */
     gapSize?: number;
 }
+export interface DotChart extends TwoDimensionalChartOptions {
+    type: "dot";
+}
 export interface PolarChart {
     /**
      * @title Наименование отображаемого поля-значения

package/types/views/page/charts/facade/I/320/241hartControlFacade.d.ts

@@ -1,6 +1,7 @@
 import { ChartControlOptions } from "../ChartControlOptions.schema";
-import { MdtRecord } from "mdtServices/customModules/facades/utils/IApiFacade";
-import { EventEmitterSubscribeController } from "mdtScripts/helpers/events/EventEmitter";
+import { MdtRecord } from "../../../../services/customModules/facades/utils/IApiFacade";
+import { EventEmitterSubscribeController } from "../../../../helpers/events/EventEmitter";
+import { ViewControl } from "../../../../helpers/types";
 export interface ChartControlFacadeData {
     refresh?: number;
     fetch?: () => Promise<MdtRecord[]>;
@@ -14,7 +15,7 @@ export interface ChartEvents {
         records: MdtRecord[];
     };
 }
-export interface IChartControlFacade {
+export interface IChartControlFacade extends ViewControl {
     readonly on: EventEmitterSubscribeController<ChartEvents>["subscribe"];
     refreshData(): void;
     reCreate(newOptionsCreator?: () => ChartFormControlFacadeOptions): void;