ru.coon 2.6.21 → 2.6.23

package/CHANGELOG.md

@@ -1,9 +1,25 @@
+# Version 2.6.23, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e68f6b9665bae4d8969249f451f473ed7298d86f)
+* ## Fixes
+* <span style='color:red'>fix Coon.Function.getDataFromForm - will correct work with fieldcontainers</span> ([87d0f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/87d0f1faf59496c1f41cc7b2f1c8a153c25ca97c))
+* <span style='color:red'>Fix:HT-7885 Refactoring getDataFromForm function</span> ([158037], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1580375d0b9d430a8a9379bee7806ea1c5bfc85c))
+
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/Function.jsb3713a036513a22b8c920b2d4d230fcaf1eb0779))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/Function.js3fa4edf5ab6e11a419ed4995c949a0cfe459c1db))
+* update: CHANGELOG.md ([cca905], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cca905a14180478df3c9f460ceb07b2950c14fba))
+
+# Version 2.6.22, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a580a8a4150b16d4f73ad7a4c1689d610822ee10)
+* ## Fixes
+* <span style='color:red'> loadData on SimplestReportCombo CRM-8429</span> ([e88546], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e88546f3413c2aa5520453b04abe000f4345bfea))
+
+* update: CHANGELOG.md ([c765e5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c765e541f9875b873ba2ecffb85f2284845e217b))
+
 # Version 2.6.21, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6f24834f0ffadd1fcf91e6545544a0e6db569481)
 * ## Features
 * <span style='color:green'>feat: HT-8139: refactoring</span> ([e0404c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0404c9c462d41b8a68eefe90d4204d9f12ab92d))
 * <span style='color:green'>feat: HT-8139: validate function call after dialog on close window</span> ([8eec24], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eec24fb0dcad82d6ce2fcd3c81d1bee92261bdb))
 
 * ## Fixes
+* <span style='color:red'>Fix:HT-8128 Fix groupButton property in CopyRowsFromGridConfigPanel</span> ([7fc721], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7fc721f71b53faa54c451645c1c03f4cc5d4ec23))
 * <span style='color:red'> Added "requires". Related to TR-63848.</span> ([1d6623], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1d66232357d6fc3d3e7a0dabad7183da4aac41ad))
 
 * refactoring UnifiedButtonToolbarPlugin ([2db2e5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2db2e5926168f46feabe6bf65ea709f26c546a7e))
@@ -23,6 +39,9 @@
 * <span style='color:green'>feat: HT-8044 ExportReportDataToFilePlugin add exportConfig field</span> ([0df785], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0df785630853bcaf2291476fd7007f9a29761d63))
 * <span style='color:green'>feat: HT-8145: remove and set table view empty text on load / before load</span> ([e14b0b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e14b0b784256fc854be3d042bb695575eac83269))
 
+* ## Fixes
+* <span style='color:red'> BFL-11383 editing values setting in ReportLookupCombo</span> ([25f19c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/25f19c68cf394733dd397e0445669f755c2fd045))
+
 * update extjs_iconpack ([648132], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/648132fadfa22e609d17317e40aee2e99ac289ca))
 * update: CHANGELOG.md ([7b85e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7b85e26648ab43868b4b1db32f11fb04113645dc))
 
@@ -204,15 +223,21 @@ This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](
 # Version 2.5.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9f48777236abed76cf08cd5cef56e7f9be0dac63)
 * ## Features
 * <span style='color:green'>feat: HT-7955: focus CP before save action, set cell editing values in grids</span> ([4c6578], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4c6578c6873cd21c509de304494938276e7367a9))
+* <span style='color:green'>Feat:HT-7885 Deprecate Coon.Function.getDataFromForm</span> ([43cd8a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/43cd8a2edbafe76c7d5881789a6236b6e23c21cf))
 * <span style='color:green'>feat: BFL-9365 move TimeEditorCreator and DeliveryTimeField from ISWE</span> ([12c3c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12c3c701ac9387f4d2918a9feb1840bf0f7fb3ea))
 * <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([387052], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/38705228276f86858100b6b43c0e204bcc6f26b7))
 
 * ## Fixes
 * <span style='color:red'>Fix:HT-7887 fix filterItemsOnRow property in ReportFormParameterEditPanel</span> ([c10ca9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c10ca98610970df2f51ca39fe698e278db6fe719))
+* <span style='color:red'>Fix:HT-7885 change excelEditorType to local in CopyRowsFromGridConfigPanel</span> ([1ed44e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1ed44e4bb22f4e15a3b06221e0d8870da1ecf025))
 * <span style='color:red'> HT-7941: check if do not have saved data object then close window</span> ([0baf4e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0baf4ea72862a4a61230ffc3ac0af7f8b065d794))
+* <span style='color:red'>Fix:HT-7885 fix group button and position number properties in CopyRowsFromGridConfigPanel</span> ([e0a4d8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0a4d888c88dfa70c14e649bb027625c769d64ce))
 
 * remove unnecessary filterItemsOnRow property ([772f61], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/772f6190df8b958bd6ff97e5731a59971c9a11fc))
+* HT-7885 ([601a41], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/601a4199efef15290c161766431908ab8993862b))
+* Update getDataFromForm function ([d79274], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d79274267b970ea0b4a31f1724d3dfc54d82d9d5))
 * HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([507490], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5074900afb170d9f11aa10de6549e05cef12f7cb))
+* Combine query in one row ([6fbb49], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6fbb496601a46bef0506b56d34d179d3d10148ca))
 * update: CHANGELOG.md ([2ec18c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2ec18ccddcb1d571ef6a1d00b9cde439355c8304))
 
 # Version 2.5.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/49035e56acea653959f01f96ea96a10d962b1424)

