ru.coon 3.0.72 → 3.0.74

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 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))
+* <span style='color:green'> HT-14762 upd</span> ([f1b5a0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1b5a0f60dac47792011678fe46997acf8bbe28a))
+* <span style='color:green'> HT-14762 checkErrorsComponent</span> ([099a88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/099a889718fcf4638409802f99fce07e6f307958))
+
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update file CustomButtonPlugin.jse007992a055e82a1ad3bfcb7b4bfb2f643af375a))
+* upd ([16e891], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/16e891ac6eb9cd8713787a571571c12ef8aee409))
+* update: CHANGELOG.md ([f5084b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f5084bd2f86cfee8d31b470b2e9859905e08de21))
+
 # Version 3.0.72, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2f5896748cca4a1467fa9dedd00ed69b950c033)
 * ## Fixes
 * <span style='color:red'> исправление отображения кнопок репорта</span> ([45f49f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/45f49ff03cfd18a299ba92a73f415fc86f9c6bbf))
@@ -259,6 +273,7 @@
 * ## Fixes
 * <span style='color:red'>NEVA-947 fix UiCustomPanel reloadFrame</span> ([fa11cb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fa11cb33bf25866bf8a49035dd0121830cd9f5e3))
 
+* HT-9130 fix: change minWidth ([832f4a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/832f4ac2af931449cdf1bcb3ee6528ef2d560f97))
 * update: CHANGELOG.md ([0b19f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0b19f173f5285306bd642141ea01e5472782e44f))
 
 # Version 3.0.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/54a1adc38f21829b195830d3eced818bf79b9ae8)

package/package.json

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

package/src/common/component/CheckErrorsComponent.js

@@ -0,0 +1,111 @@
+Ext.define('Coon.common.component.CheckErrorsComponent', {
+    extend: 'Ext.panel.Panel',
+    xtype: 'CheckErrorsComponent',
+
+    config: {
+        period: '',
+        maskComponent: '',
+        checks: [],
+    },
+    layout: 'fit',
+
+    async checkHandler() {
+        this.afterCheck = false;
+        const period = this.getPeriod();
+
+        this.maskTab(true);
+
+        const store = this.checksGrid.getStore();
+        store.each((record) => record.set('state', '?'));
+
+        for (const reportId of this.checksReports) {
+            try {
+                const record = store.getData().getRange().find((rec) => rec.get('reportId') === reportId);
+                if (record.get('state') === 'Успешно' && reportId === '') {
+                    return;
+                }
+                record.set('state', 'Проверка');
+                let data;
+                if (reportId === '') {
+                    data = await Coon.util.promisifyCmd('SigmaUtilities.view.calendar.opa.getClosedStateCalendarPeriodCommand',
+                        'UBUT_PD',
+                        period
+                    );
+                } else {
+                    data = await Coon.util.promisifyCmd('command.GetDynamicReportDataCommand',
+                        reportId,
+                        [{'type': 'PERIOD_ID', 'value': period}]
+                    );
+                }
+                if (data === true || !data.list.length) {
+                    record.set('state', 'Успешно');
+                } else if (data.list.length) {
+                    record.set('state', 'Ошибка');
+                }
+                this.afterCheck = true;
+            } catch (e) {
+                Coon.log.error('Невозможно выполнить все проверки </br>', e);
+                Ext.Msg.alert('Сообщение системы', 'Невозможно выполнить все проверки');
+                break;
+            }
+        }
+        this.maskTab(false);
+    },
+
+    getMaskComponent: function() {
+        return this.up(this.maskComponent);
+    },
+
+    maskTab: function(state) {
+        this.getMaskComponent()[state ? 'mask' : 'unmask']();
+    },
+
+    initComponent: function() {
+        this.items = [
+            {
+                xtype: 'grid',
+                reference: 'checksGrid',
+                columns: [
+                    {
+                        text: 'Тип',
+                        dataIndex: 'checkName',
+                        width: 360,
+                    },
+                    {
+                        text: 'Статус</br> проверки',
+                        dataIndex: 'state',
+                        width: 100,
+                    }
+                ],
+                listeners: {
+                    itemclick: function(_, rec) {
+                        if (this.afterCheck) {
+                            this.fireEvent('checkitemclick', _, rec);
+                        }
+                    },
+                    scope: this,
+                },
+                store: {
+                    type: 'json',
+                    data: [],
+                },
+                tbar: {
+                    items: [
+                        {
+                            text: 'Запустить',
+                            handler: this.checkHandler.bind(this),
+                        }
+                    ],
+                },
+            }
+        ];
+        this.callParent(arguments);
+
+        this.checksReports = [];
+        for (const record of this.checks) {
+            this.checksReports.push(record.reportId);
+        }
+        this.checksGrid = this.down('[reference=checksGrid]');
+        this.checksGrid.getStore().loadData(this.checks);
+    },
+});

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/grid/AddFilterConditionPlugin.js

