ru.coon 2.8.17 → 2.8.19

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 2.8.19, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0537f45b4622bee187af6285993c287d9c5998c2)
+* ## Fixes
+* <span style='color:red'>refactoring && fix in UiCustomPanelEditor</span> ([927a5e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/927a5e80e2382c44213541bf4770a7abc58c0cf3))
+
+* 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))
+
+# Version 2.8.18, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/15150627eb106243e7123c0b93dd4f50cf09b84e)
+* ## Features
+* <span style='color:green'>feat: HT-10526: set Number format in number summary cells</span> ([5b0a52], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5b0a52f1642fdeafc40f301abf744bbe08ef7cce))
+
+* TR-69125 Доработка плагина ExecuteReportPlugin (исправление ошибок передачи параметров в репорт) ([a8458e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a8458efe5a833cec82c95c7f785e028e7ed64956))
+* TR-69125 Доработка плагина ExecuteReportPlugin (исправление ошибок передачи параметров в репорт) ([a4b514], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a4b5145ae8431e0b0af46351db74019a4f9129e2))
+* update: CHANGELOG.md ([10761e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/10761e0eaa12ede202531f6cac24956388a2736d))
+
 # Version 2.8.17, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51f5ec3eb47e0e8f6357a21d23aa0b5412ca66d7)
 * ## Features
 * <span style='color:green'>feat: HT-10458: remove empty summary row. fix template apply in footer and header</span> ([378487], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/378487478540583f055d1c4cc1ee281f434a9648))

package/package.json

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

package/src/Function.js

@@ -27,7 +27,9 @@ Ext.define('Coon.Function', {
      * @returns
      */
     doRequest: function(component, requestOptions, sync) {
-        const requestHash = Coon.util.generateHashFromObj(requestOptions);
+        const forHashData = Ext.clone(requestOptions);
+        delete forHashData.callback;
+        const requestHash = Coon.util.generateHashFromObj(forHashData);
         if (!this.beforeRequest(requestOptions, requestHash)) {
             return;
         }

package/src/common/component/TreeComponentStructure.js

@@ -90,7 +90,7 @@ Ext.define('Coon.common.component.TreeComponentStructure', {
                         iconCls: 'x-fa fa-list',
                         tooltip: 'редактировать (отчет)/смотреть структуру (кастомная панель)',
                         handler(view, rIdx, cIdx, item, e, record) {
-                            view.ownerCt.fireEvent('viewstructure', view, record);
+                            view.up().fireEvent('viewstructure', view, record);
                         },
                     }
                 ],
@@ -107,7 +107,7 @@ Ext.define('Coon.common.component.TreeComponentStructure', {
                         iconCls: 'x-fa fa-pen',
                         tooltip: 'редактировать этот компонент',
                         handler(view, rIdx, cIdx, item, e, record) {
-                            view.ownerCt.fireEvent('editelement', view, record);
+                            view.up().fireEvent('editelement', view, record);
                         },
                     }
                 ],
@@ -123,7 +123,7 @@ Ext.define('Coon.common.component.TreeComponentStructure', {
                         iconCls: 'x-fa fa-cog',
                         tooltip: 'исследовать этот компонент',
                         handler(view, rIdx, cIdx, item, e, record) {
-                            view.ownerCt.fireEvent('viewstructure', view, record);
+                            view.up().fireEvent('viewstructure', view, record);
                         },
                     }
                 ],
@@ -141,7 +141,7 @@ Ext.define('Coon.common.component.TreeComponentStructure', {
                         iconCls: 'x-fa fa-external-link-alt',
                         tooltip: 'перейти в конфигурацию в место определения компонента',
                         handler(view, rIdx, cIdx, item, e, record) {
-                            view.ownerCt.fireEvent('search', record);
+                            view.up().fireEvent('search', record);
                         },
                     }
                 ],

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

@@ -39,13 +39,13 @@ Ext.define('Coon.common.component.editor.CharacteristicLoaderPlugin', {
                 return;
             }
 
-            const newDate = typeof date === 'string' ? new Date(date) : date;
-            const effectiveDate = typeof this.model.effectiveDate === 'string' ?
-                new Date(this.model.effectiveDate) :
-                this.model.effectiveDate;
+            const getTruncated = (date) => {
+                date = Ext.isString(date) ? new Date(date) : date;
+                return new Date(date.setHours(0, 0, 0, 0)).valueOf();
+            };
 
-            if (new Date(newDate.setHours(0, 0, 0, 0)).valueOf() != new Date(effectiveDate.setHours(0, 0, 0, 0)).valueOf()) {
-                this.model.effectiveDate = newDate;
+            if (getTruncated(date) !== getTruncated(this.model.effectiveDate)) {
+                this.model.effectiveDate = date;
                 this.load();
             }
         }, characteristicEditor);
@@ -90,10 +90,10 @@ Ext.define('Coon.common.component.editor.CharacteristicLoaderPlugin', {
                 }
                 return data.map((el) => {
                     if (typeof el.value === 'string') {
-                        el.value = el.value.trim()
+                        el.value = el.value.trim();
                     }
-                    return el
-                })
+                    return el;
+                });
             },
             load: function() {
                 if (this.caching) {
@@ -123,7 +123,6 @@ Ext.define('Coon.common.component.editor.CharacteristicLoaderPlugin', {
                             this.model.subentityId = answer.subentityId || null;
                         }.bind(this),
                         params: this.model,
-                        scope: this,
                     }
                 );
             },
@@ -166,7 +165,6 @@ Ext.define('Coon.common.component.editor.CharacteristicLoaderPlugin', {
                             }
                         }.bind(this),
                         params: data,
-                        scope: this,
                     }
                 );
             },

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