package/package.json

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

package/src/Function.js

@@ -122,38 +122,47 @@ Ext.define('Coon.Function', {
 
     /**
      * Получение всех значений полей панели в качестве структуры.
-     * Если поле иммет флаг local - оно не включается в результат
+     * Если поле имеет флаг local - оно не включается в результат
      */
     getDataFromForm: function(formPanel, valuesAsIs, dateFormat, excludeReadOnly, excludeDisabled) {
-        let fields = formPanel.query('field');
-        fields = (fields || []).concat(formPanel.query('fieldcontainer')).concat(formPanel.query('UiCFSegmentedButton'));
+        const fields = formPanel.query('field,fieldcontainer[getValue]');
         const params = {};
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            if ((!field.disabled || !excludeDisabled) && (!field.readOnly || !excludeReadOnly)) {
-                const name = field.getName();
-                const value = field.submitFormat ? field.getSubmitValue() : field.getValue();
-                const local = field.local;
-
-                if (!Ext.isEmpty(name) && local !== true && name.indexOf('ext-comp') === -1) {
-                    if (field.isXType('radiofield')) {
-                        if (!Ext.isEmpty(value) && Ext.isFunction(value.getGroupValue)) {
-                            params[name] = value.getGroupValue();
-                        }
-                    } else if (Ext.isFunction(field.getCleanValue)) {
-                        params[name] = field.getCleanValue();
-                    } else if (Ext.isString(value) || value === undefined || Ext.isBoolean(value) || Ext.isNumber(value) ||
+
+        /**
+         * Проверяет, включать ли данные из поля в результат
+         */
+        const isValid = function(field, name) {
+            return (
+                !(excludeDisabled && field.disabled) &&
+                !(excludeReadOnly && field.readOnly) &&
+                !field.local &&
+                name
+            );
+        };
+
+        for (const field of fields) {
+            const name = Ext.isObject(field.initialConfig) && field.initialConfig.name;
+            if (!(isValid(field, name))) {
+                continue;
+            }
+            const value = field.submitFormat ? field.getSubmitValue() : field.getValue();
+            if (field.isXType('radiofield') && value && Ext.isFunction(value.getGroupValue)) {
+                params[name] = value.getGroupValue();
+            } else if (Ext.isDate(value)) {
+                // !!!ВНИМАНИЕ - при использовании этой функции в web-billing :
+                // из-за override form.field.Date в web-billing сюда мы не попадем, так как value всегда будет строкой,
+                // Следовательно, valuesAsIs и dateFormat не используются для обработки дат
+                params[name] = valuesAsIs ? value : Ext.Date.format(value, dateFormat || Coon.format.dateTimeInternal);
+            } else if (Ext.isFunction(field.getCleanValue)) {
+                params[name] = field.getCleanValue();
+            } else if (Ext.isString(value) || value === undefined || Ext.isBoolean(value) || Ext.isNumber(value) ||
                         (field.submitFormat && field.isXType('combobox'))
-                    ) {
-                        params[name] = value;
-                    } else if (Ext.isDate(value)) {
-                        params[name] = valuesAsIs ? value : Ext.Date.format(value, dateFormat || Coon.format.dateTimeInternal);
-                    } else if (field.submitFormat) {
-                        params[name] = value;
-                    } else {
-                        Ext.apply(params, value);
-                    }
-                }
+            ) {
+                params[name] = value;
+            } else if (field.submitFormat) {
+                params[name] = value;
+            } else {
+                Ext.apply(params, value);
             }
         }
         return params;

package/src/report/component/ReportLookupCombo.js

@@ -98,9 +98,9 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
         this.setValue = function(value) {
             this._setValue(value);
             if (!this._inited && value) {
-                this._inited = true;
                 this.loadReportData(value);
             }
+            this._inited = true;
         };
         if (Ext.isObject(this.defaultParameters)) {
             this.setFilterDefaults(this.defaultParameters);

package/src/report/component/SimpleReportTag.js

@@ -239,7 +239,7 @@ Ext.define('Coon.report.component.SimpleReportTag', {
                 return typeof item === 'string' ? {name: item} : item;
             });
         this.store.getModel().addFields(newFields);
-        this.store.loadData(data, true);
+        this.store.loadData(data);
         this.store.fireEvent('load', this.store, this.store.getRange(), true);
         this.fireEvent('load', this, this.store);
         if (this.value) {

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

@@ -95,6 +95,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
         ];
     },
     setContext: function(context) {
+        this.callParent(arguments);
         const visibleFields = context && context.fields ? context.fields.filter((field) => field.visibleSwitch === true) : [];
         if (visibleFields && visibleFields.length) {
             Ext.ComponentQuery.query('[xtype="EditorJsField"]', this).forEach((cmp) => {
@@ -262,7 +263,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
                 ['xlsx', 'xlsx']
             ],
             fieldLabel: 'Отобразить редактор',
-            name: 'position',
+            local: true,
             allowBlank: true,
             listeners: {
                 change: this.onChangeFormat.bind(this),

package/src/uielement/component/UiCustomController.js

@@ -5,6 +5,10 @@ Ext.define('Coon.uielement.component.UiCustomController', {
 
     init: function(view) {
         const config = view.propertyData || view.initialConfig;
+        if (!view || typeof view.on !== 'function') {
+            Coon.log.debug(` [Error]UiCustomController.init - view not found or view.on is not a function`);
+            return;
+        }
         view.on('afterrender', function() {
             const {accessDecision, securePoints} = config;
             Coon.log.debug('UiCustomController.accessProps', {accessDecision, securePoints});

package/src/version.js

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