ru.coon 2.5.21 → 2.5.22

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 2.5.22, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a5adcd5f65e1a51dab152558c6fb72efe4b97893)
+* ## Fixes
+* <span style='color:red'>fix ReportLookupCompo.loadReportData
+
+isolate lastValue from native ComboBox logic</span> ([57078e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/57078efccd71e7c21830ec9b7abf055e3d09f71e))
+* <span style='color:red'> HT-6314 fix focus</span> ([e9009a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e9009a55da073196bf1bd8c4b3fabff263831bf7))
+
+* update: CHANGELOG.md ([473997], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4739978f7ebb8564b5b233c496ce9c98d977c1c6))
+
 # Version 2.5.21, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc202083a949169e0203fa47bf2defa312201a33)
 * update: CHANGELOG.md ([e1a4d6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e1a4d65ec93284adeab64eb21ab51e737c229df7))
 
@@ -17,6 +26,9 @@
 
 fix ReportLookupCombo autoLoadData after destroy component
 fix ReportPropertiesPanelController</span> ([e2b928], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e2b928b1eddc58f46657ce79297ea2dbb2cae1ce))
+* <span style='color:red'> HT-6314 change icon and master widget style</span> ([fff9b6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fff9b6c8d6652addfac024b21bd03d01f86623f7))
+* <span style='color:red'> HT-6314 change icon and master widget style</span> ([ac9da8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ac9da82d4f00015e52da554cb985b4f2bdf2a1fe))
+* <span style='color:red'> HT-6314 change icon and master widget style</span> ([6b03cc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b03ccc5600c2d757b811bad43b790a85633d844))
 
 * update: CHANGELOG.md ([ff88bb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff88bb739914adacf1bbfa5284b31f603e480795))
 
@@ -214,8 +226,12 @@ ReportSqlPreviewPanel - add UiAceEditor as sql preview field(readOnly) with sql
 * update: CHANGELOG.md ([cab0be], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cab0beabbbe9e1ada4ccea28763253c0e5feb839))
 
 # Version 2.4.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/95627ef5983aa5f2fd5eaf8bd4b808ba169a48fb)
+* ## Features
+* <span style='color:green'>feat: HT-6314 Изменение отображения CharacteristicGridCopyPlugin</span> ([5fa321], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5fa3214c6e395bc66804a7acc7fe062780da1dfd))
+
 * add no-console rule to eslint rules ([aa512d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aa512db0fb0165af39481718d010c9748c5cebb5))
 *  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/report/component/ReportPanel.js, src/nav/AppNavigationMenuController.js504a591e823ee40141ebbcd443fef8dc6e952cef))
+* HT-6314 Изменение отображения CharacteristicGridCopyPlugin ([a1e5bc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a1e5bc00b8072b3171d5fbddbca78af02f3f17bd))
 * update: CHANGELOG.md ([e66ddf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e66ddf82f691185bdb8023ccee37fcf4871c8b32))
 
 # Version 2.4.40, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f49f8f4d8bfe24a5b6d47119585931d85dc03e33)

package/package.json

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

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

