ru.coon 2.7.24 → 2.7.26

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 2.7.25, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/568fd6aae3e5756be342c7e74d434b7976700dae)
+* ## Features
+* <span style='color:green'>feat: HT-8513: add copy item in cell context menu</span> ([5355d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5355d48244eceb3add5e5002bfe970b8059e235d))
+* <span style='color:green'>feat: HT-8513: add copy item in cell context menu</span> ([5c8b74], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5c8b74e40d74471bd8eb4fa54e82539c136fe088))
+* <span style='color:green'>feat: HT-8513: add copy item in cell context menu</span> ([915abe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/915abebc3f710ae7236d2584292d7fd62b2067e0))
+* <span style='color:green'>feat: HT-8763: search footer view by reference</span> ([2648fe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2648fe29ea96319055c586e4cea1015115c19494))
+
+* update: CHANGELOG.md ([971505], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9715050f4ce08854c84792001dea4c334fd74a0f))
+
 # Version 2.7.24, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8e3cc36a693f048a9feceada5eb46f979eda23db)
 * ## Features
 * <span style='color:green'>feat: HT-8422: set dynamic size on filter panel</span> ([e5816e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e5816e9be17f9ca40fad6ba2d86e79318455b633))

package/package.json

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

package/src/Function.js

@@ -17,7 +17,7 @@ Ext.define('Coon.Function', {
 
     /**
      *
-     * @param {*} win Ext component
+     * @param {*} component Ext component
      * @param {*} requestOptions
      * @param {String} requestOptions.url url
      * @param {Boolean} requestOptions.binary
@@ -26,18 +26,15 @@ Ext.define('Coon.Function', {
      * @param {Boolean} sync sync|async request
      * @returns
      */
-    doRequest: function(win, requestOptions, sync) {
+    doRequest: function(component, requestOptions, sync) {
         const requestHash = Coon.util.generateHashFromObj(requestOptions);
         if (!this.beforeRequest(requestOptions, requestHash)) {
             return;
         }
         let myMask;
-        if (win) {
-            if (!win.isComponent) {
-                Coon.log.error('win parameter is element instead component');
-            }
+        if (component && !this.isComponentRendered(component)) {
             myMask = new Ext.LoadMask({
-                target: win,
+                target: component,
                 msg: requestOptions.text || 'Загрузка...',
             });
             myMask.show();
@@ -63,7 +60,7 @@ Ext.define('Coon.Function', {
                         response.responseJSON = Ext.decode(response.responseText, true);
                     }
                     try {
-                        requestOptions.callback.call(this, win, true, response, requestOptions);
+                        requestOptions.callback.call(this, component, true, response, requestOptions);
                     } catch (e) {
                         Coon.log.error(e);
                     }
@@ -79,7 +76,7 @@ Ext.define('Coon.Function', {
                         response.responseJSON = Ext.decode(response.responseText, true);
                     }
                     try {
-                        requestOptions.failure.call(this, win, requestOptions, response);
+                        requestOptions.failure.call(this, component, requestOptions, response);
                     } catch (e) {
                         console.warn(e);
                     }
@@ -95,6 +92,13 @@ Ext.define('Coon.Function', {
         return request;
     },
 
+    isComponentRendered: function(component) {
+        return 
+            component &&
+            component.isComponent &&
+            component.rendered
+    },
+
     /**
      * Сериализация содержимого Store
      * @param store

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

@@ -26,6 +26,7 @@ Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
             valueField: 'VALUE',
             displayField: 'DESCRIPTION',
             searchBySubstring: true,
+            forceSelection: true,
         }, record.get('editorConfig')));
     },
 

package/src/common/field/fieldset/DateTimeField.js

@@ -41,7 +41,6 @@ Ext.define('Coon.common.field.fieldset.DateTimeField', {
 
     initComponent: function() {
         this.callParent();
-        this.on('change', this.publishValue, this);
         this.triggers.time.setHidden(!!this.hideTimeTrigger);
     },
 
@@ -136,8 +135,4 @@ Ext.define('Coon.common.field.fieldset.DateTimeField', {
             this.picker.setValue(Ext.isDate(value) ? value : this.createInitialDate());
         }
     },
-
-    publishValue: function() {
-        this.publishState('value', this.getValue());
-    },
 });

package/src/nav/windowHolder.js

@@ -15,7 +15,7 @@ Ext.define('Coon.nav.windowHolder', {
 
     getFooter() {
         if (!this.locals.footer) {
-            this.locals.footer = Ext.ComponentQuery.query('footerview')[0];
+            this.locals.footer = Ext.ComponentQuery.query('[reference="footerview"]')[0];
         }
         return this.locals.footer;
     },

package/src/report/component/ReportPanel.js

@@ -777,10 +777,25 @@ Ext.define('Coon.report.component.ReportPanel', {
             this.getIsTree() ? 'ReportTree' : 'ReportGrid',
             Ext.apply(defaultGridConfig, this.gridProperties, {reportId: reportBean[ns.$reportId]})
         );
+
+        if (widget.contextMenu) {
+            const copyButton = new Ext.menu.Item({
+                text: 'Копировать',
+                handler: this.onCopyCellClick.bind(widget.contextMenu),
+            });
+            widget.contextMenu.add(copyButton);
+            widget.contextMenu.on('requestMenuItems', (params) => {
+                copyButton.setHidden(!params.td);
+            }, this);
+        }
         widget.on('buttonIsAdded', this.sortButtons, this);
         return widget;
     },
-
+    onCopyCellClick() {
+        if (this.context && this.context.td) {
+            Coon.util.copyToClipboard(this.context.td.innerText);
+        }
+    },
     sortButtons: function(params) {
         if (params.bar.items.length === 1) {
             return;

package/src/report/component/SimplestReportCombo.js

@@ -280,6 +280,11 @@ Ext.define('Coon.report.component.SimplestReportCombo', {
         const find = map.find((e) => e[this.defaultValueFlg || 'IS_DEFAULT'] === 'Y');
         const defaultValue = this.value || (find && find[this.valueField]);
         if (defaultValue) {
+            const foundByValueField = map.find((e) => e[this.valueField] === this.value);
+            if (!foundByValueField) {
+                this.setValue(null);
+                return;
+            }
             this.setValue(defaultValue);
             if (Ext.isFunction(this.publishState)) {
                 this.publishState('value', this.getValue());

package/src/report/model/CharacteristicBean.js

@@ -10,9 +10,15 @@ Ext.define('Coon.report.model.CharacteristicBean', {
     requires: 'Coon.report.model.CharacteristicBeanFields',
     fields: [
         {name: Coon.report.model.CharacteristicBeanFields.$effectiveDate, type: 'date'},
-        {name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string'},
+        {
+            name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string', convert: (val) => {
+                return typeof val === 'string' ? val.trim() : val;
+            },
+        },
         {name: Coon.report.model.CharacteristicBeanFields.$valueDescription, type: 'string'},
-        {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string'},
+        {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string', convert: (val) => {
+            return typeof val === 'string' ? val.trim() : val;
+        }},
         {name: Coon.report.model.CharacteristicBeanFields.$typeDescription, type: 'string'},
         {name: Coon.report.model.CharacteristicBeanFields.$editable, type: 'boolean', defaultValue: true},
         {name: Coon.report.model.CharacteristicBeanFields.$visible, type: 'boolean', defaultValue: true},

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

@@ -96,6 +96,7 @@ Ext.define('Coon.report.plugin.grid.GridContextMenu', {
         if (record) {
             contextMenu.record = record;
         }
+        contextMenu.context = {view, td, cellIndex, record, tr, rowIndex, event},
         cellIndex && (contextMenu.cellIndex = cellIndex);
         const store = this.grid.getStore();
         let params;

package/src/version.js

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