@@ -640,7 +640,7 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
                 foundMenuItem.setText(`Фильтр по пустому значению`);
             } else {
                 foundMenuItem.setText(`<div style="max-width: 300px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
-                    Фильтр по "${this.getValueText(this.columnValue)}"
+                    Фильтр по "${this.getValueText(this.columnValue)}" 
                 </div>`);
             }
         }
@@ -711,7 +711,7 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
             if (['string', 'numeric', 'date', 'list', 'combo'].includes(filterType)) {
                 filterWrapPanelCfg.width = 600;
             } else {
-                filterWrapPanelCfg.minWidth = 200;
+                filterWrapPanelCfg.minWidth = 300;
             }
             const menuItem = Ext.widget('FilterWrapPanel', filterWrapPanelCfg);
             menuItem.on('dofilter', function(value, condition) {

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

@@ -92,7 +92,16 @@ Ext.define('Coon.report.plugin.grid.CustomButtonPlugin', {
             <b>${this.panelButtonItemId}</b>. 
             ${this.panelButtonItemId} - ключ, по которому связана конфигурация кнопки в кастомной панели с кнопкой в репорте.`;
         }
-        this.separateAction = new Ext.Button(buttonConfig);
+        buttonConfig.xtype = buttonConfig.xtype || 'button';
+        const button = Ext.create(buttonConfig)
+        if (!button.isButton) {
+            Coon.log.error(`[CustomButtonPlugin] xtype error - it's not a button component`)
+            buttonConfig.xtype = 'button';
+            button.destroy()
+            this.separateAction = Ext.create(buttonConfig);
+        } else {
+            this.separateAction = button;
+        }
         if (!this.isUnused) {
             this.processBind(bindConfig);
         }

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;
+                reportIndependentParameters.push(param);
             }
         });
 

package/src/report/plugin/grid/addFilterConditionPlugin/FilterFieldFactory.js

@@ -10,7 +10,7 @@ Ext.define('Coon.report.plugin.grid.addFilterConditionPlugin.FilterFieldFactory'
         case 'date':
             return this.getDateFields();
         case 'boolean':
-            return this.getBooleanFields(options.booleanLabels);
+            return this.getBooleanFields(options);
         case 'numeric':
             return this.getNumericFields();
         case 'list':
@@ -56,8 +56,8 @@ Ext.define('Coon.report.plugin.grid.addFilterConditionPlugin.FilterFieldFactory'
             },
         });
     },
-    getBooleanFields(labels) {
-        labels = labels || {};
+    getBooleanFields(options) {
+        const labels = options.booleanLabels || {};
         return {
             xtype: 'container',
             items: {
@@ -67,8 +67,8 @@ Ext.define('Coon.report.plugin.grid.addFilterConditionPlugin.FilterFieldFactory'
                 },
                 simpleValue: true,
                 items: [
-                    {boxLabel: labels.trueText || 'Да', name: 'condition', inputValue: true},
-                    {boxLabel: labels.falseText || 'Нет', name: 'condition', inputValue: false, margin: '0 0 0 15'}
+                    {boxLabel: labels.trueText || 'Да', name: options.dataIndex, inputValue: true},
+                    {boxLabel: labels.falseText || 'Нет', name: options.dataIndex, inputValue: false, margin: '0 0 0 15'}
                 ],
                 bind: {
                     value: '{filter.fromValue}',

package/src/report/plugin/grid/addFilterConditionPlugin/FilterItem.js

@@ -156,7 +156,16 @@ Ext.define('Coon.report.plugin.grid.addFilterConditionPlugin.FilterItem', {
         const listData = filter.listData;
         const useCombo = filter.useCombo && operator==='eq';
         const allowBlank= !['like', 'eq'].includes(operator);
-        return this.factory.getFields(type, {booleanLabels, listData, useCombo, allowBlank});
+        return this.factory.getFields(
+            type,
+            {
+                booleanLabels,
+                listData,
+                useCombo,
+                allowBlank,
+                dataIndex: this.filter.dataIndex,
+            }
+        );
     },
 
     isValid() {

package/src/version.js

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