ru.coon 2.7.25 → 2.7.26

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.7.25",
+  "version": "2.7.26",
   "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,13 @@ 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/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)