ru.coon 2.7.31 → 2.7.33

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Version 2.7.33, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e47cc0c267a947daeb5624b8f174b5a8a8e22375)
+* ## Fixes
+* <span style='color:red'> add requiredAuth property support for MainUploadPanel, BFL-13506</span> ([cf56d8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cf56d8856ffd43090110911e176e3ca37ee7c050))
+
+* update: CHANGELOG.md ([80aedf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80aedfb364555f00fb354d3cd444718756546ffe))
+
+# Version 2.7.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/40925f0ca399d6d5da42511e20b8c7fa10acadaf)
+* ## Features
+* <span style='color:green'>feat: HT-8492: create new type field</span> ([0657da], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0657da1e4ba8e54a47eaca571cf71596c8107c7c))
+
+* update: CHANGELOG.md ([1e8b7b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e8b7b6e038fb0ea66ce786f648af3e4934afc11))
+
 # Version 2.7.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6fab6651c567feee5d735e2fd1af27ea315d393)
 * ## Features
 * <span style='color:green'>feat: HT-8131 add TreeNestingToolbarButtonPlugin</span> ([15ec59], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/15ec59a4f41473a5d0cd8a174c641875ec95418b))

package/package.json

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

package/src/common/field/PeriodByReportField.js

@@ -0,0 +1,139 @@
+Ext.define('Coon.common.field.PeriodByReportField', {
+    extend: 'Coon.report.component.SimplestReportCombo',
+    xtype: 'PeriodByReportField',
+    config: {
+        periodEndName: undefined,
+        periodStart: undefined,
+        periodEnd: undefined,
+        dateFormatDB: 'Y-m',
+        /* defaultValueOpt: {
+            key: 'IS_DEFAULT',
+            value: 'Y',
+        },*/
+        defaultValueOpt: undefined,
+    },
+    setInitDateToEnd: false,
+    triggers: {
+        back: {
+            cls: 'x-fa fa-arrow-left',
+            handler: (cmp) => {
+                cmp.goBack();
+            },
+        },
+        forward: {
+            cls: 'x-fa fa-arrow-right',
+            handler: (cmp) => {
+                cmp.goForward();
+            },
+        },
+    },
+
+    goBack(setValToRef) {
+        if (!this.getValue()) {
+            return;
+        }
+        const store = this.getStore();
+        const curRecordPosition = store.find(this.valueField, this.getValue());
+        if (curRecordPosition >= 0 && curRecordPosition < (store.getData().length - 1)) {
+            const rec = store.getAt(curRecordPosition + 1);
+            rec && this.select(rec);
+            if (setValToRef) {
+                this.getPeriodStart() && this.getPeriodStart().setValue(rec.get(this.valueField));
+                this.getPeriodEnd() && this.getPeriodEnd().setValue(rec.get(this.valueField));
+            }
+            return;
+        }
+        if (this.getPeriodStart()) {
+            this.getPeriodStart().fireEvent('goBack', true);
+            return;
+        }
+    },
+
+    goForward(setValToRef) {
+        if (!this.getValue()) {
+            return;
+        }
+        const store = this.getStore();
+        const curRecordPosition = store.find(this.valueField, this.getValue());
+        if (curRecordPosition > 0) {
+            const rec = store.getAt(curRecordPosition - 1);
+            rec && this.select(rec);
+            return;
+        }
+    },
+
+    doInit(startDate) {
+        if (startDate && Ext.isDate(new Date(startDate))) {
+            this.setStartDate(startDate);
+        }
+    },
+
+    setStartDate(value) {
+        this.setValue(value);
+    },
+
+    setEndDate(value) {
+        const field = this.getEndField();
+        field && field.setValue(value);
+    },
+
+    getEndField() {
+        if (!this.getPeriodEndName()) {
+            return null;
+        };
+        const ownerCmp = this.up('FilterPanel') || this.up('[dataId=FilterPanel]') || this.up();
+        let cmpQuery = [];
+        if (ownerCmp) {
+            cmpQuery = Ext.ComponentQuery.query(`[name=${this.getPeriodEndName()}]`, ownerCmp);
+        }
+        return cmpQuery.length && this.setPeriodEnd(cmpQuery[0]) && cmpQuery[0];
+    },
+
+    onStoreLoad(store) {
+        if (this.getValue()) {
+            return;
+        }
+        const opt = this.getDefaultValueOpt();
+        let number = 0;
+        if (opt && opt.key && opt.value) {
+            number = store.find(opt.key, opt.value);
+        } else if (this.getPeriodEndName()) {
+            number = store.find(this.valueField, Ext.Date.format(new Date(), this.getDateFormatDB()));
+        }
+        if (this.getPeriodEndName()) {
+            this.setInitDateToEnd = true;
+        }
+        this.select(this.getStore().getAt(number >= 0 ? number : 0));
+    },
+
+    initComponent: function() {
+        this.callParent();
+        this.on('goForward', this.goForward, this);
+        this.on('goBack', this.goBack, this);
+        this.on('change', () => {
+            const startDate = this.getValue();
+            const fieldEndDate = this.getEndField();
+            if (fieldEndDate && startDate) {
+                fieldEndDate.setPeriodStart(this);
+                const endDate = fieldEndDate.getValue();
+                const filters = fieldEndDate.getStore().getFilters();
+
+                const fn = (item) => {
+                    return item.get(fieldEndDate.valueField) >= this.getValue();
+                };
+                filters.remove(fn);
+                filters.add(fn);
+                if (this.setInitDateToEnd) {
+                    this.setInitDateToEnd = false;
+                    fieldEndDate.setValue(startDate);
+                    fieldEndDate.getValue();
+                    return;
+                }
+                if (startDate > endDate) {
+                    fieldEndDate.setValue(startDate);
+                }
+            }
+        }, this);
+        this.getStore().on('load', this.onStoreLoad, this);
+    },
+});

package/src/common/panel/MainUploadPanel.js

@@ -80,6 +80,21 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
             }, this.formConfig));
         this.items = [this.uploadForm];
         this.callParent();
+        if (this.requiredAuth) {
+            return this.checkAuth();
+        }
+    },
+
+    async checkAuth() {
+        const isEnabled = await Coon.common.component.Auth.isEnabled();
+        try {
+            if (isEnabled && ! await Coon.common.component.Auth.handleAuthorization()) {
+                this.mask('Не удалось авторизоваться');
+                throw new Error('Не удалось авторизоваться');
+            }
+        } catch (ex) {
+            Coon.log.log(ex);
+        }
     },
 
     createButtons: function() {

package/src/report/component/EXTJSReportUploadForm.js

@@ -8,6 +8,7 @@ Ext.define('Coon.report.component.EXTJSReportUploadForm', {
     alternateClassName: 'Sigma.common.components.report.list.EXTJSReportUploadForm',
 
     title: 'Импорт отчета',
+    requiredAuth: true,
     uploadFieldLabel: 'Файл с отчетом',
     uploadURL: 'ReportFormImport/import',
     allowMultipleUpload: false,

package/src/uielement/component/EXTJSUiPanelUploadForm.js

@@ -6,6 +6,7 @@ Ext.define('Coon.report.component.EXTJSUiPanelUploadForm', {
         'Coon.CustomXMLReader'
     ],
     useXhr: true,
+    requiredAuth: true,
     title: 'Импорт настраиваемой панели',
     uploadFieldLabel: 'Файл с панелью',
     uploadURL: 'UIElement/import',

package/src/version.js

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

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)