ru.coon 2.5.67 → 2.6.0

package/src/report/plugin/SettingsManagerPlugin/view/SMPMainViewController.js

@@ -1,183 +1,183 @@
-Ext.define('Coon.report.plugin.SettingsManagerPlugin.view.SMPMainViewController', {
-    extend: 'Ext.app.ViewController',
-    alias: 'controller.SettingsManagerPluginMainViewController',
-    requires: ['Coon.report.plugin.SettingsManagerPlugin.model.SMPProfileEntry'],
-    entityName: 'Coon.report.plugin.SettingsManagerPlugin.model.SMPProfileEntry',
-    async init(view) {
-        this.ctx = view.context;
-        this.picker = this.lookup('profilePicker');
-        this.titleEditor = this.lookup('titleEditor');
-        this.tbar = this.lookup('tbar');
-        this.bbar = this.lookup('bbar');
-        this.vm = this.getViewModel();
-        this.vm.set('isShowDetails', this.ctx.isShowDetails);
-        this.vm.set('isShowEmptyProfile', this.ctx.isShowEmptyProfile);
-        Object.defineProperty(this, 'activeProfile', {
-            get: function() {
-                return this.vm.get('activeProfile');
-            },
-        });
-        const profileEntries = await this.loadEntries();
-        const profileId = this.ctx.getActiveProfileId();
-        const isShowEmptyProfile = Boolean(this.ctx.isShowEmptyProfile) === true;
-        if (typeof this.ctx.emptyProfile === 'undefined') {
-            this.ctx.emptyProfile = this.createEntity(
-                {
-                    id: this.ctx.emptyProfileId,
-                    settings: this.ctx.getConfiguredSettings(),
-                    title: isShowEmptyProfile ? this.ctx.emptyProfileTitle : undefined,
-                }
-            );
-        }
-        if (isShowEmptyProfile) {
-            profileEntries.push(this.ctx.emptyProfile);
-            this.vm.set({profileEntries});
-            this.picker.triggers.picker.setVisible(profileEntries.length > 0);
-        }
-        if (profileId) {
-            this.vm.set({
-                profileId,
-                appliedProfileId: profileId,
-            });
-        } else {
-            this.vm.set({
-                activeProfile: this.ctx.emptyProfile,
-                appliedProfileId: this.ctx.emptyProfile.id,
-            });
-            this.syncSettings();
-        }
-    },
-    onPickerChange(picker, id) {
-        id && id === this.ctx.getActiveProfileId() && this.syncSettings();
-    },
-    syncSettings() {
-        this.ctx.applyCurrentSettings(this.activeProfile);
-    },
-    async loadEntries() {
-        const profileEntries = await this.ctx.getStore().load();
-        this.vm.set({profileEntries});
-        this.picker.triggers.picker.setVisible(profileEntries.length > 0);
-        return profileEntries;
-    },
-    createEntity(data = {}) {
-        return Ext.create(this.entityName, data);
-    },
-    clearHandler() {
-        this.vm.set({activeProfile: this.ctx.emptyProfile});
-        this.applyHandler();
-    },
-    applyHandler() {
-        if (!this.activeProfile) {
-            console.trace('No active profile');
-            return;
-        }
-        const appliedProfileId = this.activeProfile.id;
-        const settings = this.activeProfile.get('settings');
-        this.ctx.setActiveProfileId(appliedProfileId);
-        this.vm.set({appliedProfileId});
-        this.ctx.setSettings(settings);
-        this.vm.notify();
-        this.ctx.getWrapper().destroy();
-    },
-    createHandler() {
-        const profileId = this.vm.get('profileId');
-        const settings = profileId ? this.activeProfile.get('settings') : this.ctx.getSettings();
-        const newProfile = this.createEntity({settings, isDefault: this.activeProfile.get('isDefault')});
-        newProfile.beginEdit();
-        this.vm.set({
-            prevProfileId: profileId,
-            activeProfile: newProfile,
-            isEditMode: true,
-        });
-    },
-    cancelHandler() {
-        this.activeProfile.reject();
-        const prevProfileId = this.vm.get('prevProfileId');
-        if (prevProfileId) {
-            this.vm.set('profileId', prevProfileId);
-        } else {
-            this.titleEditor.reset();
-            this.vm.set('activeProfile', this.ctx.emptyProfile);
-        }
-        this.vm.set({
-            prevProfileId: null,
-            isEditMode: false,
-        });
-        this.vm.notify();
-    },
-    renameHandler() {
-        this.vm.set({
-            prevProfileId: this.activeProfile.getId(),
-            isEditMode: true,
-        });
-        this.activeProfile.beginEdit();
-        this.vm.notify();
-    },
-    async saveHandler() {
-        try {
-            this.activeProfile.endEdit();
-            this.activeProfile.commit();
-            await this.ctx.getStore().save(this.activeProfile);
-            await this.loadEntries();
-            this.applyHandler();
-            return true;
-        } catch (e) {
-            if (e.message === 'UNIQUENESS') {
-                const fields = e.cause || [];
-                if (fields.includes('title')) {
-                    Ext.Msg.show({
-                        title: 'Изменение настроек существующего профиля',
-                        message: `Данный профиль уже существует. Обновить его настройки?`,
-                        icon: Ext.Msg.QUESTION,
-                        buttons: Ext.Msg.OKCANCEL,
-                        fn: async (btn) => {
-                            if (btn === 'ok') {
-                                const {isDefault, settings, title} = this.activeProfile.data;
-                                const profilesStore = this.vm.getStore('profilesStore');
-                                const existing = profilesStore.findRecord('title', title);
-                                if (existing) {
-                                    existing.set('settings', settings);
-                                    existing.set('isDefault', isDefault);
-                                    this.vm.set({'activeProfile': existing, 'isEditMode': false});
-                                    return await this.saveHandler();
-                                }
-                            }
-                        },
-                    });
-                }
-            } else {
-                Coon.log.error(e.message);
-                Ext.Msg.show({
-                    title: 'Ошибка',
-                    message: `Произошла ошибка при сохранении: ${e.message}`,
-                    icon: Ext.Msg.ERROR,
-                    buttons: Ext.Msg.OK,
-                });
-                return false;
-            }
-        }
-    },
-    async removeHandler() {
-        Ext.Msg.confirm(
-            this.vm.get('titles.removeDialogTitle'),
-            this.vm.get('titles.removeDialogText'),
-            async (btn) => {
-                if (btn === 'yes') {
-                    const id = this.vm.get('profileId');
-                    await this.ctx.getStore().remove(id);
-                    this.activeProfile.drop();
-                    await this.loadEntries();
-                    this.clearHandler();
-                }
-            }
-        );
-    },
-    toggleDetails: (panel) => panel.publishState('collapsed', Boolean(panel.toggleCollapse().getCollapsed())),
-    onShowTitleEditor(titleEditor) {
-        titleEditor.selectText().focus();
-        titleEditor.validate();
-    },
-    addCreateButton(toast) {
-        toast.setBtn({text: 'Создать', handler: this.createHandler.bind(this)});
-    },
-});
+Ext.define('Coon.report.plugin.SettingsManagerPlugin.view.SMPMainViewController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.SettingsManagerPluginMainViewController',
+    requires: ['Coon.report.plugin.SettingsManagerPlugin.model.SMPProfileEntry'],
+    entityName: 'Coon.report.plugin.SettingsManagerPlugin.model.SMPProfileEntry',
+    async init(view) {
+        this.ctx = view.context;
+        this.picker = this.lookup('profilePicker');
+        this.titleEditor = this.lookup('titleEditor');
+        this.tbar = this.lookup('tbar');
+        this.bbar = this.lookup('bbar');
+        this.vm = this.getViewModel();
+        this.vm.set('isShowDetails', this.ctx.isShowDetails);
+        this.vm.set('isShowEmptyProfile', this.ctx.isShowEmptyProfile);
+        Object.defineProperty(this, 'activeProfile', {
+            get: function() {
+                return this.vm.get('activeProfile');
+            },
+        });
+        const profileEntries = await this.loadEntries();
+        const profileId = this.ctx.getActiveProfileId();
+        const isShowEmptyProfile = Boolean(this.ctx.isShowEmptyProfile) === true;
+        if (typeof this.ctx.emptyProfile === 'undefined') {
+            this.ctx.emptyProfile = this.createEntity(
+                {
+                    id: this.ctx.emptyProfileId,
+                    settings: this.ctx.getConfiguredSettings(),
+                    title: isShowEmptyProfile ? this.ctx.emptyProfileTitle : undefined,
+                }
+            );
+        }
+        if (isShowEmptyProfile) {
+            profileEntries.push(this.ctx.emptyProfile);
+            this.vm.set({profileEntries});
+            this.picker.triggers.picker.setVisible(profileEntries.length > 0);
+        }
+        if (profileId) {
+            this.vm.set({
+                profileId,
+                appliedProfileId: profileId,
+            });
+        } else {
+            this.vm.set({
+                activeProfile: this.ctx.emptyProfile,
+                appliedProfileId: this.ctx.emptyProfile.id,
+            });
+            this.syncSettings();
+        }
+    },
+    onPickerChange(picker, id) {
+        id && id === this.ctx.getActiveProfileId() && this.syncSettings();
+    },
+    syncSettings() {
+        this.ctx.applyCurrentSettings(this.activeProfile);
+    },
+    async loadEntries() {
+        const profileEntries = await this.ctx.getStore().load();
+        this.vm.set({profileEntries});
+        this.picker.triggers.picker.setVisible(profileEntries.length > 0);
+        return profileEntries;
+    },
+    createEntity(data = {}) {
+        return Ext.create(this.entityName, data);
+    },
+    clearHandler() {
+        this.vm.set({activeProfile: this.ctx.emptyProfile});
+        this.applyHandler();
+    },
+    applyHandler() {
+        if (!this.activeProfile) {
+            console.trace('No active profile');
+            return;
+        }
+        const appliedProfileId = this.activeProfile.id;
+        const settings = this.activeProfile.get('settings');
+        this.ctx.setActiveProfileId(appliedProfileId);
+        this.vm.set({appliedProfileId});
+        this.ctx.setSettings(settings);
+        this.vm.notify();
+        this.ctx.getWrapper().destroy();
+    },
+    createHandler() {
+        const profileId = this.vm.get('profileId');
+        const settings = profileId ? this.activeProfile.get('settings') : this.ctx.getSettings();
+        const newProfile = this.createEntity({settings, isDefault: this.activeProfile.get('isDefault')});
+        newProfile.beginEdit();
+        this.vm.set({
+            prevProfileId: profileId,
+            activeProfile: newProfile,
+            isEditMode: true,
+        });
+    },
+    cancelHandler() {
+        this.activeProfile.reject();
+        const prevProfileId = this.vm.get('prevProfileId');
+        if (prevProfileId) {
+            this.vm.set('profileId', prevProfileId);
+        } else {
+            this.titleEditor.reset();
+            this.vm.set('activeProfile', this.ctx.emptyProfile);
+        }
+        this.vm.set({
+            prevProfileId: null,
+            isEditMode: false,
+        });
+        this.vm.notify();
+    },
+    renameHandler() {
+        this.vm.set({
+            prevProfileId: this.activeProfile.getId(),
+            isEditMode: true,
+        });
+        this.activeProfile.beginEdit();
+        this.vm.notify();
+    },
+    async saveHandler() {
+        try {
+            this.activeProfile.endEdit();
+            this.activeProfile.commit();
+            await this.ctx.getStore().save(this.activeProfile);
+            await this.loadEntries();
+            this.applyHandler();
+            return true;
+        } catch (e) {
+            if (e.message === 'UNIQUENESS') {
+                const fields = e.cause || [];
+                if (fields.includes('title')) {
+                    Ext.Msg.show({
+                        title: 'Изменение настроек существующего профиля',
+                        message: `Данный профиль уже существует. Обновить его настройки?`,
+                        icon: Ext.Msg.QUESTION,
+                        buttons: Ext.Msg.OKCANCEL,
+                        fn: async (btn) => {
+                            if (btn === 'ok') {
+                                const {isDefault, settings, title} = this.activeProfile.data;
+                                const profilesStore = this.vm.getStore('profilesStore');
+                                const existing = profilesStore.findRecord('title', title);
+                                if (existing) {
+                                    existing.set('settings', settings);
+                                    existing.set('isDefault', isDefault);
+                                    this.vm.set({'activeProfile': existing, 'isEditMode': false});
+                                    return await this.saveHandler();
+                                }
+                            }
+                        },
+                    });
+                }
+            } else {
+                Coon.log.error(e.message);
+                Ext.Msg.show({
+                    title: 'Ошибка',
+                    message: `Произошла ошибка при сохранении: ${e.message}`,
+                    icon: Ext.Msg.ERROR,
+                    buttons: Ext.Msg.OK,
+                });
+                return false;
+            }
+        }
+    },
+    async removeHandler() {
+        Ext.Msg.confirm(
+            this.vm.get('titles.removeDialogTitle'),
+            this.vm.get('titles.removeDialogText'),
+            async (btn) => {
+                if (btn === 'yes') {
+                    const id = this.vm.get('profileId');
+                    await this.ctx.getStore().remove(id);
+                    this.activeProfile.drop();
+                    await this.loadEntries();
+                    this.clearHandler();
+                }
+            }
+        );
+    },
+    toggleDetails: (panel) => panel.publishState('collapsed', Boolean(panel.toggleCollapse().getCollapsed())),
+    onShowTitleEditor(titleEditor) {
+        titleEditor.selectText().focus();
+        titleEditor.validate();
+    },
+    addCreateButton(toast) {
+        toast.setBtn({text: 'Создать', handler: this.createHandler.bind(this)});
+    },
+});

