ru.coon 2.7.71 → 2.7.72

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 2.7.72, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3f8a4ef311ec96763166dbe8024b538f84ef3059)
+* ## Fixes
+* <span style='color:red'> BFL-15221 NoteEditorCreator save char</span> ([f84fbe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f84fbe281e0bc8a0b63f1ebc0e7f99ef6bc13703))
+* <span style='color:red'> BFL-15221 NoteEditorCreator save char</span> ([867ac3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/867ac3aae8286bdaeb28cbdb6621835c64b46e02))
+* <span style='color:red'> BFL-15221 NoteEditorCreator save char</span> ([763e5e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/763e5e9698c48152030d556b70e7118c8f9fbef6))
+* <span style='color:red'> HT-9812 ExportReportToData mini refactoring</span> ([587848], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/587848edd5af1f741ddc7955c01fc9f5b8a15b84))
+
+* refactoring Coon.Function.executeComponentDoInit, OpenCustomPanelButtonPlugin ([257c38], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/257c38fc91c1c8eff31848d28e63e1d63d423a6c))
+* update: CHANGELOG.md ([92e4c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/92e4c7496c4a5a87501a676805165c328272c1f8))
+
 # Version 2.7.71, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/71f09381b29db031d26baa580e8c18fc436a5a81)
 * ## Fixes
 * <span style='color:red'>fix GetUIStructure
@@ -238,6 +248,7 @@ fix: restore version of custom panel in editor</span> ([53a300], [link](http://g
 * ## Fixes
 * <span style='color:red'> Remove scrollbar visibility && revert menu width. Related to HT-9095.</span> ([acc197], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/acc1977f32526ee7b49c8d60f95af9ed1d87faf1))
 * <span style='color:red'> HT-9208 submit button disabled until file is selected</span> ([c55498], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c55498ff17153280cfc025f435eea7acf4be8b0c))
+* <span style='color:red'> HT-9272 ExportReportDataToFilePlugin add property exportAllRows</span> ([b6de17], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6de17fbd7687720d45595ba372669b076176e3f))
 
 * update: CHANGELOG.md ([c4f6c0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c4f6c05b996abea0c49849086c9aef2a4c9e2e6b))
 

package/package.json

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

package/src/Function.js

