ru.coon 2.5.54 → 2.5.56

package/CHANGELOG.md

@@ -1,7 +1,20 @@
+# Version 2.5.56, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/128444f42dc670412319a7f3bf6c53407f8ca3c7)
+* ## Features
+* <span style='color:green'>feat: HT-7788: check execute chain function result on error, add validation function in unified toolbar plugin</span> ([9af285], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af28505fd7c8761aa0cfe51d258892307a25d5d))
+
+* update: CHANGELOG.md ([cb4c2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb4c2a146ce95de7c03a07b1e3ac2c7fbc6f96d3))
+
+# Version 2.5.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/445f548a2eab2e58d40a1546de00e01a3c1e916c)
+* ## Features
+* <span style='color:green'>feat: BFL-10334: download file with blob</span> ([e42e68], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e42e682f7375feffb124b6f5179f2a1b96d7757c))
+
+* update: CHANGELOG.md ([60f4e5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/60f4e58dd2c9435c6bca2071f424d505d38d33c6))
+
 # Version 2.5.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dce855dcf30fcb0c1d67bb6b9a4a7539de768415)
 * ## Features
 * <span style='color:green'>feat: HT-7346: set window event on render added panel, call prepare data function after save data without errors</span> ([36feb3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/36feb3e46bf4832e4895c8c5d141ad21c798c554))
 
+* доработка ([02e3c2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/02e3c26fb432149572daffab3ef184e59446caec))
 * update: CHANGELOG.md ([bb9bf0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb9bf0d92699bedcdd6e96f4cb5a799d7ec2005f))
 
 # Version 2.5.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/71f06d3a65bdf8040963d24a7ff0e6ac59946c7a)
@@ -15,7 +28,9 @@
 * ## Fixes
 * <span style='color:red'> HT-7346: fix add docked and throw promise error</span> ([46b17e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/46b17e452222787468ef0e65e49cd8e40cc9797e))
 
+* доработка ([2f662b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f662bd8b10f0f6538ac73d4b1dd5454d33e81e6))
 * upd ([3b137b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b137bc6ff518b9769e55674484c1d3e14469e23))
+* доработка ([5576b5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5576b537908f14868b5173714db88b20ce8453f7))
 * update: CHANGELOG.md ([d9c853], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9c8532cdef4cf46572967c94895486657a5bba1))
 
 # Version 2.5.51, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/86e7f44d186c08b70ff00747e70cbb182686afd7)
@@ -26,6 +41,8 @@
 * <span style='color:red'>Fix:HT-7717 check fieldEnd available in DatePickerPresetsField</span> ([6e6b33], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6e6b3308d04afa2692997d71a3d62330f64d67d6))
 * <span style='color:red'> HT-7346: fix file name</span> ([01983d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/01983d80a30d5fd27892cb7c6e6900b27aebdf1f))
 
+* доработка ([51e1e9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51e1e939c846f539d57fb3eca650ed1cb3d31723))
+* доработка ([33355a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/33355a1e64b6e7906a655aaebc8511f1c0691f64))
 * update: CHANGELOG.md ([538bf4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/538bf4e7fc238603638f833a7fe3f5ef28bdf513))
 
 # Version 2.5.50, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b79597948d4412d8613b028e5e07e49cfb173eb4)
@@ -44,6 +61,8 @@
 * <span style='color:red'>fix Coon.util.promisifyCmd
 fix ReportPanel.loadData - abort previous request</span> ([03cfbd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/03cfbdf8eabc0a6fde879fa2ce52bd5126a823ee))
 
+* доработка ([0457f5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0457f59fe9af7ca16aa1bc8a1fc7568bbfc8f5f1))
+* ошибка ([3a0634], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3a0634200b8e80bdc884a0c5976caa7192180d99))
 * update: CHANGELOG.md ([d298b4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d298b44d4f63889dc665577ca11e622bfb176422))
 
 # Version 2.5.48, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ab1fb66dd225271b18992c928a288a9d5115ff7b)
