ru.coon 2.7.25 → 2.7.27

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 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))
+* <span style='color:red'> Запрещен ввод значений в характеристики типа FKV, отсутствующих в списке выбора. Closes HT-8762.</span> ([dece4f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dece4f2ce361c8c54d11a54dc469099698338c46))
+* <span style='color:red'> HT-8707 checking the component is rendered</span> ([486939], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4869399bb137ba99a4925ff8f4c633f1b71f028c))
+* <span style='color:red'> HT-8707 masking for undestroyed component</span> ([ee85fc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ee85fc21f81d2efdcf024c0dcee8670f85a0f866))
+
+* up ([5ed117], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5ed117251d0ded671bf25aeadf091da7165d4518))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/Function.js54cab5f445fe40d8ec4605af38a41df54f1eef8a))
+* update: CHANGELOG.md ([abedd8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/abedd84e336660b4100d97028c0267d7fdd5ec44))
+
 # Version 2.7.25, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/568fd6aae3e5756be342c7e74d434b7976700dae)
 * ## Features
 * <span style='color:green'>feat: HT-8513: add copy item in cell context menu</span> ([5355d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5355d48244eceb3add5e5002bfe970b8059e235d))
@@ -5,6 +16,9 @@
 * <span style='color:green'>feat: HT-8513: add copy item in cell context menu</span> ([915abe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/915abebc3f710ae7236d2584292d7fd62b2067e0))
 * <span style='color:green'>feat: HT-8763: search footer view by reference</span> ([2648fe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2648fe29ea96319055c586e4cea1015115c19494))
 
+* ## Fixes
+* <span style='color:red'> При ручном вводе минут очищается все поле. Closes HT-8712.</span> ([bdde0d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bdde0da03da609ce1e24c9c54dd92dfbb78305ba))
+
 * update: CHANGELOG.md ([971505], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9715050f4ce08854c84792001dea4c334fd74a0f))
 
 # Version 2.7.24, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8e3cc36a693f048a9feceada5eb46f979eda23db)
@@ -18,6 +32,7 @@
 
 # Version 2.7.23, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e1fd5ef91937dab7196de70f1ec48895dd0e036f)
 * ## Fixes
+* <span style='color:red'> Если в загруженном отчете не найдено value, то value = null. Closes HT-8629.</span> ([c1d69b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c1d69b443d608ca65eb35c744e1e56068a2f1e2a))
 * <span style='color:red'>fix ReportLookupCombo</span> ([389b88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/389b882bb57e27db1acebb9196f4ebf533794200))
 
 * update: CHANGELOG.md ([1da73b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1da73b648a1493be777199ffce8a8fe0dac63998))
@@ -994,6 +1009,9 @@ ReportPropertiesPanelController.buildPropertiesTreeData was losing property "key
 * update: CHANGELOG.md ([65d101], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/65d10184c4d288dd083ff31880e560dab4a764e7))
 
 # Version 2.5.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1c5a4296f1a7a2649f02deb68e05542aa6185f10)
+* ## Features
+* <span style='color:green'>feat: TR-67274: add convert function in model to trim values</span> ([2dd614], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2dd614f646501a438b8e0647ed71f7259c366f61))
+
 * ## Fixes
 * <span style='color:red'> HT-7017 linter</span> ([264cac], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/264cac926d75d4c68805a4904828ebb26b9b7979))
 * <span style='color:red'> HT-7017 GridEditButtons исправлено создание кнопки при отсутствии initialConfig</span> ([510cac], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/510cac7188bebbf9a92944a95f9cfceb668436a1))

package/package.json

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

package/src/Function.js