package/src/report/plugin/comboBtnWrapper.js

@@ -1,27 +1,27 @@
-Ext.define('Coon.report.plugin.comboBtnWrapper', {
-    extend: 'Ext.form.FieldContainer',
-    xtype: 'comboBtnWrapper',
-
-    layout: {
-        type: 'hbox',
-        align: 'stretch',
-    },
-
-    initComponent() {
-        const me = this;
-        const btnConfig = Ext.applyIf({
-            xtype: 'button',
-            iconCls: 'x-fa fa-search-location',
-            tooltip: 'найти обработчик в конфигурации',
-            listeners: {
-                click() {
-                    const combo = me.down('combobox');
-                    me.fireEvent('gotoeditor', combo && combo.getValue());
-                },
-            },
-        }, this.button);
-
-        this.items = [this.combobox, btnConfig];
-        this.callParent(arguments);
-    },
-});
+Ext.define('Coon.report.plugin.comboBtnWrapper', {
+    extend: 'Ext.form.FieldContainer',
+    xtype: 'comboBtnWrapper',
+
+    layout: {
+        type: 'hbox',
+        align: 'stretch',
+    },
+
+    initComponent() {
+        const me = this;
+        const btnConfig = Ext.applyIf({
+            xtype: 'button',
+            iconCls: 'x-fa fa-search-location',
+            tooltip: 'найти обработчик в конфигурации',
+            listeners: {
+                click() {
+                    const combo = me.down('combobox');
+                    me.fireEvent('gotoeditor', combo && combo.getValue());
+                },
+            },
+        }, this.button);
+
+        this.items = [this.combobox, btnConfig];
+        this.callParent(arguments);
+    },
+});

