ru.coon 3.0.77 → 3.0.78

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 3.0.78, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a6e988a302441a8caed1ca77948890a3d01926d2)
+* ## Fixes
+* <span style='color:red'> Добавление недостающих стилей, при формировании заголовка таблицы. Closes HT-10579.</span> ([2a5f88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2a5f88a201ed319f030164e13513458a09e0f2bf))
+* <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator set window title</span> ([d55115], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d55115c1684ecc8ad9e9689fc1216c22100ac076))
+* <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator set window title</span> ([3bc707], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3bc707c3aab9349482572c15e4f243a7ad97687d))
+* <span style='color:red'>fix HT-15169: CharacteristicGridEditor delete value</span> ([99e05a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/99e05a21822c48dce600109db56481baff030783))
+
+* update: CHANGELOG.md ([b9fef7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b9fef7414d9705114190b9f24db27727cd4d3d3b))
+
 # Version 3.0.77, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d15ddab76fd455fb8b9b82cbff864158bbf9a462)
 * ## Features
 * <span style='color:green'>feat: move new tab after current</span> ([775c5f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/775c5fd4ffc07e70db7b3524c260410448b21d4a))
@@ -5,10 +14,15 @@
 * update: CHANGELOG.md ([ee60b0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ee60b048f763cbf3d45439a54fbab4c370bb954f))
 
 # Version 3.0.76, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fcaeb8313f0e64d8f380e69efed2665ba4b4a6d6)
+* ## Fixes
+* <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator remove value</span> ([c492c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c492c3662b15701fcbe78bda2d62412373e7c91a))
+
 * update: CHANGELOG.md ([640dc5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/640dc51e5601eba349bc14c91ec0641c4a8d1d86))
 
 # Version 3.0.75, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bca8dfcc721f5bf5f9150e54f382e6224565f427)
 * ## Fixes
+* <span style='color:red'>fix HT-15169: CharacteristicGridEditor delete value</span> ([c2a6be], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2a6be72637a265ca2d368c68f4d16c31c2f6456))
+* <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator remove value</span> ([dd3606], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dd3606934e4acefe54956f835da038afc4b887b7))
 * <span style='color:red'> исправление в PeriodPickerPlugin сообщений minText и maxText</span> ([552b34], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/552b3430b8535edf87c420f54cc16f8d5dc03011))
 
 * HT-14725: исправление работы BindCustomPanelPlugin ([26547e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/26547e340cec89c0019b98ddf5c3ecd6a8b24438))

package/package.json

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

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

@@ -21,7 +21,6 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
     twoWayBindable: ['context'],
 
     initComponent: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
         this.tbarItems = this.tbarItems || [];
 
         this.createAdditionButtons();
@@ -61,9 +60,13 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                         buttons.del.disable();
                     } else {
                         if (select) {
-                            if (this.getSelection()[0].get(ns.$required)) {
+                            const isDeletableChar = this.isDeletableChar(this.getSelection()[0]);
+                            if (!isDeletableChar) {
                                 buttons.del.disable();
                             }
+                            const delButtonText = isDeletableChar === 'allowDeleteValue' ? 'Удалить значение' :
+                                isDeletableChar === 'allowDeleteChar' ? 'Удалить характеристику' : 'Удалить';
+                            buttons.del.setText(delButtonText);
                         } else {
                             buttons.del.disable();
                         }
@@ -96,6 +99,16 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
         this.on('cellclick', this.cellclickHandler, this);
     },
 
+    isDeletableChar: function(char) {
+        if (char.get('required') && char.get('allowEmpty') && char.get('value') && char.get('value').trim()) {
+            return 'allowDeleteValue';
+        } else if (!char.get('required')) {
+            return 'allowDeleteChar';
+        } else {
+            return false;
+        }
+    },
+
     createAdditionButtons: function() {
         const ns = Coon.report.model.CharacteristicBeanFields;
 
@@ -364,6 +377,10 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                 record.set(ns.$isDeleted, !currentIsDeleted);
             }
         }
+        if (record && (record.get(ns.$editable) || record.isNew) && this.isDeletableChar(record) === 'allowDeleteValue') {
+            record.set(ns.$value, ' ');
+            record.set(ns.$valueDescription, ' ');
+        }
         this.getView().refresh();
     },
 

package/src/common/component/editor/creators/TriggerFieldEditorCreator.js

@@ -46,6 +46,9 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         const props = this.parseMask(record.get(ns.$mask).trim());
         this.value = record.get(ns.$value);
 