@@ -52,6 +71,11 @@ fix ReportPanel.loadData - abort previous request</span> ([03cfbd], [link](http:
 
 * add decimal-light - arbitrary-precision Decimal type for JavaScript
 fix Coon.format.MoneyFormat, zero always format as positive value ([09a4ad], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/09a4ad9879f025371db56475252ec93eeb52b265))
+* перенос чекбокса и работа с value ([c56525], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c5652553cca0934ec1549f6e0762f481161b2998))
+* исправление ошибок ([44fc10], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44fc1038ab848989c56bf51ad56933f5fe2f2535))
+* исправление ошибок ([fcc83e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fcc83e4aa4d85b241723c2fd1d317bafe5b44689))
+* доработка ([dbc2bf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dbc2bf69be0d31423c93275b01e320703823dbb2))
+* В CopyRowsFromGrid конфигурация поля Используемые фильтры ([add0e7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/add0e76c6220b5e399a24316a5c6d4775098ca5f))
 * HT-7447 feat: возможность создавать свойства команды с описанием ([cc129c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cc129c3265992db5f859f9e32fdc95cd8a3ad88f))
 * HT-7594 При добавлении УУТЭ иногда значения характеристик с датами не отображаются ([2348bf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2348bf78876bcb5c0e81d37b36f89d5a85a7d9d4))
 * update: CHANGELOG.md ([b7579a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b7579a137a55be1d35602720fa3aef2909b7b635))

package/package.json

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

package/src/report/plugin/configPanel/CopyRowsFromGridConfigPanel.js

@@ -138,7 +138,6 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
                     name: 'showFormatSelectDialog',
                     value: false,
                 }
-
             ],
         };
     },
@@ -312,6 +311,41 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
                     xtype: 'checkbox',
                     boxLabel: 'Заполненные параметры фильтра',
                     name: 'addFilters',
+                    bind: '{addFilters}',
+                    value: false,
+                    listeners: {
+                        change: function(checkbox, value) {
+                            this.up().down('checkbox#addNameFiltersParameters').setValue(value);
+                        },
+                    },
+                },
+                {
+                    xtype: 'checkbox',
+                    boxLabel: 'Отображение заголовка используемых фильтров',
+                    name: 'addNameFiltersParameters',
+                    itemId: 'addNameFiltersParameters',
+                    value: false,
+                    disabled: true,
+                    bind: {
+                        disabled: '{!addFilters}',
+                    },
+                    listeners: {
+                        change: function(checkbox, newValue) {
+                            const textfield = this.up().down('textfield');
+                            textfield.setDisabled(!newValue);
+                            if (newValue) {
+                                textfield.setValue('Используемые фильтры:');
+                            } else {
+                                textfield.setValue('');
+                            }
+                        },
+                    },
+                },
+                {
+                    xtype: 'textfield',
+                    fieldLabel: 'Заголовок для используемых фильтров',
+                    name: 'nameFiltersParameters',
+                    disabled: true,
                 }
             ],
         };

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

@@ -16,6 +16,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     exportAllRows: false,
     addHeader: undefined,
     addFilters: undefined,
+    addNameFiltersParameters: false,
+    nameFiltersParameters: 'Используемые фильтры:',
     recordsToExport: undefined,
     dateFormat: undefined,
     floatPrecision: undefined,
@@ -72,7 +74,11 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                             itemId: 'getSelectedButton',
                             handler: Ext.bind(this.handler, this),
                         },
-                        {text: 'Выгрузить все', itemId: 'getAllButton', handler: Ext.bind(this.handler, this)}
+                        {
+                            text: 'Выгрузить все',
+                            itemId: 'getAllButton',
+                            handler: Ext.bind(this.handler, this),
+                        }
                     ],
                 }),
             }, config));
