ru.coon 3.0.73 → 3.0.75

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Version 3.0.75, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bca8dfcc721f5bf5f9150e54f382e6224565f427)
+* ## Fixes
+* <span style='color:red'> исправление в PeriodPickerPlugin сообщений minText и maxText</span> ([552b34], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/552b3430b8535edf87c420f54cc16f8d5dc03011))
+
+* HT-14725: исправление работы BindCustomPanelPlugin ([26547e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/26547e340cec89c0019b98ddf5c3ecd6a8b24438))
+* HT-14681 исправление ошибки редактирования характеристик ([bb5a7a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb5a7acab1af722623ef497234221bd3762a7b50))
+* HT-15218: исправление ошибки формирования itemId ([b233ed], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b233ed8ba44305ca10acc8a1062573bbe7250124))
+* update: CHANGELOG.md ([c0892b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0892bd2441c94e5168773b008a262b28a31b39d))
+
+# Version 3.0.74, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/723e4a3b5562fe1ce81ea131cba9987cfe286001)
+* HT-10758: исправление доступности кнопок в зависимости от типа параметра ([db308d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/db308d95a02df99e875998bc2039380dff4c87c7))
+* update: CHANGELOG.md ([734d0f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/734d0fed9b45fffbff8d29a7b43723e06d9265fb))
+
 # Version 3.0.73, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d77f15a5f3bbd05c134e65d32edab3f7cbb2b80f)
 * ## Features
 * <span style='color:green'>feat: HT-12053: Добавил возможность изменить xtype кнопки, что позволит использовать split, segmented и кастомные кнопки</span> ([b0f2e7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b0f2e72e4115266d83b9a39028159169355d2e73))

package/package.json

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

package/src/app/Application.js

