ru.coon 2.8.15 → 2.8.17

package/CHANGELOG.md

@@ -1,12 +1,29 @@
+# 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))
+
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update file FIOField.js151e69908b2b1601488561180fb27485dd745da8))
+* update: CHANGELOG.md ([3da6d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3da6d4cc8a37e38a6844115b356539d4c92343eb))
+
+# Version 2.8.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/87872e4d0fe6f6cdf23cc72721ec14721a15e7c8)
+* ## Features
+* <span style='color:green'>feat: HT-10401: check unused records and disable button</span> ([30a78e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/30a78e86d06aa91646d7e1ef71b98ba7d57a965d))
+
+* update: CHANGELOG.md ([80dc33], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80dc3360b47ddac2924e7d25d40873815511154a))
+
 # Version 2.8.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8243a899e863488223002046a50b6692d3af8fb5)
 * ## Features
 * <span style='color:green'>feat: HT-10125: remove tbfill when it has in items</span> ([f57798], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f57798b08404721c6d13512b3be38771dc53ee30))
 * <span style='color:green'>feat: HT-10125: remove tbfill when it has in items</span> ([3e9b04], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e9b04e719016aedab59ac8b889da93de0540715))
+* <span style='color:green'>feat: HT-10008: refactor overrides styles code part</span> ([ffbcc9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ffbcc9fc179deba7c46fb1e158136cd32a5d4c3c))
 * <span style='color:green'>feat: HT-8951: fix css</span> ([7ddd11], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ddd117e3ba365e1c2da3472ecd0efe180e1e204))
+* <span style='color:green'>feat: HT-10485: apply tpl for xls and xlsx</span> ([eb4503], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb450352f7e5062d394f6b0f29eff84603c1511a))
 
 * ## Fixes
 * <span style='color:red'>fixes</span> ([77fb8d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/77fb8de94f02156769b48092d91ea16a11f9aa94))
 
+* HT-10126 доработать RestoreSelectionPlugin, чтобы первая запись выбиралась на afterrender ([a8c823], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a8c823280eb868d5fc9ff135022ce3c5ad6e9ffa))
+* CRM-9117 Удвоенная информация о формате полей Имени и Фамилии при создании ФЛ ([5ed95a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5ed95ab5eb3f7bb4f392e2111ac41a9138641010))
 * update: CHANGELOG.md ([b6ceb3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6ceb36854b9ae262d9dcf375f19695392da16ca))
 
 # Version 2.8.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcae10177e3289827d597b883c0e7be99ff45e98)

package/package.json

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

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

@@ -842,6 +842,23 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
 
     },
 
+    hasUnusedTypes() {
+        const usedTypeList = this.getUsedTypeList();
+        const unused = this.getTypeList().filter(function(record) {
+            if (
+                !record[Coon.report.model.CharacteristicBeanFields.$visible] ||
+                (
+                    record[Coon.report.model.CharacteristicBeanFields.$single] &&
+                    usedTypeList.indexOf(record[Coon.report.model.CharacteristicBeanFields.$type]) != -1
+                )
+            ) {
+                return false;
+            }
+            return true;
+        });
+        return unused.length > 0;
+    },
+
     // private
     getTypeList: function() {
         return this.typeMap.getRange(0, this.typeMap.getCount());

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

@@ -44,6 +44,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                 },
             },
         });
+
         this.plugins = Ext.clone(this.plugins) || [];
 
         if (this.enableToolBar) {
@@ -58,12 +59,15 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                     if (this.getReadMode()) {
                         buttons.add.disable();
                         buttons.del.disable();
-                    } else if (select) {
-                        if (this.getSelection()[0].get(ns.$required)) {
+                    } else {
+                        if (select) {
+                            if (this.getSelection()[0].get(ns.$required)) {
+                                buttons.del.disable();
+                            }
+                        } else {
                             buttons.del.disable();
                         }
-                    } else {
-                        buttons.del.disable();
+                        buttons.add.setDisabled(!this.hasUnusedTypes());
                     }
                 }.bind(this),
 
@@ -331,6 +335,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                 }
             }
         }