@@ -3,9 +3,8 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
     alias: 'plugin.CharacteristicGridCopyPlugin',
     copyConfig: {},
     icons: {
-        copy: 'x-fa fa-copy',
-        paste: 'x-fa fa-paste',
-        cancel: 'x-fa fa-cancel',
+        slave: 'x-fa fa-copy',
+        master: 'x-fa fa-paste',
     },
 
     constructor(config) {
@@ -17,7 +16,7 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
         this.component = editor;
         if (typeof this.copyConfig === 'object') {
             this.slaveConfig = Object.entries(this.copyConfig).reduce((acc, configEl) => {
-                configEl.length && configEl.pop().map((el) => acc[el] = ''+configEl);
+                configEl.length && configEl.pop().map((el) => acc[el] = '' + configEl);
                 return acc;
             }, {});
         }
@@ -32,31 +31,31 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
 
     createWidgetColumn() {
         const me = this;
+        me.masterWidgets = [];
+
+        this.component.getView().grid.getEl().down('[class="x-grid-item-container"]').addCls('CharacteristicGridCopyPlugin');
         const widgetColumn = Ext.create('Ext.grid.column.Widget', {
+            widget: {xtype: 'button', hidden: true, padding: '6px 16px 6px 16px'},
             width: 50,
             onWidgetAttach: function(col, widget, record) {
                 me.clearWidgetState(widget);
                 const type = record.get('type').trim();
+
                 if (me.copyConfig[type]) {
-                    widget.setHidden(me.component.readMode);
-                    widget.setDisabled(false);
-                    widget.setIconCls(me.icons.copy);
-                    widget.on('click', me.onCopyWidget, me);
-                    me.component.on(type, me.setStateWidget, me, widget);
+                    me.masterWidgets.push(widget);
+                    widget.setIconCls(me.icons.master);
                     return;
                 }
+
                 if (me.slaveConfig[type]) {
                     widget.setHidden(me.component.readMode);
-                    widget.setIconCls(me.icons.paste);
-                    widget.setDisabled(true);
-                    widget.on('click', me.onPasteWidget, me);
-                    me.component.on(me.slaveConfig[type], me.setDisabledWidget, me, widget);
+                    widget.setDisabled(me.component.readMode);
+                    widget.setIconCls(me.icons.slave);
+                    widget.on('click', me.onPasteWidget, me, {args: [widget, type]});
+                    widget.on('mouseover', me.showSlaveIcon, me, {args: [type, false, me.masterWidgets]});
+                    widget.on('mouseout', me.showSlaveIcon, me, {args: [type, true, me.masterWidgets]});
                 }
             },
-            widget: {
-                xtype: 'button',
-                hidden: true,
-            },
         });
         const columns = this.component.getColumns().map((el) => el.initialConfig);
         columns.push(widgetColumn);
@@ -65,41 +64,27 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
 
     clearWidgetState(widget) {
         widget.setIconCls('');
-        const type = widget.getWidgetRecord().get('type').trim();
-        this.component.removeListener(type, this.setDisabledWidget, this, widget);
-        this.component.removeListener(type, this.setStateWidget, this, widget);
-        widget.removeListener('click', this.onCopyWidget, this);
+        widget.setDisabled(true);
+        widget.setHidden(true);
         widget.removeListener('click', this.onPasteWidget, this);
+        widget.removeListener('mouseover', this.showSlaveIcon, this);
+        widget.removeListener('mouseout', this.showSlaveIcon, this);
     },
 
-    setDisabledWidget(widget) {
-        widget.setDisabled(!widget.disabled);
+    showSlaveIcon(type, hideMasterIcon, masterWidgets) {
+        masterWidgets.find((widget) => widget.getWidgetRecord().get('type').trim() === this.slaveConfig[type]).setHidden(hideMasterIcon);
     },
 
-    setStateWidget(widget) {
-        if (this.state === 'cancel') {
-            this.state = 'copy';
-            this.masterRecord = {};
-        } else {
-            this.state = 'cancel';
-            this.masterRecord = widget.getWidgetRecord();
-        }
-        widget.setIconCls(this.icons[this.state]);
-    },
+    onPasteWidget(widget, type) {
+        const masterWidget = this.masterWidgets.find((widget) => widget.getWidgetRecord().get('type').trim() === this.slaveConfig[type]);
+        const masterRecord = masterWidget && masterWidget.getWidgetRecord();
+        const slaveRecord = widget.getWidgetRecord();
 
-    onCopyWidget(widget) {
-        const type = widget.getWidgetRecord().get('type').trim();
-        this.component.fireEvent(type);
-    },
-
-    onPasteWidget(widget) {
-        const record = widget.getWidgetRecord();
-        const type = record.get('type').trim();
-        if (!this.masterRecord) {
+        if (!masterRecord) {
             return;
         }
-        record.set('value', this.masterRecord.get('value'));
-        record.set('valueDescription', this.masterRecord.get('valueDescription') || '');
-        this.component.fireEvent(this.slaveConfig[type]);
+
+        slaveRecord.set('value', masterRecord.get('value'));
+        slaveRecord.set('valueDescription', masterRecord.get('valueDescription') || '');
     },
 });

package/src/report/component/ReportLookupCombo.js

@@ -67,6 +67,8 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
         },
     },
 
+    locals: {},
+
     initComponent() {
         if (!this.getDisplayField()) {
             Coon.log.error('displayField is empty!');
@@ -169,7 +171,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
      * @param {string} value
      */
     loadReportData(value) {
-        if (this.lastValue === value) {
+        if (value && this.locals.lastValue === value) {
             this.selectRecordByValue(value);
             return;
         }
@@ -191,7 +193,13 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
             }
             if (result && Array.isArray(result.list)) {
                 this.getStore().loadData(result.list);
-                me.selectRecordByValue(value);
+                if (result.list[0]) {
+                    this.locals.lastValue = value;
+                    me.selectRecordByValue(value);
+                } else {
+                    this.locals.lastValue = false;
+                    me.clearComboValue();
+                }
                 me.enable();
             }
         }).catch((error) => {

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

@@ -180,6 +180,9 @@ Ext.define('Coon.report.plugin.configPanel.ReportCharacteristicBindPluginConfig'
         this.callParent(arguments);
         this.displayFieldSet(config, this.getFieldSet(), 'addDate');
         this.setVisibleFields(config['type']);
+        if (config && config.copyGridRecords) {
+            this.copyGrid.getStore().loadData(config.copyGridRecords);
+        }
     },
 
     setVisibleFields: function(value) {
@@ -201,13 +204,33 @@ Ext.define('Coon.report.plugin.configPanel.ReportCharacteristicBindPluginConfig'
     getConfiguration: function() {
         const config = this.callParent(arguments);
         const fieldSet = this.getFieldSet();
+        const showCopyColumn = this.down('[name="showCopyColumn"]');
+
         if (!Ext.isEmpty(fieldSet)) {
             config['addDate'] = !fieldSet.collapsed;
         }
+
         config['defaultDate'] = this.defaultDateField.isVisible() ? config['defaultDate'] : undefined;
         config['dateFromField'] = this.dateFromField.isVisible() ? config['dateFromField'] : undefined;
         config['dateFromParam'] = this.dateFromParam.isVisible() ? config['dateFromParam'] : undefined;
         config['today'] = this.today || undefined;
+
+        if (showCopyColumn.getValue() === true) {
+            const copyConfig = {};
+            const copyGridRecords = Coon.Function.serializeRecords(this.copyGrid.getStore().getRange());
+            copyGridRecords.map((rec) => {
+                if (rec.master && rec.slave) {
+                    try {
+                        copyConfig[rec.master.trim()] = rec.slave.replaceAll(' ', '').split(',');
+                    } catch (e) {
+                        Coon.log.error(`${e}: Неверно указана конфигурация копирования!`);
+                    }
+                }
+            });
+            config['copyConfig'] = copyConfig;
+            config['copyGridRecords'] = copyGridRecords;
+        }
+
         return config;
     },
 
@@ -377,30 +400,87 @@ Ext.define('Coon.report.plugin.configPanel.ReportCharacteristicBindPluginConfig'
     },
 
     createCopyFieldSet: function() {
+        const me = this;
+
+        this.copyGrid = Ext.create('Ext.grid.Panel', {
+            name: 'grid',
+            columns: {
+                items: [
+                    {
+                        xtype: 'hintColumn',
+                        text: 'Родительские характеристика',
+                        dataIndex: 'master',
+                        width: 300,
+                        editor: 'textfield',
+                    },
+                    {
+                        xtype: 'hintColumn',
+                        text: 'Зависимые характеристики',
+                        dataIndex: 'slave',
+                        width: 300,
+                        editor: 'textfield',
+                    }
+                ],
+            },
+            plugins: [{ptype: 'cellediting', clicksToEdit: 2}],
+            store: {},
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'top',
+                itemId: 'toptoolbar',
+                items: [
+                    {
+                        xtype: 'button',
+                        text: 'Добавить',
+                        reference: 'addButton',
+                        ui: 'blue-text-button-border',
+                        handler: function() {
+                            const store = me.copyGrid.getStore();
+                            store.add(store.model.create());
+                        },
+                    },
+                    {
+                        xtype: 'button',
+                        text: 'Удалить',
+                        reference: 'deleteBtn',
+                        ui: 'blue-text-button-border',
+                        handler: function(btn) {
+                            const record = me.copyGrid.getSelectionModel().getSelection()[0];
+                            if (record) {
+                                me.copyGrid.getStore().remove(record);
+                            }
+                        },
+                    }
+                ],
+            }],
+        });
+
         return {
             xtype: 'fieldset',
             defaults: {
                 labelWidth: 130,
-                width: 430,
             },
             name: 'showCopyColumnConfig',
             title: 'Копирование характеристик',
             checkboxName: 'showCopyColumn',
             checkboxToggle: true,
-            collapsed: true,
+            collapsed: false,
             layout: {
                 type: 'vbox',
                 align: 'stretch',
             },
             items: [
                 {
-                    xtype: 'textarea',
-                    fieldLabel: 'copyConfig',
-                    emptyText: `ожидается конфиг в формате: {"MASTER": ["COPY1", "COPY2"]}`,
-                    reference: 'copyConfigField',
-                    name: 'copyConfig',
-                    height: 200,
-                }
+                    xtype: 'container',
+                    width: '100%',
+                    html: `
+                        <div style="font-size:12px;color:gray">
+                            В левой колонке укажите родительскую характеристику<br>
+                            В правой колонке укажите через запятую характеристики, в которые будет копироваться родительская характеристика.
+                        </div>
+                    `,
+                },
+                this.copyGrid
             ],
         };
     },

package/src/version.js

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