ru.coon 2.6.0 → 2.6.3

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# Version 2.6.3, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f79e922e4a2767df64ca69e459661b9e24e9098e)
+* ## Fixes
+* <span style='color:red'>fix uiElement/get request</span> ([edac67], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/edac674cb5d023de5ad274262db6d619de7d50fd))
+* <span style='color:red'> Added 'nullable' then using command.GetUIElementCommand. Related to TR-67200.</span> ([dbc2bb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dbc2bbb53c333bab4d0e659cc4118de4e920a299))
+
+* update: CHANGELOG.md ([1e55ff], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e55ff88b8c2f2a8c0b71674c719a0daa1e2dbc3))
+
+# Version 2.6.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b12213a59d39c7fd13513b74268eb902a0c86720)
+* ## Features
+* <span style='color:green'>feat: Добавлено редактирование значений по умолчанию для плагинов. Closes TR-67200.</span> ([cd9502], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cd950235c2b0180f2b73fb87dc3b05a4f5b397ae))
+
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/report/component/settings/plugin/ReportFormPluginPanelController.jsb52d37cb6c33e6a74d2f3d7cae1654f93b60a2e1))
+* update: CHANGELOG.md ([bb6944], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb6944320af0388b296ad97429195c6188908738))
+
+# Version 2.6.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b7d5d8cd09bf94320d149f9cf3aa78ef27594a8)
+* ## Fixes
+* <span style='color:red'> HT-7281 GridEditorPlugin editor dependField</span> ([e9c537], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e9c53704ee957042292ed639343bf217c8cdeca8))
+
+* HT-8006 hotfix ([6569c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6569c3b6e197471fabb6af4da5c3212fd7079be2))
+* update: CHANGELOG.md ([e7b502], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7b50227f8ddeaac7322ce3e436c2c0b5fd12163))
+
 # Version 2.6.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78a28499d4ba7dc466ba5ff5a4b815d191c349bf)
 * ## Features
 * <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([9af20a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af20aa30d2b1fa494994e0cf7d84b26b19604e0))
@@ -13,6 +34,9 @@
 * <span style='color:green'>feat: HT-7969: view group description, fix fields name in chain</span> ([e19b98], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e19b98356ac3738d40afdd92401d8433d3b86056))
 
 * Resolve HT-7568 ([eb0297], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb0297d1927ae6e2d3a8d492d368d5ea7bef89ef))
+* Revert "feat: Добавлено предупреждение при выборе дефолтной конфигурации плагина. Closes TR-67200."
+
+This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/312854f7d59d711c9921f394c6849d398e529e10))
 * HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([ff9d88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff9d88c6e8f12d59ea7fd4f8be344696670d13af))
 * update: CHANGELOG.md ([fed09b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fed09bab2391b2ef0adde36107c4c8e9f8e9ad32))
 
@@ -95,6 +119,9 @@
 * update: CHANGELOG.md ([44feda], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44fedab2d737c9d50e1f3bb802ab16f7af5d581c))
 
 # Version 2.5.57, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98c71c4543fd95e80906b6fff0c955031a86eca1)
+* ## Features
+* <span style='color:green'>feat: Добавлено предупреждение при выборе дефолтной конфигурации плагина. Closes TR-67200.</span> ([92855b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/92855b1225a747f15d977c0f23c8d9794523352d))
+
 * ## Fixes
 * <span style='color:red'> CRM-8102 Возвращена настройка additionalFields  в SimplestReportCombo и SimpleReportTag</span> ([8a1afb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a1afb48b9e6c23b91649a20fc08b7e2405209b0))
 * <span style='color:red'> HT-7440 Исправлено некорректное отображение кнопок maximize/restore при...</span> ([fa605d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fa605dcd97c3fadd4707b7f72cfdffea616d7a12))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.6.0",
+  "version": "2.6.3",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/report/component/reportpanel/ReportGrid.scss

@@ -17,7 +17,7 @@
     }
   }
 