@@ -17,7 +17,7 @@ Ext.define('Coon.Function', {
 
     /**
      *
-     * @param {*} win Ext component
+     * @param {*} component Ext component
      * @param {*} requestOptions
      * @param {String} requestOptions.url url
      * @param {Boolean} requestOptions.binary
@@ -26,18 +26,15 @@ Ext.define('Coon.Function', {
      * @param {Boolean} sync sync|async request
      * @returns
      */
-    doRequest: function(win, requestOptions, sync) {
+    doRequest: function(component, requestOptions, sync) {
         const requestHash = Coon.util.generateHashFromObj(requestOptions);
         if (!this.beforeRequest(requestOptions, requestHash)) {
             return;
         }
         let myMask;
-        if (win) {
-            if (!win.isComponent) {
-                Coon.log.error('win parameter is element instead component');
-            }
+        if (component && this.isComponentRendered(component)) {
             myMask = new Ext.LoadMask({
-                target: win,
+                target: component,
                 msg: requestOptions.text || 'Загрузка...',
             });
             myMask.show();
@@ -63,7 +60,7 @@ Ext.define('Coon.Function', {
                         response.responseJSON = Ext.decode(response.responseText, true);
                     }
                     try {
-                        requestOptions.callback.call(this, win, true, response, requestOptions);
+                        requestOptions.callback.call(this, component, true, response, requestOptions);
                     } catch (e) {
                         Coon.log.error(e);
                     }
@@ -79,7 +76,7 @@ Ext.define('Coon.Function', {
                         response.responseJSON = Ext.decode(response.responseText, true);
                     }
                     try {
-                        requestOptions.failure.call(this, win, requestOptions, response);
+                        requestOptions.failure.call(this, component, requestOptions, response);
                     } catch (e) {
                         console.warn(e);
                     }
@@ -95,6 +92,12 @@ Ext.define('Coon.Function', {
         return request;
     },
 
+    isComponentRendered: function(component) {
+        return component &&
+            component.isComponent &&
+            component.rendered;
+    },
+
     /**
      * Сериализация содержимого Store
      * @param store

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

@@ -26,6 +26,7 @@ Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
             valueField: 'VALUE',
             displayField: 'DESCRIPTION',
             searchBySubstring: true,
+            forceSelection: true,
         }, record.get('editorConfig')));
     },
 

package/src/common/field/fieldset/DateTimeField.js

@@ -41,7 +41,6 @@ Ext.define('Coon.common.field.fieldset.DateTimeField', {
 
     initComponent: function() {
         this.callParent();
-        this.on('change', this.publishValue, this);
         this.triggers.time.setHidden(!!this.hideTimeTrigger);
     },
 
@@ -136,8 +135,4 @@ Ext.define('Coon.common.field.fieldset.DateTimeField', {
             this.picker.setValue(Ext.isDate(value) ? value : this.createInitialDate());
         }
     },
-
-    publishValue: function() {
-        this.publishState('value', this.getValue());
-    },
 });

package/src/report/component/SimplestReportCombo.js

@@ -280,6 +280,11 @@ Ext.define('Coon.report.component.SimplestReportCombo', {
         const find = map.find((e) => e[this.defaultValueFlg || 'IS_DEFAULT'] === 'Y');
         const defaultValue = this.value || (find && find[this.valueField]);
         if (defaultValue) {
+            const foundByValueField = map.find((e) => e[this.valueField] === this.value);
+            if (!foundByValueField) {
+                this.setValue(null);
+                return;
+            }
             this.setValue(defaultValue);
             if (Ext.isFunction(this.publishState)) {
                 this.publishState('value', this.getValue());

package/src/report/model/CharacteristicBean.js

@@ -10,9 +10,15 @@ Ext.define('Coon.report.model.CharacteristicBean', {
     requires: 'Coon.report.model.CharacteristicBeanFields',
     fields: [
         {name: Coon.report.model.CharacteristicBeanFields.$effectiveDate, type: 'date'},
-        {name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string'},
+        {
+            name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string', convert: (val) => {
+                return typeof val === 'string' ? val.trim() : val;
+            },
+        },
         {name: Coon.report.model.CharacteristicBeanFields.$valueDescription, type: 'string'},
-        {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string'},
+        {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string', convert: (val) => {
+            return typeof val === 'string' ? val.trim() : val;
+        }},
         {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.25',
+    number: '2.7.27',
 });

package/src/common/field/checkbox/RoundCheckbox.js

@@ -1,5 +0,0 @@
-Ext.define('Coon.common.field.checkbox.RoundCheckbox', {
-    extend: 'Ext.form.field.Checkbox',
-    cls: 'RoundCheckbox',
-    xtype: ['roundcheckbox', 'RoundCheckbox'],
-});

package/src/common/field/checkbox/RoundCheckbox.scss

@@ -1,48 +0,0 @@
-.x-form-fieldCheckbox {
-  .x-form-field {
-    position: relative;
-  }
-  
-  .x-form-field label {
-    background-color: #fff;
-    border: 1px solid #ccc;
-    border-radius: 50%;
-    cursor: pointer;
-    height: 28px;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 28px;
-  }
-  
-  .x-form-field label:after {
-    border: 2px solid #fff;
-    border-top: none;
-    border-right: none;
-    content: "";
-    height: 6px;
-    left: 7px;
-    opacity: 0;
-    position: absolute;
-    top: 8px;
-    transform: rotate(-45deg);
-    width: 12px;
-  }
-  
-  .x-form-field input[type="checkbox"] {
-    visibility: hidden;
-  }
-  
-  .x-form-field input[type="checkbox"]:checked + label {
-    background-color: #66bb6a;
-    border-color: #66bb6a;
-  }
-  
-  .x-form-field input[type="checkbox"]:checked + label:after {
-    opacity: 1;
-  }
-  
-  .x-form-item-body, .x-form-cb-wrap-inner {
-    margin: 0 auto;
-  }
-}

package/src/nav/MenuLoader.js

@@ -1,23 +0,0 @@
-Ext.define('Coon.nav.MenuLoader', {
-    singleton: true,
-
-    isLoaded: false,
-
-    load() {
-        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
-            .then((data) => {
-                if (Array.isArray(data.list)) {
-                    this.uiElementMap = data.list.reduce();
-                }
-                this.isLoaded = true;
-            });
-    },
-
-    get() {
-
-    },
-
-    isValidMenuItem(uiEmentId) {
-        return this.uiElementMap.has(uiEmentId);
-    },
-});

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

@@ -1,7 +0,0 @@
-**спецификация:**
-
-входные параметры:
-
-- exportFileFormat [xls/pdf]
-- allowUserSelectColumnsToUpload
-- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)