@@ -544,7 +544,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         const {headerRows, dataRows, footerRows} =
             this.collectGridDataAsObject(this.getSelected(), exporter.excel);
         const tableHeaderRows = this.getTableHeaderRows(exporter);
-        const summaryRows = this.getSummaryRows();
+        const summaryRows = this.getSummaryRows(exporter.excel);
         // this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
         exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
         exporter.getContent = this.getContent.bind(exporter, this);
@@ -583,7 +583,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      *  ```
      * @returns {Object[]}
      */
-    getSummaryRows() {
+    getSummaryRows(workbook) {
         const summaryRows = [];
         if (!this.component.initialConfig.features.find((f) => f.summaryBar && f.showSummaryRow)) {
             return summaryRows;
@@ -592,7 +592,15 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
 
         if (summaries && summaries.length) {
             summaries.each((row) => {
-                summaryRows.push(row.getCells().getValues('_value').map((value) => ({value})));
+                summaryRows.push(row.getCells().getValues('_value').map((value) => {
+                    const res = {value: value};
+                    const styles = this.allBordersStyle;
+                    if (workbook && Ext.isNumber(value)) {
+                        styles.format = 'General Number';
+                    }
+                    res['styleId'] = workbook.addCellStyle(styles);
+                    return res;
+                }));
             });
         }
         return summaryRows;

package/src/uielement/component/settings/UiCustomPanelEditor.js

@@ -155,6 +155,7 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditor', {
                                     xtype: 'UiCPConfigPanel',
                                     title: 'Конфигурация',
                                     reference: 'UiAceEditorPanel',
+                                    cls: 'UiAceEditorPanel',
                                     flex: true,
                                     scrollable: 'y',
                                     bind: {

package/src/uielement/component/settings/UiCustomPanelEditor.scss

@@ -1,4 +1,7 @@
 .UiCustomPanelEditor {
+    .UiAceEditorPanel {
+        border-bottom: 4px solid gray;
+    }
     .good-hash {
         color: #64AA2B;
         font-size: 19px;

package/src/uielement/component/settings/config/UiCPConfigPanelController.js

@@ -117,9 +117,10 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
     },
 
     gotoConfig(record) {
+        const cmpId = record.get('componentId');
         if (record.get('type') === 'report') {
             if (record.get('source') === 'editor') {
-                const exist = this.lookup('uiEditor').searchGoto(`reportId: '${record.get('id')}'`);
+                const exist = this.lookup('uiEditor').searchGoto(`reportId: '${cmpId}'`);
                 if (exist) {
                     this.getView().setActiveTab(0);
                 }
@@ -166,6 +167,7 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
     },
 
     viewUi(view, record) {
+        const cmpId = record.get('componentId');
         const win = Ext.create('widget.WindowWrap', {
             title: 'просмотр UiElement',
             width: 800,
@@ -180,10 +182,10 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
         });
         const treePanel = win.down('TreeComponentStructure');
         const command = Ext.create('command.GetUIStructure');
-        command.get(record.get('id'), true)
+        command.get(cmpId, true)
             .then((uiStructure) => {
                 if (uiStructure.isParsingError === true) {
-                    Ext.Msg.alert('Сообщение системы', `Загрузка конфигурации репорта ${record.get('id')} не удалась.`);
+                    Ext.Msg.alert('Сообщение системы', `Загрузка конфигурации репорта ${cmpId} не удалась.`);
                 }
                 treePanel.store.setRoot(uiStructure);
                 treePanel.unmask();
@@ -197,7 +199,8 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
     },
 
     openReport(view, record) {
-        if (record.get('type') === 'report' && record.get('id')) {
+        const cmpId = record.get('componentId');
+        if (record.get('type') === 'report' && cmpId) {
             const win = Ext.create('widget.WindowWrap', {
                 maximized: true,
                 items: [
@@ -208,7 +211,7 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
                 ],
             });
             const reportForm = win.down('ReportFormEditPanel');
-            reportForm.getController().load(record.get('id'));
+            reportForm.getController().load(cmpId);
             win.show();
         }
     },

package/src/uielement/plugin/ExecuteReportPlugin.js

@@ -48,7 +48,22 @@ Ext.define('Coon.uielement.plugin.ExecuteReportPlugin', {
         try {
             const paramObj = JSON5.parse(paramValue);
             const arr = [];
-            Object.keys(paramObj).forEach((param) => arr.push({type: param, value: paramObj[param]}));
+            const context = this;
+            Object.entries(paramObj).forEach(([key, value]) => {
+                let paramValue;
+                if (value.startsWith('{')) {
+                    paramValue = context.vm.get(value.substring(1, value.length - 1));
+                } else {
+                    paramValue = value;
+                }
+
+                if (paramValue) {
+                    arr.push({
+                        type: key,
+                        value: paramValue,
+                    });
+                }
+            });
             return arr;
         } catch (ex) {
             Coon.log.error(ex);
@@ -119,10 +134,12 @@ Ext.define('Coon.uielement.plugin.ExecuteReportPlugin', {
 
                 Ext.each(command.inputParameters(), (field) => {
                     const paramValue = parameters[field.name];
-                    if (Ext.isString(paramValue) && paramValue.startsWith('{')) {
-                        initArguments.push(this.parsePropertiesToArray(paramValue));
-                    } else {
-                        initArguments.push(paramValue);
+                    if (paramValue) {
+                        if (Ext.isString(paramValue) && paramValue.startsWith('{')) {
+                            initArguments.push(this.parsePropertiesToArray(paramValue));
+                        } else {
+                            initArguments.push(paramValue);
+                        }
                     }
                 });
                 const fn = () => command.execute.apply(command, initArguments);

package/src/util.js

@@ -3,13 +3,15 @@ Ext.define('Coon.util', {
 
     locals: {},
 
-    generateHashFromObj(obj, opts) {
-        if (obj === undefined) {
+    generateHashFromObj(source, opts) {
+        if (!source) {
             return;
         }
+        const obj = Coon.util.markCircularLinks(source);
         try {
             return Ext.hashFromObj(obj, opts);
         } catch (ex) {
+            Coon.log.error(ex);
             return;
         }
     },
@@ -223,16 +225,6 @@ Ext.define('Coon.util', {
         return acc;
     },
 
-    getHtaEl: function() {
-        if (!this.htaEL) {
-            this.htaEL = document.createElement('textarea');
-            this.htaEL.id = 'coonHtaEL';
-            this.htaEL.style = 'position: absolute;left: -10000px;top: 0px;';
-            document.body.appendChild(this.htaEL);
-        }
-        return this.htaEL;
-    },
-
     copyToClipboard(copiedData) {
         try {
             if (!Ext.browser.is.Firefox && navigator && navigator.clipboard) {
@@ -522,6 +514,12 @@ Ext.define('Coon.util', {
         if (Ext.isObject(data)) {
             return 'object';
         }
+        if (data instanceof Set) {
+            return 'set';
+        }
+        if (data instanceof Map) {
+            return 'map';
+        }
         if (data === null) {
             return 'null';
         }
@@ -661,4 +659,59 @@ Ext.define('Coon.util', {
             }
         });
     },
+
+    isCircular(data) {
+        if (!Ext.isObject(data)) {
+            return;
+        }
+        const linkMap = new WeakSet();
+
+        /**
+         * Рекурсивный поиск циклической ссылки в объекте
+         * @param data
+         */
+        function detectCycle(data) {
+            if (Ext.isObject(data)) {
+                if (linkMap.has(data)) {
+                    return true;
+                }
+                linkMap.add(data);
+                if (Object.entries(data).find(([_, val]) => detectCycle(val))) {
+                }
+                return true;
+            }
+            if (Array.isArray(data) && data.length) {
+                if (data.find((val) => detectCycle(val))) {
+                    return true;
+                }
+            }
+        }
+        return detectCycle(data);
+    },
+
+    markCircularLinks(data) {
+        if (!Ext.isObject(data)) {
+            return data;
+        }
+        const markerValue = '__linkedObj';
+        const linkMap = new WeakSet();
+        const converter = (data) => {
+            const acc = {};
+            if (Ext.isObject(data)) {
+                if (linkMap.has(data)) {
+                    return markerValue;
+                }
+                linkMap.add(data);
+                Object.entries(data).forEach(([key, val]) => {
+                    acc[key] = converter(val);
+                });
+                return acc;
+            }
+            if (Array.isArray(data)) {
+                return data.map(converter);
+            }
+            return data;
+        };
+        return converter(data);
+    },
 });

package/src/version.js

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