ru.coon 2.7.35 → 2.7.36

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# Version 2.7.36, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9857ca304c8428bc53cddfa0e1476f6af4ec1778)
+* ## Fixes
+* <span style='color:red'> HT-9057 GridEditorsPlugin fix date format</span> ([b702c4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b702c4eefab3c75b8c2be1857d510e70b9c0e52a))
+* <span style='color:red'> HT-9057 GridEditorsPlugin fix date format</span> ([18109c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/18109c790b243796ec018b98bc1a4add82814378))
+* <span style='color:red'> HT-9043 set filter panel height on afterlayout</span> ([a7c47b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a7c47b732b32f629e7329a2c33be2b38b1a28354))
+* <span style='color:red'> HT-9043 add getSubmitValue for SimpleReportTag and set filter panel height on afterlayout</span> ([3b815e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b815ef047e51ff023a191abf3af0a6e220cb26a))
+
+* TR-69031 :fix возвращено событие appready в Main ([ec2a2c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ec2a2c43c03849e19c50df245aa16d544297e879))
+* upd ([90f4cf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/90f4cfad61c07e88f68c48c0000e3f9141e082a2))
+* update: CHANGELOG.md ([9104da], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9104daa43944f2f1bf49ee8e1298bc31d251f091))
+
 # Version 2.7.35, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a36c677b3a30a03bfb3b7045d0c663fdf090bf3)
 * update: CHANGELOG.md ([78b2a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78b2a5573bdea9aede4f354a0584f5e606f7c573))
 

package/package.json

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

package/src/app/viewPort/Main.js

@@ -72,5 +72,6 @@ Ext.define('Coon.app.viewPort.Main', {
         this.callParent(arguments);
         const {initialRoute} = Ext.getApplication();
         initialRoute && Ext.fireEvent('route:initial', initialRoute);
+        Ext.fireEvent('appready');
     },
 });

package/src/report/component/SimpleReportTag.js

@@ -106,6 +106,15 @@ Ext.define('Coon.report.component.SimpleReportTag', {
         }
     },
 
