ru.coon 3.0.29 → 3.0.31

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Version 3.0.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9665b81ba1d0a4cded52d8755f915381c0753074)
+* ## Fixes
+* <span style='color:red'>fix OCPB</span> ([d9f750], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9f7501828ec8437a029d6eb0ef7582e43bac2ba))
+
+* TR-13285 fix: BigNumColumn renderer function refactoring ([d80c93], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d80c934d5c5236708918bbaf2b66c3abd6537213))
+* update: CHANGELOG.md ([000f57], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/000f5736911e558f1cf5629700025633e9c820f7))
+
+# Version 3.0.30, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/834d4e43ba0766daf8e6fd774f052303d0be81ed)
+* ## Fixes
+* <span style='color:red'> componentContextId not found in cmp config. Related to NEVA-821.</span> ([7627d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7627d4b7d7acd918ee99f1a11bd960844676a0c0))
+
+* update: CHANGELOG.md ([0d409f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0d409f04256f1d1d0e977f22dbc557be16198a93))
+
 # Version 3.0.29, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6a41718051c6d94703539202ec2f58d6c5382da)
 * upd ([adee34], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/adee34983691322c146d3a60d2f1a64f674ae72a))
 * update: CHANGELOG.md ([b35442], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b35442505415f72a6602ff3d8939d7ece509252a))

package/package.json

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

package/src/report/column/BigNumColumn.js

@@ -1,12 +1,10 @@
 Ext.define('Coon.report.column.BigNumColumn', {
-    extend: 'Ext.grid.Column',
+    extend: 'Ext.grid.column.Column',
     alias: 'widget.BigNumColumn',
     alternateClassName: [
         'Sigma.common.column.BigNumColumn',
         'Sigma.grid.column.BigNumColumn'
     ],
-    uses: [],
-    requires: [],
     align: 'right',
     cellSumPluginConfig: {
         valueType: 'float',
@@ -18,24 +16,17 @@ Ext.define('Coon.report.column.BigNumColumn', {
     },
 
     /**
-     * Функция м.быть вызвана из метода setupRowData Ext.grid.feature.Grouping. В этом случае cellValues - пустой объект.
-     * @param v
-     * @param {Object} cellValues
+     * @param value
+     * @param {Object} metaData
      * @returns {string|null}
      */
-    renderer: function(v, cellValues) {
-        const column = cellValues && cellValues.column;
-
-        let me;
-
-        if (column && Ext.isFunction(column.getDecSeparator)) {
-            me = column;
-        } else if (Ext.isFunction(this.getDecSeparator)) {
-            me = this;
-        }
-        const value = me ? Coon.format.bigNumFormat(v, me.getDecSeparator(), me.getGroupSeparator(), me.getPrecision()): null;
-        if (value !== null) {
-            return `<div data-qtip="${Ext.util.Format.htmlEncode(value)}">${value}</div>`;
+    renderer: function(value, metaData) {
+        const column = this.isXType('gridcolumn') ? this : metaData && metaData.column;
+        const formattedValue = column && Ext.isFunction(column.getDecSeparator) ?
+            Coon.format.bigNumFormat(value, column.getDecSeparator(), column.getGroupSeparator(), column.getPrecision()) :
+            null;
+        if (formattedValue !== null) {
+            return `<div data-qtip="${Ext.util.Format.htmlEncode(formattedValue)}">${formattedValue}</div>`;
         }
         return null;
     },

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

@@ -121,6 +121,13 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
         if (config.isReport) {
             config.params.params = Ext.apply({}, params);
         }
+        const componentContextId = Coon.util.ContextManager.generateKey({
+            params: config.params,
+            id: this.getComponentId(),
+            xtype: config.xtype,
+            source: this.$className.split('.').pop(),
+        });
+        config.componentContextId = componentContextId;
         config.properties = Ext.apply(
             {
                 xtype: config.xtype,
@@ -129,12 +136,7 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
                     source: 'OpenCustomPanelButtonPlugin',
                     params: config.params,
                 },
-                componentContextId: Coon.util.ContextManager.generateKey({
-                    params: config.params,
-                    id: this.getComponentId(),
-                    xtype: config.xtype,
-                    source: this.$className.split('.').pop(),
-                }),
+                componentContextId,
                 componentConfig: {
                     parentComponent: this.getCmp(),
                     context: Object.assign(
@@ -316,13 +318,13 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
             this.addNavigationThroughRecords(config.targetComponent);
         }
         config.targetComponent.on('afterrender', function() {
-            Coon.Function.executeComponentDoInit(config.targetComponent.getWrappedComponent(), config.params);
+            Coon.Function.executeComponentDoInit(config.targetComponent, config.params);
         });
         if (this.oldFrame) {
             window.oldFrameWindow = config.targetComponent;
             window.addEventListener('message', this.receiveMessage, false);
         }
-        config.targetComponent.show();
+        config.targetWindow.show();
     },
 
     openPanel(params) {

package/src/version.js

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

package/src/util/SimLoadReportCommand.js

@@ -1,71 +0,0 @@
-Ext.define('Coon.util.SimLoadReportCommand', {
-    mixins: ['Ext.mixin.Observable'],
-    alias: 'command.SimLoadReportCommand',
-
-    constructor: function(config) {
-        this.mixins.observable.constructor.call(this, config);
-        Ext.apply(this, config);
-    },
-
-    loadReportConfig(id) {
-        return Coon.util.promisifyCmd(
-            'command.GetReportCommand',
-            id,
-            true
-        );
-    },
-
-    async execute(reportId, generateFakeData) {
-        const config = await this.loadReportConfig(reportId);
-        console.log({config});
-        if (!config) {
-            this.fireEvent('failure', 'report not found');
-        }
-        if (generateFakeData) {
-            const fakeData = this.loadFakeData(config.fields, generateFakeData);
-            this.setList(reportId, fakeData);
-        }
-        const list = this.getList(reportId);
-        this.fireEvent('complete', {list, totalCount: list.length});
-    },
-
-    loadFakeData(fields, len) {
-        len = Math.min(len, 100);
-        const getValue = (type) => {
-            const strGen = Ext.create('Ext.data.identifier.Uuid');
-            if (type === 'number') {
-                return Math.random() * 99999;
-            }
-            if (type === 'boolean') {
-                return Math.random() > 0.5;
-            }
-            if (type === 'date') {
-                return new Date(Math.ceil(Math.random() * 2e12));
-            }
-            return strGen.generate();
-        };
-        const columns = fields.filter((column) => column.visibleSwitch);
-        const getRow = () => columns.reduce((acc, {reportFieldCd, reportFieldTypeLookup}) => {
-            acc[reportFieldCd] = getValue(
-                (reportFieldTypeLookup || '').toLowerCase()
-            );
-            return acc;
-        }, {id: Ext.id(false, 'fakeid-')});
-        return [...Array(len)].map(getRow);
-    },
-
-    getList(id) {
-        return Ext.decode(localStorage.getItem('simlet.' + id), true) || [];
-    },
-
-    setList(id, list) {
-        return localStorage.setItem('simlet.' + id, Ext.encode(list, true));
-    },
-
-    inputParameters: function() {
-        return [
-            {name: 'reportId', description: 'reportId'},
-            {name: 'fake', description: 'generate fake data'}
-        ];
-    },
-});

package/src/util/SimUpsertReportCommand.js

@@ -1,4 +0,0 @@
-Ext.define('Coon.util.SimUpsertReportCommand', {
-    mixins: ['Ext.mixin.Observable'],
-    alias: 'command.SimLoadReportCommand',
-});