@@ -491,26 +491,28 @@ Ext.define('Coon.Function', {
         return result;
     },
 
-    executeComponentDoInit: function(component, parameters) {
-        const appropriateToInit = component &&
-            typeof component.getController === 'function' &&
+    executeComponentDoInit: function(component, parameters = {}) {
+        if (!component) {
+            Coon.log.error('Coon.Function.executeComponentDoInit error: component cant be empty');
+            return false;
+        }
+        const scope = typeof component.getController === 'function' &&
             component.getController() || component;
-        if (Ext.isFunction(appropriateToInit.doInit)) {
-            const initArguments = [];
-            const p = parameters || [];
-            const pObject = parameters || {};
-            if (Ext.isFunction(appropriateToInit.inputParameters)) {
-                Ext.each(appropriateToInit.inputParameters(), function(field) {
-                    const parameterName = field.name;
-                    const parameterValue = p[parameterName];
-                    initArguments.push(parameterValue);
-                    pObject[parameterName] = parameterValue;
-                });
-            }
-            appropriateToInit.doInit.apply(appropriateToInit, initArguments);
-            return pObject;
+        if (typeof scope.doInit !== 'function') {
+            return false;
         }
-        return false;
+        const inputParameters = typeof scope.inputParameters === 'function' &&
+            Array.isArray(scope.inputParameters()) &&
+            scope.inputParameters() ||
+            [];
+        const args = inputParameters.reduce((acc, {name}) => {
+            if (typeof name === 'string' && name) {
+                acc.push(parameters[name]);
+            }
+            return acc;
+        }, []);
+        scope.doInit.apply(scope, args);
+        return parameters;
     },
 
     getDecimalSeparator: function() {

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

@@ -3,13 +3,12 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
     alias: 'widget.NoteEditorCreator',
     xtype: 'NoteEditorCreator',
     createField: function(record, parent) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
         this.field = Ext.create(Ext.apply({
             xtype: 'OpenDialogField',
             dialogForm: this.showPanel(record, parent),
             getValue: this.getValue,
-            noteID: record.get(ns.$value),
-            text: record.get(ns.$valueDescription),
+            noteID: record.get('value'),
+            text: record.get('valueDescription'),
             setVisibleValue: function(visibleValue) {
                 this.visibleValue = visibleValue;
             },
@@ -21,10 +20,7 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
     },
 
     showPanel: function(record, parent) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-
-        this.noteID = record.get(ns.$value);
-        this.text = record.get(ns.$valueDescription);
+        this.noteID = record.get('value');
         this.textField = Ext.create({
             xtype: 'textarea',
             width: '99%',
@@ -58,7 +54,9 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
                         xtype: 'button',
                         ui: 'orange-button',
                         text: 'Сохранить',
-                        handler: this.saveValue.bind(this),
+                        handler: function() {
+                            this.saveValue(record, parent);
+                        }.bind(this),
                     },
                     {
                         xtype: 'button',
@@ -71,33 +69,43 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
                 ],
             }],
 
-            title: 'Редактирование характеристики ' + record.get(ns.$typeDescription),
+            title: 'Редактирование характеристики ' + record.get('typeDescription'),
         });
-        this.win.on('setValue', function() {
-            record.set(ns.$value, this.textField.getValue().trim() ? this.getValue() : '');
-            record.set(ns.$valueDescription, this.textField.getValue());
-            this.win.close();
-        }, this);
         return this.win;
     },
 
-    saveValue: function() {
+    saveValue: function(record, parent) {
         if (!this.textField.validate()) {
             return;
         }
         if (Ext.isEmpty(this.textField.getValue().trim())) {
             this.noteID = '';
-            this.win.fireEvent('setValue');
+            this.setValueInField(record, parent);
         } else {
             const saveCommand = Ext.create('Coon.common.command.AddNoteCommand');
             saveCommand.on('complete', function(response) {
                 this.noteID = response.noteId;
-                this.win.fireEvent('setValue');
+                this.setValueInField(record, parent);
             }, this);
             saveCommand.execute(this.noteID, this.textField.getValue());
         }
     },
 
+    setValueInField(record, parent) {
+        const value = this.textField.getValue().trim() ? this.getValue() : '';
+        const description = this.textField.getValue();
+        record.set('value', value);
+        record.set('valueDescription', description);
+        this.field.setVisibleValue(description);
+        this.field.setValue(value);
+        const context = {
+            value: value,
+            record: record,
+        };
+        parent.fireEvent('edit', null, context);
+        this.win.close();
+    },
+
     getValue: function() {
         return this.noteID;
     },

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

@@ -118,10 +118,10 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                         <br>border - символ начала и окончания строки, по умолчанию '"' (двойные кавычки)
                         <br>separator - разделитель значений ячеек, по умолчанию ',' (запятая)
                         <br>Пример конфига: 
-                        {
-                            border: '',
-                            separator: ';'
-                        }
+                        <br>{
+                            <br>border: '',
+                            <br>separator: ';'
+                        <br>}
                         </div>`,
                 },
                 {

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

@@ -36,7 +36,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         this.buttonText = this.buttonText || (format && 'Экспорт в ' + format);
         grid.on('render', function() {
             this.report = grid.findParentByType('ReportPanel');
-            if (this.getConfig('addToSearchButton') === true) {
+            if (this.getAddToSearchButton() === true) {
                 this.report.northPanel.addToSearchButtonMenu({
                     text: this.buttonText,
                     iconCls: this.buttonIconCls,
@@ -51,7 +51,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
                 this.fileName += Ext.Date.format(new Date(), dateFormat);
             }
         }, this);
-        this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getConfig('addToSearchButton')});
+        this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getAddToSearchButton()});
     },
     callExportByType() {
         switch (this.config.exportFileFormat) {
@@ -190,7 +190,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     },
     printCsvFile: async function(extension) {
         this.grid.mask('подождите пожалуйста...');
-        const currentParamList = this.getConfig('addToSearchButton') ? this.report.northPanel.collectParams() : this.report.currentParamList;
+        const currentParamList = this.getAddToSearchButton() ? this.report.northPanel.collectParams() : this.report.currentParamList;
 
         const parameterList = [];
 
@@ -201,7 +201,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         }
 
         /* const hasSelected = !!(this.getSelectedRecords() || []).length;
-         const url = hasSelected && !this.getConfig('addToSearchButton') ?
+         const url = hasSelected && !this.getAddToSearchButton() ?
             '/ReportFormData/getExcelFromRowsOrReport' :
             '/ReportFormData/getCSVReport';*/
         const url = '/ReportFormData/getCSVReport';
@@ -238,7 +238,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     },
     printExcelFile: async function() {
         this.grid.mask('подождите пожалуйста...');
-        const currentParamList = this.getConfig('addToSearchButton') ? this.report.northPanel.collectParams() : this.report.currentParamList;
+        const currentParamList = this.getAddToSearchButton() ? this.report.northPanel.collectParams() : this.report.currentParamList;
 
         const parameterList = [];
 
@@ -249,7 +249,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         }
 
         const hasSelected = !!(this.getSelectedRecords() || []).length;
-        const url = hasSelected && !this.getConfig('addToSearchButton') ?
+        const url = hasSelected && !this.getAddToSearchButton() ?
             '/ReportFormData/getExcelFromRowsOrReport' :
             '/ReportFormData/getExcelReport';
 

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

@@ -66,29 +66,32 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
             Ext.Msg.alert('Сообщение системы', 'Для плагина OpenCustomPanelButtonPlugin не определен тип панели (xtype) для открытия');
         } else {
             if (this.xtypeSelector === 'UI_LIST') {
-                if (!this.UIElement) {
+                if (!this.getUIElement()) {
                     Coon.log.log('UIElement не указан');
                     return;
                 }
                 const command = Ext.create('command.GetUIElementCommand');
-                command.on('complete', function(UIElementBean) {
-                    const elementNS = Coon.uielement.UIElementBeanFields;
-                    const exists = Ext.ClassManager.getByAlias('widget.' + UIElementBean[elementNS.$xtype]);
-                    if (exists === undefined) {
-                        Coon.log.log(UIElementBean[elementNS.$xtype] + ' does not exist');
+                command.on('complete', function(uIElementBean) {
+                    if (!uIElementBean || !uIElementBean.xtype) {
+                        Coon.log.error('UIElement dont exist or invalid');
                         return;
                     }
-                    this.effectiveXTypeObject.effectiveXType = UIElementBean[elementNS.$xtype];
+                    const exists = Ext.ClassManager.getByAlias('widget.' + uIElementBean.xtype);
+                    if (!exists) {
+                        Coon.log.log(uIElementBean.xtype + ' does not exist');
+                        return;
+                    }
+                    this.effectiveXTypeObject.effectiveXType = uIElementBean.xtype;
                     this.effectiveXTypeObject.properties =
                         this.effectiveXTypeObject.effectiveXType === 'UiCustomPanel' ?
-                            JSON5.parse(UIElementBean['propertyData']) :
+                            JSON5.parse(uIElementBean.propertyData) :
                             (
-                                Ext.decode(UIElementBean['propertyData']) ||
-                                Coon.Function.convertAdvancedProperties(UIElementBean[elementNS.$properties])
+                                Ext.decode(uIElementBean.propertyData) ||
+                                Coon.Function.convertAdvancedProperties(uIElementBean.properties)
                             );
                     this.component.getContextManager().executeFunction(Ext.bind(this.openPanel, this), this.parameters);
                 }, this);
-                command.execute(this.UIElement);
+                command.execute(this.getUIElement());
             } else {
                 this.component.getContextManager().executeFunction(Ext.bind(this.openPanel, this), this.parameters);
             }

package/src/uielement/plugin/AddDoInitSupportPlugin.js

@@ -10,6 +10,7 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
     },
 
     isSingle: true,
+
     init: function(view) {
         const controller = view.getController();
         if (controller) {
@@ -20,6 +21,7 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
             view.getController().inputParameters = Ext.bind(this.inputParameters, this);
         }
     },
+
     convertToNewFormat() { // Привести данные к новому формату хранения
         this.getParametersToModel().forEach((param, index) => {
             if (Ext.isObject(param)) {
@@ -32,6 +34,7 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
             }
         });
     },
+
     validatePath(path) {
         const pathes = path.split('.');
         return !pathes.some((path) => {
@@ -40,6 +43,7 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
             }
         });
     },
+
     setDefaultValueToViewModel() { // Инициализируем во ViewModel локальные параметры
         const dataMapping = this.getLocalParameters();
         dataMapping.forEach((el) => {
@@ -48,6 +52,7 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
             }
         });
     },
+
     handler: function(...parameters) { // Инициализируем во ViewModel входные параметры
         if (this.isTraceEnabled()) {
             this.tracePlugin(...parameters);
@@ -61,6 +66,7 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
             }
         });
     },
+
     inputParameters: function() {
         return this.inputParams.map((param) => {
             return {name: param.value};

package/src/version.js

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