+    getSubmitValue: function() {
+        const valueArray = this.callParent();
+        if (Ext.isArray(valueArray)) {
+            return valueArray.join();
+        } else {
+            return valueArray;
+        }
+    },
+
     updateReportId: function(newReportId, OldReportId) {
         if (this.initComplete && ((this.getDefaultParameters() && this.getDefaultParameters().doLoad) || this.getAutoLoadData())) {
             this.loadHandler({});

package/src/report/component/reportpanel/NorthPanel.js

@@ -211,7 +211,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             return;
         }
         if (this.enableHighlightingRequiredFields || this.getEnableChipToolbar()) {
-            tbarsHeight += tbarH;
+            tbarsHeight += tbarH + 10;
             tbar.show();
             if (this.isLegendHidden() && this.enableHighlightingRequiredFields && !this.legend) {
                 this.legend = this.buildLegend();

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

@@ -18,85 +18,80 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
         configurePanelWizard: 'GridEditorPluginConfig',
     },
 
-    constructor: function(config) {
-        if (Ext.isEmpty(config.editorConfig)) {
-            config.editorConfig = [];
-        } else if (!Ext.isArray(config.editorConfig)) {
-            config.editorConfig = [config.editorConfig];
+    getEditorConfig() {
+        this.editorConfig = this.editorConfig || [];
+        if (Array.isArray(this.editorConfig)) {
+            return this.editorConfig;
+        } else {
+            return [this.editorConfig];
         }
-        const c = config || {};
-        Ext.apply(this, c);
-        this.callParent([config]);
     },
 
-    init: function(grid) {
+    init(grid) {
         this.grid = grid;
         this.grid.on('afterrender', this.setEditors, this);
     },
 
-    setEditors: function() {
-        let hasEditor = this.grid.findPlugin('cellediting');
+    setEditors() {
+        const hasEditor = this.grid.findPlugin('cellediting') || this.grid.findPlugin('rowediting');
         if (!hasEditor) {
-            hasEditor = this.grid.findPlugin('rowediting');
-            if (!hasEditor) {
-                Coon.log.log('component is not editable');
+            Coon.log.log('component is not editable');
+            return;
+        }
+        for (const editorConfig of this.getEditorConfig()) {
+            const column = this.grid.getColumnModel().findColumnByDataIndex(editorConfig.type);
+            if (!column) {
                 return;
             }
-        }
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        for (let i = 0; i < this.editorConfig.length; i++) {
-            const editorObj = this.editorConfig[i];
-            const column = this.grid.getColumnModel().findColumnByDataIndex(editorObj[ns.$type]);
-            if (column) {
-                const editor = this.createEditorItem(editorObj);
-                if (Ext.isFunction(column.setEditor)) {
-                    column.setEditor(editor);
+            const editor = this.createEditorItem(editorConfig);
+            if (Ext.isFunction(column.setEditor)) {
+                column.setEditor(editor);
+            }
+            const needComboRenderer = editor.isXType('BaseComboBox') && column.useComboRenderer !== false;
+            const customStyle = column.renderer && column.renderer.customStyle;
+            const columnFormat = column.format;
+            column.renderer = (value, metaData, record) => {
+                let editable = true;
+                if (editorConfig.dependsOnField && editorConfig.dependsOnFieldName) {
+                    const dependsOnFieldName = editorConfig.dependsOnFieldName;
+                    const invertValue = editorConfig.invertValue;
+                    editable = invertValue === !record.get(dependsOnFieldName);
+                    if (editorConfig.highlightEditableCells) {
+                        metaData.tdCls = editable ? 'editable-cell' : 'hover-cell';
+                    }
                 }
-                const dependsOnFieldName = editorObj['dependsOnField'] && editorObj['dependsOnFieldName'];
-                const needComboRenderer = editor.isXType('BaseComboBox') && column.useComboRenderer !== false;
-                if (dependsOnFieldName || needComboRenderer) {
-                    const customStyle = column.renderer && column.renderer.customStyle;
-                    column.renderer = (value, metaData, record) => {
-                        let editable = true;
-                        if (editorObj['dependsOnField'] && editorObj['dependsOnFieldName']) {
-                            const dependsOnFieldName = editorObj['dependsOnFieldName'];
-                            const invertValue = editorObj['invertValue'];
-                            editable = invertValue === !record.get(dependsOnFieldName);
-                            record.allowEditWithEditorPlugin = editable;
-                            if (editorObj['highlightEditableCells']) {
-                                metaData.tdCls = editable ? 'editable-cell' : 'hover-cell';
-                            }
-                            hasEditor.on('beforeedit', function(editor, context) {
-                                return context.record.allowEditWithEditorPlugin;
-                            }, this);
-                        }
-                        if (typeof customStyle === 'string') {
-                            metaData.tdStyle = customStyle;
-                        }
-                        if (needComboRenderer) {
-                            editor.store.clearFilter();
-                            const editorRecord = editor.findRecord(editor.valueField, value);
-                            return editorRecord ? editorRecord.get(editor.displayField) : editor.valueNotFoundText;
-                        } else {
-                            return value;
-                        }
-                    };
-                    column.renderer.customStyle = customStyle;
+                record.allowEditWithEditorPlugin = {};
+                record.allowEditWithEditorPlugin[editorConfig.type] = editable;
+                if (typeof customStyle === 'string') {
+                    metaData.tdStyle = customStyle;
                 }
-            }
+                if (needComboRenderer) {
+                    editor.store.clearFilter();
+                    const editorRecord = editor.findRecord(editor.valueField, value);
+                    return editorRecord ? editorRecord.get(editor.displayField) : editor.valueNotFoundText;
+                }
+                if (Ext.isDate(value)) {
+                    return Ext.Date.format(value, editorConfig.mask.format || columnFormat);
+                } else {
+                    return value;
+                }
+            };
+            hasEditor.on('beforeedit', function(editor, context) {
+                return context.record.allowEditWithEditorPlugin[context.column.dataIndex] || false;
+            }, this);
+            column.renderer.customStyle = customStyle;
         }
     },
 
-    createEditorItem: function(configuration) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        const entity = configuration[ns.$entity];
+    createEditorItem(configuration) {
+        const entity = configuration.entity;
 
         const defaultConfig = {
-            allowBlank: configuration[ns.$required] ? false : true,
+            allowBlank: !configuration.required,
         };
         let config;
-        if (entity == 'ADV') {
-            const typeOfValue = configuration[ns.$typeOfValue];
+        if (entity === 'ADV') {
+            const typeOfValue = configuration.typeOfValue;
             switch (typeOfValue) {
             case 'TEXT':
                 config = {
@@ -137,9 +132,9 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                 };
                 break;
             }
-        } else if (entity == 'DFV') {
+        } else if (entity === 'DFV') {
 
-        } else if (entity == 'FKV') {
+        } else if (entity === 'FKV') {
 
         }
         if (!config) {
@@ -147,10 +142,10 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
         }
         let properties;
         try {
-            properties = Ext.isEmpty(configuration[ns.$mask]) ? {} :
-                (Ext.isObject(configuration[ns.$mask]) ? configuration[ns.$mask] : Ext.decode(configuration[ns.$mask].trim()));
+            properties = Ext.isEmpty(configuration.mask) ? {} :
+                (Ext.isObject(configuration.mask) ? configuration.mask : Ext.decode(configuration.mask.trim()));
         } catch (e) {
-            Coon.log.log('!!!!!' + configuration[ns.$mask] + '!!!!!');
+            Coon.log.log('!!!!!' + configuration.mask + '!!!!!');
             Coon.log.log(e);
         }
         config = Ext.apply(config, properties, defaultConfig);

package/src/version.js

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