ru.coon 2.8.27 → 2.8.28

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 2.8.28, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3764ad9be3fc8a838e83cdcde85e76a3a728b2e4)
+* ## Features
+* <span style='color:green'>feat: [OpenCustomPanelButtonPlugin]: Cell click support. Closes NEVA-675.</span> ([661205], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/661205a5438fc84a25db5ba475bf6ec365b784ed))
+
+* update: CHANGELOG.md ([b56f2f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b56f2f6c8d073ce506f5182b7faebdda29d619b6))
+
 # Version 2.8.27, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cfbabb26922efaef2416052c0006bf73f27ec6cb)
 * ## Fixes
 * <span style='color:red'>fix CopyRowsFromGrid by HT-10923</span> ([f8c95a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f8c95aa079cf48471c05d210a3909a20bd3e644c))
@@ -9,6 +15,7 @@
 * <span style='color:green'>feat: add style check before addCellStyle</span> ([ff4abf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff4abf157a32ec98720caabafc2f65749b0c98bf))
 
 * upd ([009237], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/009237a355c8aa9928fd919b90ff8e9f750db98e))
+* HT-10804 Обновление тулбара после сортировки кнопок ([772002], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7720028a21f9bc1fa578eb1c94d16d8e68abbd65))
 * relocate and rename method ([a2a61b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a2a61b2a6dcd4d4622becfc2f11602a97c9d49d8))
 * update: CHANGELOG.md ([d4b2c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d4b2c7e1effb2bd46eb587a3d5bf2d03cbc27053))
 
@@ -72,6 +79,7 @@
 * ## Fixes
 * <span style='color:red'>refactoring && fix in UiCustomPanelEditor</span> ([927a5e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/927a5e80e2382c44213541bf4770a7abc58c0cf3))
 
+* HT-10298 fix: Увеличение размеров окна NoteEditorCreator ([75e111], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/75e1117d5a12f8fa12a5d0cdc8b4e16ac2e97886))
 * HT-10117 fix: Перед генерацией хэша добавлена проверка на циклические ссылки ([2cd8d5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2cd8d5ca19750218d51ab7832b6711ddd3767724))
 * remove getHtaEl from util.js ([1df6ae], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1df6ae10306dab7fb473681357650fc674c47a9a))
 * update: CHANGELOG.md ([33ba01], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/33ba01a8d1d9b4a831a743d0b7c5767c7c46c434))

package/package.json

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

package/src/common/component/editor/creators/NoteEditorCreator.js

@@ -44,7 +44,7 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
         const win = this.win = Ext.widget('WindowWrap', {
             items: textPanel,
             height: 300,
-            width: 400,
+            width: 500,
             maximizable: false,
             dockedItems: [{
                 xtype: 'toolbar',

package/src/report/component/ReportPanel.js

@@ -907,6 +907,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             }
             return 0;
         });
+        params.bar.updateLayout();
     },
     applyFilter: function(params) {
         params = params || {};

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/OpenCustomPanelButtonPluginConfigPanel.js

@@ -4,7 +4,8 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
     uses: [],
     requires: [
         'Coon.report.component.settings.common.ReportFormContextParametersGrid',
-        'Coon.report.component.settings.ReportPropertiesGrid'
+        'Coon.report.component.settings.ReportPropertiesGrid',
+        'Coon.report.store.RefStore'
     ],
     alternateClassName: 'Sigma.common.grid.plugin.OpenCustomPanelButtonPluginConfigPanel',
 
@@ -53,7 +54,18 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
                                     this.createDependsOnGridParameter(),
                                     this.isCreatedButtonHidden(),
                                     this.createAddButtonPanel(),
-                                    this.createActOnDoubleClickCheckBox(),
+                                    {
+                                        xtype: 'fieldset',
+                                        items: [
+                                            Object.assign(this.createActOnDoubleClickCheckBox(), {
+                                                reference: 'actOnDoubleClick',
+                                                bind: {
+                                                    disabled: '{actOnSingleClick.checked}',
+                                                },
+                                            }),
+                                            this.createActOnOnSingleClickControl()
+                                        ],
+                                    },
                                     this.createHotKeyPanel(),
                                     this.createVisibilityKeyPanel(),
                                     this.createNewObjectCreated(),
@@ -290,6 +302,14 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
             gridSourceMapping.updateParametersList(context.parameters);
             gridSourceMapping.updateTypeEditor(context.additionalContext);
         }
+        this.reportFieldsCombo.getStore().loadData(
+            context.fields.map(
+                ({viewComboDescription: description, reportFieldCd: value}) => ({
+                    value,
+                    description,
+                })
+            )
+        );
     },
 
     doInit: function(config) {
@@ -474,4 +494,41 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
             ],
         };
     },
+
+    createActOnOnSingleClickControl() {
+        this.reportFieldsCombo = Ext.create({
+            xtype: 'BaseComboBox',
+            loadOnRender: false,
+            displayField: 'description',
+            valueField: 'value',
+            store: Ext.create('Coon.report.store.RefStore'),
+            fieldLabel: 'Поле',
+            name: 'singleClickDataIndex',
+            bind: {
+                disabled: '{!actOnSingleClick.checked}',
+            },
+            flex: 1,
+        });
+        return {
+            xtype: 'fieldcontainer',
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'checkbox',
+                    boxLabel: 'Активировать по одиночному клику на поле',
+                    boxLabelAlign: 'after',
+                    reference: 'actOnSingleClick',
+                    name: 'actOnSingleClick',
+                    bind: {
+                        disabled: '{actOnDoubleClick.checked}',
+                    },
+                    flex: 1,
+                },
+                this.reportFieldsCombo
+            ],
+        };
+    },
 });

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/OpenCustomPanelButtonPluginConfigPanel.scss

@@ -0,0 +1,5 @@
+.x-grid-cell.OCPBP-clickable-cell {
+  text-decoration: underline;
+  cursor: pointer;
+  color: var(--base-color);
+}

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

@@ -50,6 +50,8 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
         handleNewObjectEvent: false,
         newObjectChangeButtonPlugin: undefined,
         autoSize: false,
+        singleClickDataIndex: undefined,
+        actOnSingleClick: false,
     },
 
     handler: function() {
@@ -430,4 +432,26 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
             deferred: deferred,
         };
     },
+
+    customInit() {
+        this.callParent(arguments);
+        if (this.singleClickDataIndex && this.actOnSingleClick) {
+            this.component.on('cellclick', this.cellClickHandler, this);
+            const column = this.component.columns.find(({dataIndex}) => dataIndex === this.singleClickDataIndex);
+            column.tdCls = 'OCPBP-clickable-cell';
+        }
+    },
+
+
+    cellClickHandler: function(table, td, cellIndex) {
+        const clickedDataIndex = this.component.getColumnManager().getColumns()[cellIndex]['dataIndex'];
+        if (this.singleClickDataIndex && this.singleClickDataIndex !== clickedDataIndex) {
+            return true;
+        }
+        if (!this.computeState().disabled) {
+            this.handler.apply(this, arguments);
+            return false;
+        }
+        return true;
+    },
 });

package/src/version.js

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