-  &:has(.hover-style:hover, .create-line-left:hover) .create-line-left::before{
+  &:has(.hover-cell:hover, .editable-cell:hover) .editable-cell::before{
     content: " ";
     background: #BDBDBD;
     width: 3px;

package/src/report/component/settings/plugin/ReportFormPluginGridController.js

@@ -72,7 +72,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
 
     addHandler: function(xtype) {
         const defaultUiElementCd = `${xtype}_DEFAULTS`;
-        Coon.util.promisifyCmd('command.GetUIElementCommand', defaultUiElementCd)
+        Coon.util.promisifyCmd('command.GetUIElementCommand', defaultUiElementCd, true)
             .then(function(data) {
                 this.addNewPlugin(xtype, Ext.decode(data.propertyData, true), defaultUiElementCd);
             }.bind(this))

package/src/report/component/settings/plugin/ReportFormPluginPanelController.js

@@ -1,7 +1,7 @@
 Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.reportformpluginpanelcontroller',
-
+    requires: ['Coon.report.plugin.util'],
     init: function(view) {
         this.getViewModel().bind({bindTo: '{pluginsGrid.selection}'}, this.selectionChange, this);
         this.getViewModel().bind({bindTo: '{report.fields}', deep: true}, this.updateContext, this);
@@ -16,11 +16,6 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanelControlle
 
     saveState: function() {
         if (this.activeRecord && this.activePanel) {
-            this.activePanel.isModified().then((isModified) => {
-                if (isModified) {
-                    // TODO show message
-                }
-            });
             const data = this.activePanel.getData();
             if (data instanceof Promise) {
                 const currentRecord = this.lookup('pluginsGrid').getStore().getById(this.activeRecord.get('id'));
@@ -107,11 +102,24 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanelControlle
         const record = this.getViewModel().get('pluginsGrid.selection');
         if (record) {
             const xtype = record.get('xtype');
-            const ptype = Ext.ClassManager.aliasToName['plugin.' + xtype] ||
-                Ext.ClassManager.aliasToName['widget.' + xtype] ||
-                Ext.ClassManager.aliasToName['feature.' + xtype];
-            if (!ptype || !Coon.report.ReportEntity.isAliasExist(xtype)) {
-                Coon.log.log(`У UiElement:${record.get('uiElement')} нет type, невозможно определить конфигурацию`);
+            try {
+                this.activePanel = Ext.create(
+                    Coon.report.plugin.util.getConfigPanelClassName(
+                        xtype,
+                        this.getViewModel().get('formEditor')
+                    ) || 'SpecificPluginConfig',
+                    {
+                        readOnly: record.get('readOnly'),
+                        isNew: record.get('isNew'),
+                        bind: {
+                            data: '{pluginsGrid.selection.jsonProperties}',
+                        },
+                    }
+                );
+            } catch (e) {
+                Coon.log.log(
+                    `У UiElement:${record.get('uiElement')} нет type, невозможно определить конфигурацию`
+                );
                 this.activePanel = Ext.create({
                     xtype: 'displayfield',
                     value: `данный ${xtype} не найден в списке плагинов, удалите его`,
@@ -123,37 +131,6 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanelControlle
                 paramPanel.add(this.activePanel);
                 return;
             }
-            const typePrototype = ptype && Ext.ClassManager.classes[ptype].prototype;
-            const classNameField = this.getViewModel().get('formEditor') ? 'configurePanelWizardForFormEditor' : 'configurePanelWizard';
-            const className = typePrototype && (typePrototype[classNameField] ||
-                (typePrototype.config && typePrototype.config[classNameField]));
-            if (className) {
-                try {
-                    const currentClass = Ext.ClassManager.aliasToName['widget.' + className] ||
-                        Ext.ClassManager.aliasToName['plugin.' + className];
-                    if (currentClass) {
-                        this.activePanel = Ext.create(currentClass, {
-                            readOnly: record.get('readOnly'),
-                            isNew: record.get('isNew'),
-                            bind: {
-                                data: '{pluginsGrid.selection.jsonProperties}',
-                            },
-                        });
-                    }
-                } catch (e) {
-                    Ext.Msg.alert('Ошибка', 'Панель параметров не определена' + e);
-                    Coon.log.log(e);
-                }
-            } else {
-                this.activePanel = Ext.create({
-                    xtype: 'SpecificPluginConfig',
-                    bind: {
-                        data: '{pluginsGrid.selection.jsonProperties}',
-                    },
-                });
-            }
-
-
             if (this.activePanel && !this.activePanel.destroyed) {
                 paramPanel.add(this.activePanel);
 

package/src/report/component/settings/plugin/ReportFormPluginSettings.js

@@ -2,12 +2,15 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginSettings', {
     extend: 'Coon.common.panel.WindowWrap',
     requires: [
         'Coon.common.panel.UIElementPickerPanel',
-        'Coon.report.command.GetDynamicReportDataCommand'
+        'Coon.report.command.GetDynamicReportDataCommand',
+        'Coon.uielement.command.SaveUIElementCommand'
     ],
     xtype: 'ReportFormPluginSettings',
     autoShow: true,
     maximizable: false,
     selection: null,
+    resizable: false,
+    height: 180,
     viewModel: {
         data: {
             selection: null,
@@ -17,6 +20,8 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginSettings', {
             isConfirmed: false,
             canApply: false,
             isValidating: false,
+            defaultPropsIsLoading: true,
+            defaultProps: {},
         },
         formulas: {
             isDirty: (get) => {
@@ -25,14 +30,34 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginSettings', {
         },
     },
     constructor(config) {
+        let xtype;
         if (config.selection) {
+            xtype = config.selection.get('xtype');
             if (!config.title) {
-                config.title = 'Настройки плагина ' + config.selection.get('xtype');
+                config.title = 'Настройки плагина ' + xtype;
             }
         }
         this.callParent(arguments);
         const c = this.getController();
         c.vm = this.getViewModel();
+        if (xtype) {
+            const defaultUiElementCd = `${xtype}_DEFAULTS`;
+            c.vm.set('defaultPropsIsLoading', true);
+            Coon.util.promisifyCmd('command.GetUIElementCommand', defaultUiElementCd, true)
+                .then((data) => {
+                    this.defaultProps = Ext.decode(data.propertyData, true);
+                })
+                .catch((e) => {
+                    // отсутствуют сохраненные настройки по умолчанию
+                    c.vm.set('isNewDefaultProps', true);
+                })
+                .finally(() => {
+                    c.vm.set({
+                        defaultPropsIsLoading: false,
+                        defaultProps: this.defaultProps,
+                    });
+                });
+        }
         c.vm.set({
             selection: config.selection,
             newUiElementCd: config.selection && config.selection.get('uiElement'),
@@ -145,6 +170,71 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginSettings', {
                 ],
             });
         },
+        editDefaultsHandler() {
+            try {
+                const configPanelClassName =
+                    Coon.report.plugin.util.getConfigPanelClassName(
+                        this.vm.get('selection.xtype'),
+                        this.vm.get('formEditor')
+                    );
+                const configPanel = Ext.create(
+                    configPanelClassName || 'SpecificPluginConfig'
+                );
+                configPanelClassName && configPanel.setData(this.vm.get('defaultProps'));
+                const win = Ext.widget('WindowWrap', {
+                    title: 'Значения по умолчанию плагина ' + this.vm.get('selection.xtype'),
+                    autoShow: true,
+                    bodyPadding: 20,
+                    height: '90%',
+                    width: '60%',
+                    layout: 'fit',
+                    items: [configPanel],
+                    buttons: [
+                        {
+                            text: 'Закрыть',
+                            handler() {
+                                win.close();
+                            },
+                        },
+                        {
+                            text: 'Сохранить',
+                            ui: 'orange-button',
+                            handler: this.saveDefaultsHandler.bind(this, configPanel),
+                        }
+                    ],
+                });
+            } catch (e) {
+                console.error(e);
+                Ext.Msg.alert('Ошибка', 'Панель параметров не определена\n' + e);
+            }
+        },
+        saveDefaultsHandler(configPanel) {
+            const xtype = this.vm.get('selection.xtype');
+            if (!xtype) {
+                Ext.toast('"xtype" is not defined');
+                return;
+            }
+            // configPanel.getData() can return Promise
+            Ext.encode(Promise.resolve(configPanel.getData()).then((data) => {
+                Coon.util.promisifyCmd('command.SaveUIElementCommand', {
+                    id: xtype + '_DEFAULTS',
+                    description: 'default props',
+                    properties: {},
+                    propertyData: Ext.encode(data),
+                    xtype,
+                    isNew: this.vm.get('isNewDefaultProps'),
+                }).then((result) => {
+                    const defaultProps = Ext.decode(result.propertyData, true);
+                    const isNewDefaultProps = false;
+                    this.vm.set({defaultProps, isNewDefaultProps});
+                    configPanel.setData(defaultProps);
+                    Ext.toast('Значения по умолчанию сохранены.');
+                }).catch((e) => {
+                    console.error(e);
+                    Ext.Msg.alert('Ошибка', 'Значения по умолчанию не сохранены.');
+                });
+            }));
+        },
     },
     items: [
         {
@@ -192,6 +282,15 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginSettings', {
         }
     ],
     buttons: [
+        {
+            text: 'Редактировать значения по умолчанию',
+            ui: 'blue-button',
+            handler: 'editDefaultsHandler',
+            bind: {
+                disabled: '{defaultPropsIsLoading}',
+            },
+        },
+        '->',
         {
             text: 'Закрыть',
             ui: 'blue-button',

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

@@ -101,6 +101,9 @@ Ext.define('Coon.report.plugin.configPanel.BasePluginConfig', {
         }, this);
         this.on('added', (panel) => {
             this.parent = panel.up();
+            if (this.parent.isXType('window')) {
+                return;
+            }
             this.parent.addTool({
                 tooltip: 'Показать описание',
                 itemId: 'show-description-tool',

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

@@ -46,7 +46,6 @@ Ext.define('Coon.report.plugin.configPanel.UpdateGridPluginConfigPanel', {
     createItems: function() {
         this.markUpdatedCheckBox = Ext.create('Ext.form.field.Checkbox', {
             boxLabel: 'Выделять обновленные строки',
-            boxLabelAlign: 'before',
             name: 'markUpdated',
             value: true,
         });

package/src/report/plugin/grid/GridEditorsPlugin.js

@@ -53,9 +53,22 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                 if (Ext.isFunction(column.setEditor)) {
                     column.setEditor(editor);
                 }
-                if (editor.isXType('BaseComboBox') && column.useComboRenderer !== false) {
-                    column.renderer = Coon.format.comboRenderer(editor, column.renderer && column.renderer.customStyle);
-                }
+                let editable = true;
+                column.renderer = (value, metaData, record) => {
+                    if (editorObj['dependsOnField'] && editorObj['dependsOnFieldName']) {
+                        const dependsOnFieldName = editorObj['dependsOnFieldName'];
+                        const invertValue = editorObj['invertValue'];
+                        editable = invertValue === !record.get(dependsOnFieldName);
+                        record.allowEditWithEditorPlugin = editable;
+                        if (editorObj['highlightEditableCells']) {
+                            metaData.tdCls = editable ? 'editable-cell' : 'hover-cell';
+                        }
+                    }
+                    if (editor.isXType('BaseComboBox') && column.useComboRenderer !== false) {
+                        Coon.format.comboRenderer(editor, column.renderer && column.renderer.customStyle);
+                    }
+                    return value;
+                };
             }
         }
         hasEditor.on('beforeedit', function(editor, context) {
@@ -137,20 +150,6 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
         editor.on('beforeedit', function() {
             Ext.emptyFn();
         }, this);
-        let editable = true;
-        if (configuration['dependsOnField'] && configuration['dependsOnFieldName']) {
-            const editableColumn = this.grid.getColumns().find((col) => col.dataIndex === configuration[ns.$type]);
-            editableColumn.renderer = (value, metaData, record) => {
-                const dependsOnFieldName = configuration['dependsOnFieldName'];
-                const invertValue = configuration['invertValue'];
-                editable = invertValue === !record.get(dependsOnFieldName);
-                record.allowEditWithEditorPlugin = editable;
-                if (configuration['highlightEditableCells']) {
-                    metaData.tdCls = editable ? 'create-line-left' : 'hover-style';
-                }
-                return value;
-            };
-        }
         return editor;
     },
 });

package/src/report/plugin/grid/GridQuickSearchPlugin.js

@@ -120,6 +120,9 @@ Ext.define('Coon.report.plugin.grid.GridQuickSearchPlugin', {
 
     updateColumnHeaderByFilter: function(filter) {
         const columnData = this.columnsData[filter.dataIndex];
+        if (!columnData) {
+            return;
+        }
         const text = filter.value;
         const currentColumn = this.grid.getColumns()[columnData.index];
         if (!filter.active) {

package/src/report/plugin/util.js

@@ -0,0 +1,31 @@
+Ext.define('Coon.report.plugin.util', {
+    singleton: true,
+    requires: ['Coon.report.ReportEntity'],
+    /**
+     * Возвращает имя класса конфигурационной панели по xtype плагина
+     * @param xtype {String}
+     * @param isFormEditor {Boolean}
+     * @throws {Error}
+     * @returns {String}
+     */
+    getConfigPanelClassName(xtype, isFormEditor) {
+        const aliases = Ext.ClassManager.aliasToName;
+        const ptype =
+            aliases['plugin.' + xtype] ||
+            aliases['widget.' + xtype] ||
+            aliases['feature.' + xtype];
+        if (!ptype || !Coon.report.ReportEntity.isAliasExist(xtype)) {
+            throw new Error('Plugin type not found.');
+        }
+        const proto = ptype && Ext.ClassManager.classes[ptype].prototype;
+        const classNameField = isFormEditor ?
+            'configurePanelWizardForFormEditor' :
+            'configurePanelWizard';
+        const className =
+            proto &&
+            (proto[classNameField] || (proto.config && proto.config[classNameField]));
+        if (className) {
+            return aliases['widget.' + className] || aliases['plugin.' + className];
+        }
+    },
+});

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -71,6 +71,10 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
             items: panel,
         }, defaultWindowConfig || {}));
 
+        openWindow.on('close', function() {
+            panel.fireEvent('closeWindow');
+        });
+
         openWindow.on('afterrender', function() {
             const initArguments = {};
             for (const name in this.parameters) {

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.6.0',
+    number: '2.6.3',
 });