ru.coon 3.0.73 → 3.0.74

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 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.74",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

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/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/version.js

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