package/src/report/plugin/configPanel/ChangeFieldValuePluginConfigGrid.js

@@ -1,110 +1,110 @@
-Ext.define('Coon.report.plugin.configPanel.ChangeFieldValuePluginConfigGrid', {
-    extend: 'Ext.grid.Panel',
-    alias: 'widget.ChangeFieldValuePluginConfigGrid',
-    uses: [],
-    requires: [
-        'Coon.report.model.CharacteristicBeanFields',
-        'Coon.report.store.SimpleCharacteristicListStore',
-        'Coon.Function'
-    ],
-    alternateClassName: 'Sigma.common.grid.plugin.configPanel.ChangeFieldValuePluginConfigGrid',
-
-    title: 'Значения полей',
-    loadMask: true,
-    initComponent: function() {
-        this.plugins = [
-            Ext.create('Coon.report.plugin.grid.CopyRowsFromGrid'),
-            {ptype: 'cellediting', clicksToEdit: 1}
-        ];
-
-        this.dockedItems = [{
-            xtype: 'toolbar',
-            dock: 'top',
-            itemId: 'toptoolbar',
-            items: [
-                {
-                    xtype: 'button',
-                    text: 'Добавить',
-                    ui: 'blue-text-button-border',
-                    handler: Ext.bind(this.addHandler, this),
-                },
-                {
-                    xtype: 'button',
-                    text: 'Удалить',
-                    ui: 'blue-text-button-border',
-                    handler: Ext.bind(this.deleteHandler, this),
-                }
-            ],
-        }];
-
-        this.store = Ext.create('Coon.report.store.SimpleCharacteristicListStore');
-
-        const ns = Coon.report.model.CharacteristicBeanFields;
-
-        this.columns = {
-            items: [
-                {header: 'Поле', dataIndex: ns.$type, xtype: 'hintColumn', editor: this.fieldEditor, width: 180},
-                {
-                    header: 'Значение',
-                    dataIndex: ns.$value,
-                    xtype: 'hintColumn',
-                    editor: Ext.create('Ext.form.field.Text', {
-                        allowBlank: true,
-                    }),
-                    flex: 1,
-                }
-            ],
-            defaults: {
-                sortable: true,
-            },
-        };
-        this.callParent();
-    },
-
-    /**
-     * Инициализация
-     */
-    doInit: function(list) {
-        if (!Ext.isEmpty(list) && !Ext.isArray(list)) {
-            list = [list];
-        }
-        this.load(list);
-    },
-
-    // private
-    load: function(list) {
-        this.getStore().loadData(list || []);
-    },
-
-    getData: function() {
-        return Coon.Function.getDataFromStore(this.getStore(), false);
-    },
-
-    /**
-     * Перезагрузить содержимое таблицы
-     */
-    reload: function() {
-        this.getStore().reload();
-    },
-
-    /**
-     * Очистка
-     */
-    clear: function() {
-        this.getStore().removeAll();
-    },
-
-    addHandler: function() {
-        const newRecord = Ext.create('Coon.report.model.CharacteristicBean');
-        this.getStore().add(newRecord);
-        const editor = this.findPlugin('cellediting');
-        editor.startEditByPosition({row: this.getStore().getCount() - 1, column: 0});
-    },
-
-    deleteHandler: function() {
-        const record = this.getSelectionModel().getSelection()[0];
-        if (record) {
-            this.getStore().remove(record);
-        }
-    },
-});
+Ext.define('Coon.report.plugin.configPanel.ChangeFieldValuePluginConfigGrid', {
+    extend: 'Ext.grid.Panel',
+    alias: 'widget.ChangeFieldValuePluginConfigGrid',
+    uses: [],
+    requires: [
+        'Coon.report.model.CharacteristicBeanFields',
+        'Coon.report.store.SimpleCharacteristicListStore',
+        'Coon.Function'
+    ],
+    alternateClassName: 'Sigma.common.grid.plugin.configPanel.ChangeFieldValuePluginConfigGrid',
+
+    title: 'Значения полей',
+    loadMask: true,
+    initComponent: function() {
+        this.plugins = [
+            Ext.create('Coon.report.plugin.grid.CopyRowsFromGrid'),
+            {ptype: 'cellediting', clicksToEdit: 1}
+        ];
+
+        this.dockedItems = [{
+            xtype: 'toolbar',
+            dock: 'top',
+            itemId: 'toptoolbar',
+            items: [
+                {
+                    xtype: 'button',
+                    text: 'Добавить',
+                    ui: 'blue-text-button-border',
+                    handler: Ext.bind(this.addHandler, this),
+                },
+                {
+                    xtype: 'button',
+                    text: 'Удалить',
+                    ui: 'blue-text-button-border',
+                    handler: Ext.bind(this.deleteHandler, this),
+                }
+            ],
+        }];
+
+        this.store = Ext.create('Coon.report.store.SimpleCharacteristicListStore');
+
+        const ns = Coon.report.model.CharacteristicBeanFields;
+
+        this.columns = {
+            items: [
+                {header: 'Поле', dataIndex: ns.$type, xtype: 'hintColumn', editor: this.fieldEditor, width: 180},
+                {
+                    header: 'Значение',
+                    dataIndex: ns.$value,
+                    xtype: 'hintColumn',
+                    editor: Ext.create('Ext.form.field.Text', {
+                        allowBlank: true,
+                    }),
+                    flex: 1,
+                }
+            ],
+            defaults: {
+                sortable: true,
+            },
+        };
+        this.callParent();
+    },
+
+    /**
+     * Инициализация
+     */
+    doInit: function(list) {
+        if (!Ext.isEmpty(list) && !Ext.isArray(list)) {
+            list = [list];
+        }
+        this.load(list);
+    },
+
+    // private
+    load: function(list) {
+        this.getStore().loadData(list || []);
+    },
+
+    getData: function() {
+        return Coon.Function.getDataFromStore(this.getStore(), false);
+    },
+
+    /**
+     * Перезагрузить содержимое таблицы
+     */
+    reload: function() {
+        this.getStore().reload();
+    },
+
+    /**
+     * Очистка
+     */
+    clear: function() {
+        this.getStore().removeAll();
+    },
+
+    addHandler: function() {
+        const newRecord = Ext.create('Coon.report.model.CharacteristicBean');
+        this.getStore().add(newRecord);
+        const editor = this.findPlugin('cellediting');
+        editor.startEditByPosition({row: this.getStore().getCount() - 1, column: 0});
+    },
+
+    deleteHandler: function() {
+        const record = this.getSelectionModel().getSelection()[0];
+        if (record) {
+            this.getStore().remove(record);
+        }
+    },
+});

package/src/report/plugin/configPanel/ExecuteCommandButtonPluginConfigPanel.scss

@@ -1,5 +1,5 @@
-.addActionColumnMsg {
-	font-size: 15px;
-	margin: 0 0 0 12px;
-	color: red;
-}
+.addActionColumnMsg {
+	font-size: 15px;
+	margin: 0 0 0 12px;
+	color: red;
+}