+        this.processButtons();
     },
 
     delHandler: function() {

package/src/common/field/FIOField.js

@@ -8,26 +8,26 @@ Ext.define('Coon.common.field.FIOField', {
         // Если одно или больше трех слов
         this.defaultRegex = /^[А-ЯЁ][.]?[а-яё]*(?:[\s.][А-ЯЁ][а-яё]*)*$/;
         this.defaultMsg =
-            'Слова должны начинаться с заглавной буквы и заканчиваться строчной.' +
+            'Слова должны начинаться с заглавной буквы и заканчиваться строчной. ' +
             'Допускается использовать инициалы в формате "А."'
         ;
         this.rules = [
             {
                 words: 1,
                 regex: this.defaultRegex,
-                msg: this.defaultMsg,
+                msg: '',
             },
             // Бюльбюль(-Оглы| оглы| Оглы)
             {
                 words: 2,
                 regex: /^[А-Я]*([А-ЯЁ][а-яё]*[-\s][А-яЁё]*)$/,
-                msg: 'Если два слова: разделитель - дефис или пробел.',
+                msg: ' Если два слова: разделитель - дефис или пробел.',
             },
             // Ван-(дер|Дер)-Варт
             {
                 words: 3,
                 regex: /^[А-Я]*([А-ЯЁ][а-яё]*[-\s][А-яЁё]*[-\s][А-ЯЁ][а-яё]*)$/,
-                msg: `Если три слова: последнее слово с заглавной буквы.`,
+                msg: ' Если три слова: последнее слово с заглавной буквы.',
             }
         ];
 
@@ -54,7 +54,7 @@ Ext.define('Coon.common.field.FIOField', {
                 .filter((word) => word !== '').length;
             const rule = this.rules[wordsCount - 1];
             const regex = (rule && rule.regex) || this.defaultRegex;
-            const msg = (rule && rule.msg) || this.defaultMsg;
+            const msg = (rule && rule.msg) || '';
             if (!this.upperCase && !regex.test(value)) {
                 return this.defaultMsg + msg;
             }
@@ -62,7 +62,7 @@ Ext.define('Coon.common.field.FIOField', {
         if (this.upperCase && !/(^[А-ЯЁ]*[?\-][А-ЯЁ]+$)|(^[А-ЯЁ]+$)|(^[А-ЯЁ][?.]+$)/.test(value)) {
             return (
                 'Значение должно состоять из заглавных букв. ' +
-                'Допускается использовать -, но после него должна быть заглавная буква' +
+                'Допускается использовать -, но после него должна быть заглавная буква. ' +
                 'Допускается использовать инициалы в формате "А."'
             );
         }

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

@@ -51,6 +51,21 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             color: '#000000',
         },
     },
+    htmlEntities: [
+        {regex: '>', entity: '>'},
+        {regex: '<', entity: '&lt;'},
+        {regex: '&', entity: '&amp;'}
+    ],
+
+    html_entities_decode(s) {
+        let reg;
+        for (const v in this.htmlEntities) {
+            reg = new RegExp(this.htmlEntities[v].entity, 'g');
+            s = s.replace(reg, this.htmlEntities[v].regex);
+        }
+        return s;
+    },
+
     injectForm() {
         // if element already exist
         if (document.querySelector(`form#${this.formId()}`)) {
@@ -205,14 +220,18 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return this.mergeDeep(target, ...sources);
     },
 
-    applyTemplate(content) {
+    getCurrentFilterParameters() {
+        return this.component.up('ReportPanel').currentParamList || {};
+    },
+
+    applyTemplate(content = '', data = {}) {
         const tpl = new Ext.XTemplate(content, {
             disableFormats: true,
             date(format = 'd.m.Y') {
                 return Ext.Date.format(new Date(), format);
             },
         });
-        return tpl.apply({params: this.component.up('ReportPanel').currentParamList || {}});
+        return tpl.apply(Object.assign(data, {parameters: this.getCurrentFilterParameters()}));
     },
 
     parseJsEditorObj: function(obj, workbook) {
@@ -228,8 +247,9 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             table.data.rows.forEach((tr) => {
                 result.push(tr.reduce((accumulator, td) => {
                     if (td.display === true) {
+                        const html = this.processingTemplate(this.html_entities_decode(td.content).replace(/&nbsp;|<br>/gi, ''));
                         const tmp = {
-                            'value': this.applyTemplate(td.content.replace(/<br>/gi, '')),
+                            'value': this.applyTemplate(html, this.getDataForTemplate(html)),
                         };
                         if (td.colspan && td.colspan > 1) {
                             tmp.mergeAcross = td.colspan - 1;
@@ -368,7 +388,6 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         const dataRows = [];
         let headerRows = [];
         let footerRows = [];
-        const dataForTemplate = this.getDataForTemplate();
         const grid = this.component;
         const columnModel = grid.getColumns();
         const columnCount = grid.getColumns().length;
@@ -381,11 +400,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             );
         }
         if (this.headerXlsx) {
-            const headerXlsx = this.parseJsEditorObj(this.headerXlsx, workbook);
-            const tmpl = new Ext.XTemplate(
-                this.processingTemplate(JSON.stringify(headerXlsx))
-            ).apply(dataForTemplate);
-            headerRows = headerRows.concat(JSON.parse(tmpl));
+            headerRows = headerRows.concat(this.parseJsEditorObj(this.headerXlsx, workbook));
         }
         const dataIndexToColumn = [];
         const visibleColumns = [];
@@ -417,11 +432,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             );
         }, this);
         if (this.footerXlsx) {
-            const footerXlsx = this.parseJsEditorObj(this.footerXlsx, workbook);
-            const tmpl = new Ext.XTemplate(
-                this.processingTemplate(JSON.stringify(footerXlsx))
-            ).apply(dataForTemplate);
-            footerRows = JSON.parse(tmpl);
+            footerRows = this.parseJsEditorObj(this.footerXlsx, workbook);
         }
         return {headerRows, dataRows, footerRows};
     },
@@ -477,8 +488,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             return fileName;
         }
         try {
-            fileName = new Ext.XTemplate(fileName, {strict: true}).apply({
-                parameters: this.component.up('ReportPanel').currentParamList || {},
+            fileName = this.applyTemplate(fileName, {
+                parameters: this.getCurrentFilterParameters(),
             });
         } catch (err) {
             Coon.log.warn(err);
@@ -534,7 +545,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             this.collectGridDataAsObject(this.getSelected(), exporter.excel);
         const tableHeaderRows = this.getTableHeaderRows(exporter);
         const summaryRows = this.getSummaryRows();
-        this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
+        // this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
         exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
         exporter.getContent = this.getContent.bind(exporter, this);
         return exporter;
@@ -574,19 +585,14 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      */
     getSummaryRows() {
         const summaryRows = [];
+        if (!this.component.initialConfig.features.find((f) => f.summaryBar && f.showSummaryRow)) {
+            return summaryRows;
+        }
         const summaries = this.exporter.getConfig().data.getSummaries();
+
         if (summaries && summaries.length) {
             summaries.each((row) => {
-                let flag = false;
-                const values = row.getCells().getValues('_value').map((value) => {
-                    if (value) {
-                        flag = true;
-                    }
-                    return ({value});
-                });
-                if (flag) {
-                    summaryRows.push(values);
-                }
+                summaryRows.push(row.getCells().getValues('_value').map((value) => ({value})));
             });
         }
         return summaryRows;
@@ -941,7 +947,6 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         const result = [];
         const grid = this.component;
         const columnCount = grid.getColumns().length;
-        const dataForTemplates = this.getDataForTemplate();
         result.push('<html>' +
             '<head>' +
             '<meta http-equiv=Content-Type content="text/html; charset=utf-8">' +
@@ -961,9 +966,9 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             }
             result.push('</tbody></table>');
         }
-
         if (!Ext.isEmpty(this.header)) {
-            result.push(new Ext.XTemplate(this.processingTemplate(this.headerTemplate.html)).apply(dataForTemplates));
+            const html = this.processingTemplate(this.html_entities_decode(this.headerTemplate.html));
+            result.push(this.applyTemplate(html, this.getDataForTemplate(html)));
         }
         // собираем заголовки
         const dataIndexToColumn = [];
@@ -1005,7 +1010,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 fields.map(({name}) => name).filter(
                     (name, index) => visibleColumns.includes(index)
                 ).forEach((name, index) => {
-                    rec.set(name, row[index].value);
+                    rec.set(name, row[index] ? row[index].value : '');
                 });
                 selections.push(rec);
             });
@@ -1024,7 +1029,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         result.push('</table>');
         // Нижний колонтитул (если задан).
         if (!Ext.isEmpty(this.footer)) {
-            result.push(new Ext.XTemplate(this.processingTemplate(this.footerTemplate.html)).apply(dataForTemplates));
+            const html = this.processingTemplate(this.html_entities_decode(this.footerTemplate.html));
+            result.push(this.applyTemplate(html, this.getDataForTemplate(html)));
         }
         result.push('</body></html>');
         return result;
@@ -1140,23 +1146,23 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                         </td>
                     `);
             } else {
-                const col = Ext.apply(
-                    {value: this.getRenderedValue(value, valueType) || ''},
-                    this.getRowStyleXlsx(grid, record, workbook)
-                );
+                let styles = this.getRowStyleXlsx(grid, record, workbook);
+                const col = {value: this.getRenderedValue(value, valueType) || ''};
+                styles = this.mergeDeep(styles, this.allBordersStyle);
                 if (valueType === 'float') {
                     let precision = Number(columnConfig.precision);
                     if (!Number.isInteger(precision)) {
                         precision = Number(this.getConfig('floatPrecision') || this.defaultFloatPrecision);
                     }
-                    col['styleId'] = workbook.addCellStyle({
-                        format: precision !== 0 ? '0.'.padEnd(precision + 2, '0') : '0',
-                    });
+                    styles = this.mergeDeep(styles, {format: precision !== 0 ? '0.'.padEnd(precision + 2, '0') : '0'});
                     if (col['value'].length) {
                         col['value'] = parseFloat(col['value'].replace(/\s/g, '').replace(',', '.'));
                     }
                 }
-                result.push(col);
+
+                col['styleId'] = workbook.addCellStyle(styles);
+
+                result.push(JSON.parse(JSON.stringify(col)));
             }
         }, this);
         if (!object) {
@@ -1181,7 +1187,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             }
         }
 
-        return Object.keys(styles).length ? {'styleId': workbook.addCellStyle(styles)} : {};
+        return {styles: styles};
     },
     getRowStyle: function(grid, record) {
         const rowElement = Ext.fly(grid.getView().getRow(grid.getStore().indexOf(record)));
@@ -1301,8 +1307,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
 
     // Получение параметров шаблонов
-    getDataForTemplate: function() {
-        const text = (this.header || '') + (this.footer || '');
+    getDataForTemplate: function(text) {
         if (Ext.isEmpty(text)) {
             return {};
         }

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

@@ -27,7 +27,15 @@ Ext.define('Coon.report.plugin.grid.RestoreSelectionPlugin', {
     init: function(grid) {
         this.grid = grid;
         grid.setRecordIDForRestore = Ext.bind(this.setRecordIDForRestore, this);
-        grid.getStore().on('load', this.restoreSelectionHandler, this);
+
+        if (!grid.rendered) {
+            grid.on('afterrender', function() {
+                this.restoreSelectionHandler();
+                grid.getStore().on('load', this.restoreSelectionHandler, this);
+            }, this, {single: true});
+        } else {
+            grid.getStore().on('load', this.restoreSelectionHandler, this);
+        }
         grid.getSelectionModel().on('selectionchange', this.storeSelectionHandler, this);
         grid.on('newEntityAdd', this.setRecordIDForRestore, this);
     },

package/src/version.js

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