+        const effectiveValue = !record.get('isDeleted') && (!!(record.get('valueDescription') && record.get('valueDescription').trim()) ?
+            record.get('valueDescription') : record.get('value'));
+
         const panel = Ext.create({
             xtype: 'ReportPanel',
             autoFilter: true,
@@ -53,12 +56,46 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         });
 
         const win = Ext.widget('WindowWrap', {
-            items: panel,
+            title: 'Редактирование характеристики '+ record.get('typeDescription'),
+            layout: {
+                type: 'vbox',
+            },
+            margin: 5,
+            items: [
+                {
+                    xtype: 'container',
+                    flex: 1,
+                    layout: {
+                        type: 'hbox',
+                        align: 'stretch',
+                    },
+                    hidden: !effectiveValue,
+                    margin: 5,
+                    items: [
+                        {
+                            xtype: 'displayfield',
+                            value: 'Значение характеристики:',
+                            fieldStyle: {
+                                fontSize: '14px',
+                                color: '#a9a9a9',
+                            },
+                        },
+                        {
+                            xtype: 'displayfield',
+                            flex: 1,
+                            value: effectiveValue,
+                            fieldStyle: {
+                                fontSize: '14px',
+                            },
+                        }
+                    ],
+                },
+                panel],
         });
         if (props) {
             const parameter = {};
             parameter[props.parameterName] = this.field.ID;
-            win.doInit(props.reportId, Object.assign(parameter, this.context), true);
+            panel.doInit(props.reportId, Object.assign(parameter, this.context), true);
         } else {
             Coon.log.error('Не задана маска характеристики');
         }
@@ -125,6 +162,7 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
 
             result.valueColumn = arr.length > ind ? arr[ind++] : result.parameterName;
             result.descriptionColumn = arr.length > ind ? arr[ind++] : result.valueColumn;
+            result.allowDeleteValue = arr.length > ind ? arr[ind++] : result.descriptionColumn;
         } else {
             Coon.log.error('Неверно задана маска характеристики');
         }

package/src/report/plugin/grid/exporters/xlsxExporter.js

@@ -7,8 +7,6 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
     },
 
     getExporter(filename) {
-        // Coon.perf.clearAll();
-        // const stopMeasure = Coon.perf.start('getExporter', true);
         const exporter = Ext.create('Ext.exporter.excel.Xlsx', {
             fileName: filename + '.xlsx',
             tableHeaderStyle: this.tableHeaderStyle,
@@ -28,15 +26,38 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
         const {headerRows, dataRows, footerRows} =
             this.collectGridDataAsObject(this.getSelected(), exporter.excel);
         const tableHeaderRows = this.getTableHeaderRows(exporter);
+        this.mergeDown(tableHeaderRows);
+        this.mergeAcross(tableHeaderRows);
         const summaryRows = this.getSummaryRows(exporter.excel);
         exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
         exporter.getContent = this.getContent.bind(exporter, this);
-        // Coon.log.debug(
-        //     Coon.perf.getLog(stopMeasure())
-        // );
         return exporter;
     },
 
+    mergeDown(rows = []) {
+        rows.forEach((row, rowIndex) => {
+            row.forEach(({index, mergeDown, styleId}) => {
+                if (typeof mergeDown === 'number') {
+                    for (let i = rowIndex + mergeDown; i > rowIndex; i--) {
+                        rows[i].splice(index - 1, 0, {styleId, index});
+                    }
+                }
+            });
+        });
+    },
+
+    mergeAcross(rows = []) {
+        rows.forEach((row) => {
+            row.forEach(({index, mergeAcross, styleId}, cellIndex) => {
+                if (typeof mergeAcross === 'number') {
+                    for (let i = mergeAcross; i > 0; i--) {
+                        row.splice(cellIndex + 1, 0, {styleId, index: index + i});
+                    }
+                }
+            });
+        });
+    },
+
     getContent: function() {
         const me = this;
         const config = this.getConfig();
@@ -116,16 +137,6 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
         if (this.plugin.footerXlsx) {
             footerRows = this.parseJsEditorObj(this.plugin.footerXlsx, workbook);
         }
-        // Coon.log.debug(
-        //     Coon.perf.getLog(stopMeasure())
-        // );
-        // Coon.log.debug(
-        //     Coon.perf.getLog('mergeDeep', 6)
-        // );
-        // Coon.log.debug(
-        //     Coon.perf.getLog('collectColumns', 5)
-        // );
-
         return {headerRows, dataRows, footerRows};
     },
 

package/src/version.js

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