@@ -845,10 +851,13 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      */
     collectFilters: function() {
         const reportPanel = this.component.up('ReportPanel');
+        let name = '';
         const result = [];
+        if (this.addNameFiltersParameters) {
+            name = this.nameFiltersParameters;
+        }
         if (this.addFilters === true) {
-            result.push('<h2 style=" color:gray;font-size:1.3em;">' + 'Используемые фильтры:' + '</h2>');
-
+            result.push('<h2 style=" color:gray;font-size:1.3em;">' + name +'</h2>');
             const customXtype = ['SimpleReportTag'];
             const filterComponents = function(comp) {
                 return Ext.getClassName(comp) !== 'Ext.form.field.Display' &&
@@ -876,7 +885,6 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 .filter(filterComponents)
                 .forEach(renderFilterConditions);
         }
-
         return result.join('');
     },
 

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

@@ -190,7 +190,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         Ext.Ajax.request({
             url,
             method: 'POST',
-            // binary: true,
+            binary: true,
             timeout: this.getTimeout(),
             params: {
                 reportId: this.report.reportId,
@@ -202,13 +202,10 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             },
             success(responce) {
                 this.grid.unmask();
-                const csvContent = 'data:text/csv;charset=utf-8,%EF%BB%BF' + encodeURI(responce.responseText);
-                const link = document.createElement('a');
-                link.setAttribute('href', csvContent);
-                link.setAttribute('download', `${fileName}.csv`);
-                document.body.appendChild(link); // Required for FF
-                link.click();
-                link.parentNode.removeChild(link);
+                Coon.util.downloadFileFromBlob(
+                    new Blob(['\uFEFF', responce.responseBytes], {type: 'text/csv;charset=utf-8'}),
+                    `${fileName}.csv`
+                );
             },
             failure(error) {
                 this.grid.unmask();

package/src/uielement/plugin/MethodChainPlugin.js

@@ -48,6 +48,10 @@ Ext.define('Coon.uielement.plugin.MethodChainPlugin', {
                     }
                     break;
                 }
+            } else {
+                if (result === false) {
+                    break;
+                }
             }
         }
     },

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -94,6 +94,26 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
         }
     },
     async callSaveHandler(closeAfterSave) {
+        if (
+            this.validateBeanHandlerName &&
+            this.controller[this.validateBeanHandlerName] &&
+            typeof this.controller[this.validateBeanHandlerName] === 'function'
+        ) {
+            const result = this.controller[this.validateBeanHandlerName].call(this.controller);
+            if (result instanceof Promise) {
+                result.then(() => {
+                    this.controller[this.validateBeanHandlerName].call(this.controller);
+                });
+                const isError = await result.catch(() => 'error');
+                if (isError === 'error') {
+                    return false;
+                }
+            } else {
+                if (result !== true) {
+                    return false;
+                }
+            }
+        }
         if (
             this.saveHandlerName &&
             this.controller[this.saveHandlerName] &&

package/src/uielement/plugin/configPanel/UnifiedButtonToolbarPluginConfigPanelFormEditor.js

@@ -6,6 +6,7 @@ Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPa
         data: {
             saveHandlerName: '',
             prepareBeanHandlerName: '',
+            validateBeanHandlerName: '',
             dock: 'bottom',
         },
     },
@@ -56,6 +57,23 @@ Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPa
                 displayField: 'id',
             },
         },
+        {
+            xtype: 'comboBtnWrapper',
+            combobox: {
+                xtype: 'BaseComboBox',
+                fieldLabel: 'Функция валидации данных',
+                labelWidth: 60,
+                flex: 1,
+                loadOnRender: false,
+                hideMode: 'offsets',
+                store: 'codeHandlers',
+                bind: {
+                    value: '{validateBeanHandlerName}',
+                },
+                valueField: 'id',
+                displayField: 'id',
+            },
+        },
         {
             xtype: 'segmentedbutton',
             allowMultiple: false,
@@ -90,7 +108,7 @@ Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPa
     getConfiguration: function() {
         const result = {};
         const vm = this.getViewModel();
-        ['saveHandlerName', 'prepareBeanHandlerName', 'dock'].forEach((el) => {
+        ['saveHandlerName', 'prepareBeanHandlerName', 'validateBeanHandlerName', 'dock'].forEach((el) => {
             if (vm.get(el)) {
                 result[el] = vm.get(el);
             }

package/src/version.js

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