@@ -92,7 +92,7 @@ Ext.define('Coon.app.Application', {
 
     reAuthorize(action) {
         if (action === 'show') {
-            this.reAuthWindow = this.getReAuthWindow();
+            this.reAuthWindow = this.reAuthWindow || this.getReAuthWindow();
             this.reAuthWindow.show();
             return;
         }

package/src/common/component/editor/EditorFactory.js

@@ -348,17 +348,9 @@ Ext.define('Coon.common.component.editor.DFVTypeEditor', {
             this.field.on('load', function() {
                 this.field.setValue(value);
             }, this, {single: true});
-            this.field.on('select', this.afterEdit, this);
             this.field.doInit();
         }
     },
-
-    afterEdit: function() {
-        this.completeEdit && this.completeEdit();
-        if (this.boundEl || (this.context && this.context.getCell)) {
-            this.restoreCell();
-        }
-    },
 });
 
 /**

package/src/common/component/editor/TypedCharacteristicEditor.js

@@ -382,7 +382,11 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
         this.activeEditor = this.factory.getEditorForType(record, this.context);
         this.activeEditor.editingPlugin = this.editingPlugin;
         this.activeEditor.grid = this;
-        return this.activeEditor;
+        if (this.activeEditor.field && this.activeEditor.field.externalEditor) {
+            return false;
+        } else {
+            return this.activeEditor;
+        }
     },
 
     applyContext: function(context) {

package/src/common/field/OpenDialogField.js

@@ -3,6 +3,8 @@ Ext.define('Coon.common.field.OpenDialogField', {
     alternateClass: 'SigmaUtilities.view.common.field.OpenDialogField',
     alias: 'widget.OpenDialogField',
 
+    externalEditor: true,
+
     dialogForm: undefined,
 
     setValue: function(value) {

package/src/common/plugin/form/PeriodPickerPlugin.js

@@ -18,6 +18,8 @@ Ext.define('Coon.common.plugin.form.PeriodPickerPlugin', {
 
     init: function(component) {
         component.format = component.hasOwnProperty('format') ? component.format : this.defaultFormat;
+        component.minText = this.minText;
+        component.maxText = this.maxText;
         component.createPicker = function() {
             const me = this;
 
@@ -30,6 +32,8 @@ Ext.define('Coon.common.plugin.form.PeriodPickerPlugin', {
                 focusOnShow: true,
                 minDate: me.minValue,
                 maxDate: me.maxValue,
+                minText: Ext.String.format(me.minText, me.formatDate(me.minValue)),
+                maxText: Ext.String.format(me.maxText, me.formatDate(me.maxValue)),
                 format: me.format,
                 listeners: {
                     scope: me,

package/src/overrides/grid/feature/Grouping.js

@@ -0,0 +1,15 @@
+Ext.define('Coon.overrides.grid.feature.Grouping', {
+    override: 'Ext.grid.feature.Grouping',
+
+}, function() {
+    Ext.Function.interceptBefore(this.prototype, 'onGroupClick', function() {
+        if (
+            this.grid &&
+            this.grid.activeEditor &&
+            !this.grid.activeEditor.destroyed &&
+            this.grid.activeEditor.completeEdit
+        ) {
+            this.grid.activeEditor.completeEdit();
+        }
+    });
+});

package/src/report/component/reportpanel/NorthPanel.js

@@ -166,7 +166,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
     },
 
     configureFilterPanel: function(reportFormBean) {
-        this.reportPanel = this.reportPanel || this.up('ReportPanel');
+        this.reportPanel = this.reportPanel || this.up('ReportPanel,ReportFilterForm');
         const properties = this.reportPanel && this.reportPanel.configProperties ||
             Coon.Function.convertAdvancedProperties(reportFormBean.properties) || {};
         Ext.merge(this, properties);

package/src/report/component/settings/context/ReportFormContextParametersGrid.js

@@ -28,6 +28,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
     },
 
     initComponent: function() {
+        const me = this;
         this.storeForSELR = [
             {
                 value: 'CVW',
@@ -102,6 +103,8 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             allowBlank: false,
         });
 
+        this.fullValueEditorCombo = this.getFullValueEditorCombo();
+
         const valueDefaultEditor = Ext.create('Ext.form.field.Text', {
             allowBlank: false,
         });
@@ -132,7 +135,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                     dataIndex: 'reportNavigationOptionContextSourceValue',
                     xtype: 'hintColumn',
                     width: 130,
-                    editor: this.valueEditor,
+                    editable: true,
                     renderer: Ext.bind(function(value, meta, record) {
                         const type = record.get('reportNavigationOptionContextSource');
                         let visibleValue;
@@ -140,16 +143,28 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                         let found;
                         if (type === 'FLD') {
                             found = this.fieldsStore.findRecord('value', value);
-                            visibleValue = found && found.get('description');
+                            visibleValue = found && (`${found.get('value')} (${found.get('description')})`);
                         } else if (type === 'PRM') {
                             found = this.paramsStore.findRecord('value', value);
-                            visibleValue = found && found.get('description');
+                            visibleValue = found && (`${found.get('value')} (${found.get('description')})`);
                         } else if (type === 'SELR' || type === 'ALLR' || type === 'RCRD' || type === 'MDFD' || type === 'CHCK') {
                             found = this.storeForSELR.find((obj) => obj.value === value);
                             visibleValue = found && found.description;
                         }
                         return Coon.format.withHint(visibleValue);
                     }, this),
+                    getEditor: function(record) {
+                        const type = record.get('reportNavigationOptionContextSource');
+                        let editor;
+                        if (['PRM', 'FLD'].includes(type)) {
+                            editor = me.fullValueEditorCombo;
+                        } else {
+                            editor = me.valueEditor;
+                        }
+                        return Ext.create('Ext.grid.CellEditor', {
+                            field: editor,
+                        });
+                    },
                 },
                 {
                     text: 'Значение по умолчанию',
@@ -235,6 +250,37 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         }, this);
     },
 
+    getFullValueEditorCombo() {
+        const {$reportField, $description, $reportFieldTypeLookup} =
+            Coon.report.model.ReportFieldMaintenanceBeanFields;
+        const fieldTypeStyle =
+            'opacity:.8;background-color:lightgrey;font-size:.7rem;padding:2px 4px;';
+        const listItemTpl = Ext.create(
+            'Ext.XTemplate',
+            '<ul class="x-list-plain"><tpl for=".">',
+            '<li role="option" class="x-boundlist-item">',
+            `<b>{[values["${$reportField}"]]}</b> : <i style="${fieldTypeStyle}">{[values["${$reportFieldTypeLookup}"]]}</i>`,
+            '<tpl if="description.length">',
+            `<div style="opacity:.8;font-size: 1rem;"><i>{[values["${$description}"]]}</i></div>`,
+            '</tpl>',
+            '</li>',
+            '</tpl></ul>'
+        );
+        return Ext.create(
+            'Coon.report.component.SimplestReportCombo',
+            {
+                valueField: $reportField,
+                displayField: $reportField,
+                listConfig: {
+                    tpl: listItemTpl,
+                },
+                displayTpl: new Ext.XTemplate(
+                    '<tpl>{[values[0].reportFieldCd]} ({[values[0].description]})</tpl>'
+                ),
+            }
+        );
+    },
+
     /**
      * Инициализация
      */
@@ -323,9 +369,11 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             switch (type) {
             case 'FLD':
                 list = Coon.Function.serializeRecords(this.fieldsStore.getRange());
+                this.fillFullValueCombo(this.fieldsStore.getRange());
                 break;
             case 'PRM':
                 list = Coon.Function.serializeRecords(this.paramsStore.getRange());
+                this.fillFullValueCombo(this.paramsStore.getRange());
                 break;
             case 'RCRD':
             case 'ALLR':
@@ -342,10 +390,29 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         }
     },
 
