ru.coon 2.7.27 → 2.7.28

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 2.7.28, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb4662ac201c84739a5abb84ba36f10af0e35a25)
+* ## Fixes
+* <span style='color:red'>fix HT-8819</span> ([c5be10], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c5be103a7e463659ee436dd478eee04c9cfa6b35))
+
+* update: CHANGELOG.md ([6b1c8b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b1c8b9cfb4519d95713d70996f2d8f816bcaea4))
+
 # Version 2.7.27, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c59dc7400f5e4ee4f7bbfcd42f4aa371d9b2e68f)
 * ## Fixes
 * <span style='color:red'> HT-8707 checking the component is rendered</span> ([d1fd00], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d1fd008a47ca9a0f2d7a2404c1b21e1d7aa8b2a7))

package/package.json

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

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

@@ -302,12 +302,18 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
 
         const ns = Coon.report.model.CharacteristicBeanFields;
 
+        const normalize = (el) => {
+            el.value = typeof el.value === 'string' ? el.value.trim() : el.value;
+            el.type = typeof el.type === 'string' ? el.type.trim() : el.type;
+            return el;
+        };
+
         const withTypeDefinition = (!Ext.isEmpty(typeList) || Ext.isEmpty(valueList));
         if (!withTypeDefinition) {
             const typesCache = [];
             // Без определения доступных типов - типы формируются из списка значений
             for (let i = 0; i < valueList.length; i++) {
-                const valueBean = valueList[i];
+                const valueBean = normalize(valueList[i]);
                 const valueType = valueBean[ns.$type];
                 if (typesCache.indexOf(valueType) === -1) {
                     const typeRawBean = Ext.apply({}, valueBean);

package/src/report/model/CharacteristicBean.js

@@ -11,14 +11,10 @@ Ext.define('Coon.report.model.CharacteristicBean', {
     fields: [
         {name: Coon.report.model.CharacteristicBeanFields.$effectiveDate, type: 'date'},
         {
-            name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string', convert: (val) => {
-                return typeof val === 'string' ? val.trim() : val;
-            },
+            name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string',
         },
         {name: Coon.report.model.CharacteristicBeanFields.$valueDescription, type: 'string'},
-        {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string', convert: (val) => {
-            return typeof val === 'string' ? val.trim() : val;
-        }},
+        {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string'},
         {name: Coon.report.model.CharacteristicBeanFields.$typeDescription, type: 'string'},
         {name: Coon.report.model.CharacteristicBeanFields.$editable, type: 'boolean', defaultValue: true},
         {name: Coon.report.model.CharacteristicBeanFields.$visible, type: 'boolean', defaultValue: true},

package/src/version.js

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