+    fillFullValueCombo(data) {
+        const {$reportField, $description, $reportFieldTypeLookup} =
+            Coon.report.model.ReportFieldMaintenanceBeanFields;
+        const columnsData = [];
+        data.forEach((item) => {
+            // const fieldData = item.getData();
+            const description = Ext.util.Format.stripTags(
+                String(item.get('description')).replaceAll('<br>', ' ')
+            );
+            columnsData.push({
+                [$description]: description || '',
+                [$reportField]: item.get('value'),
+                [$reportFieldTypeLookup]: item.get('typeLookup'),
+            });
+        });
+        this.fullValueEditorCombo.getStore().loadData(columnsData);
+    },
+
     changeFieldsList: function(fields) {
         const cvList = fields.map((field) => ({
             value: field['reportFieldCd'],
             description: field['description'],
+            typeLookup: field['reportFieldTypeLookup'],
         }));
         this.fieldsStore.loadData(cvList);
     },
@@ -354,6 +421,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         const cvList = parameters.map((param) => ({
             value: param['reportParameterCd'],
             description: param['description'],
+            typeLookup: param['reportParameterTypeLookup'],
         }));
         this.paramsStore.loadData(cvList);
     },

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

@@ -208,7 +208,6 @@ Ext.define('Coon.report.plugin.configPanel.BindCustomPanelPluginConfigPanel', {
                         items: [
                             this.createDependsOnGridRow(),
                             this.createDependsOnGridParameter(),
-                            // panelCombo,
                             {
                                 xtype: 'container',
                                 layout: {
@@ -346,6 +345,31 @@ Ext.define('Coon.report.plugin.configPanel.BindCustomPanelPluginConfigPanel', {
                                     }
                                 ],
                             },
+                            {
+                                xtype: 'checkbox',
+                                boxLabel: 'Блокировка и очистка компонента, если не выбрана строка',
+                                boxLabelAlign: 'before',
+                                checked: true,
+                                margin: '20 0 0 0',
+                                name: 'enableOnlyWhenSelected',
+                                bind: '{enableOnlyWhenSelected}',
+                            },
+                            {
+                                xtype: 'container',
+                                width: '100%',
+                                margin: '0 0 15 0',
+                                bind: {
+                                    hidden: '{!enableOnlyWhenSelected}',
+                                },
+                                html: `
+                                    <div style="font-size:12px;padding:0 0 0 10px;color:gray">
+                                        <p style="margin:0">Если в качестве компонента выбран Репорт, 
+                                        очистка будет осуществлена автоматически.</p>
+                                        <p style="margin:0">В ином случае, будет вызвано событие 
+                                        <span style="font-weight: 800;">"clearComponentData"</span>.</p>
+                                    </div>
+                                `,
+                            },
                             {
                                 xtype: 'checkbox',
                                 boxLabel: 'Выключить обработку параметров',
@@ -380,19 +404,72 @@ Ext.define('Coon.report.plugin.configPanel.BindCustomPanelPluginConfigPanel', {
         ];
     },
 
+    createDependsOnGridRow() {
+        return {
+            xtype: 'fieldset',
+            title: 'ВСЕГДА зависит от строки отчета',
+            checkboxToggle: true,
+            checkbox: {
+                name: 'dependOnGridRow',
+                readOnly: true,
+                disabled: true,
+                checked: true,
+            },
+            defaults: {
+                flex: 1,
+            },
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'container',
+                    width: '100%',
+                    html: `
+                        <div style="font-size:12px;color: red">
+                            <p>Данное свойство в плагине является неизменяемым!</p>
+                            <ul style="padding:0 0 0 15px; color: gray">Логика работы:
+                            <li>Компонент, указанный в плагине, будет получать входные параметры при выборе сроки отчета.</li>
+                            </ul>
+                        </div>
+                    `,
+                }
+            ],
+        };
+    },
+
     setContext: function(context) {
         this.context = context;
+        this.setDependOnGridParameterData();
         this.grid.changeFieldsList(context.fields);
         this.grid.changeParametersList(context.parameters);
         this.grid.updateTypeEditor(context.additionalContext);
     },
 
+    setDependOnGridParameterData() {
+        const dependOnGridParameter = this.down('[name=dependOnGridParameters]');
+        if (dependOnGridParameter) {
+            const data = this.context.parameters.map((item) => {
+                item.descriptionFull = `${item.reportParameterCd} (${item.description})`;
+                return item;
+            });
+            dependOnGridParameter.getStore().loadData(data);
+        }
+    },
+
     doInit: function(config) {
         this.callParent(arguments);
         this.grid.doInit(this.convertParameters(config['parameters']) || []);
         const panelXTypeField = this.lookup('panelXTypeField');
         this.propertiesGrid.setData(this.convertProperties(config['properties']) || []);
         this.initPanelXType(panelXTypeField, panelXTypeField.getValue());
+
+        const dependOnGridRow = this.down('[name=dependOnGridRow]');
+        if (!config.dependOnGridRow) {
+            config.dependOnGridRow = true;
+            dependOnGridRow.setValue(true);
+        }
     },
 
     getConfiguration: function() {

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

@@ -243,10 +243,8 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
                 param.editable ? requiredMultiParameters.push(param) : notRequiredMultiParameters.push(param);
                 multiDependencyParameters.push(param);
                 onlyIndependentParameters = false;
-            } else if (param.reportNavigationOptionContextSource === 'DFLT') {
-                reportIndependentParameters.push(param);
             } else {
-                onlyIndependentParameters = false;
+                (param.reportNavigationOptionContextSource === 'DFLT') && reportIndependentParameters.push(param);
             }
         });
 

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

@@ -104,7 +104,7 @@ Ext.define('Coon.report.plugin.grid.ToolbarItemPlugin', {
                 position: this.position,
                 sortSequence: this.sortSequence,
                 pType: this.pluginConfig ? this.pluginConfig.ptype : '',
-                itemId: this.pluginId,
+                itemId: 'p_' + this.pluginId,
             };
             if (!this.position || isNaN(Number(this.position)) || Number(this.position) <= 0) {
                 cfg.position = this.sortSequence;

package/src/report/plugin/report/BindCustomPanelPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.report.plugin.report.BindCustomPanelPlugin', {
-    extend: 'Ext.AbstractPlugin',
+    extend: 'Coon.report.plugin.grid.GridToolbarButtonPlugin',
     alias: 'plugin.BindCustomPanelPlugin',
     uses: [
         'Coon.report.component.ReportPanel'
@@ -45,6 +45,7 @@ Ext.define('Coon.report.plugin.report.BindCustomPanelPlugin', {
                 this.panel = Ext.widget(this.panelXType, properties);
             }
             this.report.addSidePanel(this.panel, this.position, config);
+            this.inputParametersConfig = this.getInputParametersConfig();
             this.afterCreatePanel(config);
         }, this);
     },
@@ -86,20 +87,16 @@ Ext.define('Coon.report.plugin.report.BindCustomPanelPlugin', {
             contextPlugin.buildParamsOnContextChange(events, this.parameters, initPanelCallback);
         };
 
-        addContextEventsListener(['load']);
+        addContextEventsListener(['load', 'clear', 'selectionchange', 'filterchange']);
+        this.panel.on('save', this.saveHandler, this);
+        if (this.reloadAfterComplete && this.panelXType === 'ReportPanel') {
+            this.panel.on('needReload', this.saveHandler, this);
+        };
 
-        if (this.dependOnGridRow) {
-            addContextEventsListener(['clear', 'selectionchange', 'filterchange']);
-            this.panel.on('save', this.saveHandler, this);
-            if (this.reloadAfterComplete && this.panelXType === 'ReportPanel') {
-                this.panel.on('needReload', this.saveHandler, this);
-            }
-            contextPlugin.executeFunction(this.parameters, initPanelCallback);
-        } else if (this.dependOnGridParameters) {
-            addContextEventsListener(['clear']);
-        } else {
-            contextPlugin.executeFunction(this.parameters, initPanelCallback);
-        }
+        this.enableOnlyWhenSelected = this.enableOnlyWhenSelected === undefined ? true : this.enableOnlyWhenSelected;
+        this.panel.setDisabled(this.enableOnlyWhenSelected);
+
+        this.doInitOnReady(contextPlugin.getParameters(this.parameters));
         this.panel.on('close', this.closeHandler, this);
     },
 
@@ -122,13 +119,53 @@ Ext.define('Coon.report.plugin.report.BindCustomPanelPlugin', {
         }
     },
 
+    doInitOnReady(parameters) {
+        if (this.panelXType === 'UiCustomPanel') {
+            this.panel.on('add', () => {
+                this.doInitDependForm(parameters);
+            });
+        } else if (this.panelXType === 'ReportPanel') {
+            this.panel.on('configured', () => {
+                this.doInitDependForm(parameters);
+            }, this, {single: true});
+        } else {
+            this.panel.on('afterrender', () => {
+                this.doInitDependForm(parameters);
+            }, this, {single: true});
+        }
+    },
+
     doInitDependForm: function(params) {
+        const state = this.computeState();
         if (!params.params) {
             params.params = Ext.apply({}, params);
         }
         if (this.panel.currentParamList && this.mergeParameters) {
             params.params = Ext.applyIf(params.params, this.panel.currentParamList);
         }
-        Coon.Function.executeComponentDoInit(this.panel, params);
+        if (!state.disabled) {
+            this.enableOnlyWhenSelected && this.panel.setDisabled(false);
+            Coon.Function.executeComponentDoInit(this.getTargetComponent(), params);
+        } else if (this.enableOnlyWhenSelected) {
+            this.panel.setDisabled(true);
+            this.clearTargetComponent();
+        }
+    },
+
+    getTargetComponent() {
+        if (this.panelXType === 'UiCustomPanel') {
+            return this.panel.uiPanel;
+        } else {
+            return this.panel;
+        }
+    },
+
+    clearTargetComponent() {
+        if (this.panelXType === 'ReportPanel') {
+            this.panel.clearFilter();
+            this.panel.clearData();
+        } else {
+            this.panel.fireEvent('clearComponentData');
+        }
     },
 });

package/src/uielement/component/UiCPWrapper.js

@@ -126,12 +126,8 @@ Ext.define('Coon.uielement.component.UiCPWrapper', {
         if (Array.isArray(this.customBubbleEvents) && this.customBubbleEvents.length) {
             this.setCustomBubbleEvents(panel);
         }
-        this.on('activate', () => {
-            panel.fireEvent('activate');
-        });
-        this.on('deactivate', () => {
-            panel.fireEvent('deactivate');
-        });
+
+        panel.relayEvents(this, ['activate', 'deactivate']);
         panel.on('dirtychange', (component, state) => {
             this.fireEvent('dirtychange', this, state);
         });

package/src/version.js

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