ru.coon 3.0.51 → 3.0.53

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# Version 3.0.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/18d790002292ecd0650d868dca06ddcf668fcede)
+* ## Features
+* <span style='color:green'>feat: NEVA-974: bug fix. Передаю нужный контекст</span> ([22bb87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22bb870b28bdafac81dca86804b482e6e365c9c8))
+
+* fetch заменен на Ext.Ajax.request. Related to HT-13796. ([6c255d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6c255d3663c735c36b304a9fd1f67b93b8b3b9f7))
+* update: CHANGELOG.md ([b95dd9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b95dd96244579290f3c7c42f2bf32881a54ac96d))
+
+# Version 3.0.52, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/290ca0d6e133cd9631aae34caa6f0c63ab449128)
+* ## Features
+* <span style='color:green'>feat: NEVA-974: Добавил возможность выбора нескольких файлов</span> ([2f49c5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f49c53d5af263c1c7931497140faea164a94357))
+* <span style='color:green'>feat: NEVA-974: Убрал вставляемый по дефолту заголовок, при интеграции в форму он не всегда нужен</span> ([c03ca9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c03ca9eb849b2011ce03dc0600e0ce39a0dd28b4))
+
+* ## Fixes
+* <span style='color:red'> UiCustomController title setup</span> ([c1d588], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c1d588bd0dcf2c1d91ff99644a94b8408a008c98))
+
+* upd ([9204e3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9204e301a710bf0fb0d0742f88986cf281d62230))
+* upd ([800934], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/800934ee0dfb8d8d4965fb46e1b34f686b59da4f))
+* upd ([98cb3c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98cb3c6330d03a5d0da6604c7884375a42b03993))
+* upd ([bb5a58], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb5a58174b8e00131cb673d27c42566df615c52c))
+* update: CHANGELOG.md ([44a62d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44a62d6492224a185291f9cd359bff3655b79991))
+
 # Version 3.0.51, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/64e72d95cacc2f81ab46d1d6d36728f73d0fa68e)
 * ## Features
 * <span style='color:green'>feat: NEVA-974: Доработка передачи в сервиз загрузки файлов обязательного параметра fileTypeId</span> ([5154fb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5154fbb972d7b84a0d880babe97b81fb16f9001c))

package/package.json

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

package/src/app/viewPort/CenterView.js

@@ -129,7 +129,7 @@ Ext.define('Coon.app.viewPort.CenterView', {
         this.add(component);
 
         component.on('titlechange', function(_, title) {
-            title = title || '<span style="color:red">ошибка</span>';
+            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/common/panel/MainUploadPanel.js

@@ -162,14 +162,6 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
         this.fireEvent('close');
     },
 
-    getHeaders: function() {
-        const token = localStorage.getItem('CSRFToken');
-        return Ext.apply(this.headers, {
-            'X-CSRF-Token': token,
-            'Accept': 'application/json',
-        });
-    },
-
     getUrl: function() {
         return this.uploadURL;
     },
@@ -211,12 +203,15 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
             formData.append('upload', file);
         });
         const options = {
-            method: 'POST',
-            headers: this.getHeaders(),
-            body: formData,
+            url: this.uploadURL,
+            rawData: formData,
+            headers: {
+                'Content-Type': null,
+            },
+            withCredentials: true,
         };
         this.uploadForm.mask('Файл загружается на сервер...');
-        fetch(this.uploadURL, options)
+        Ext.Ajax.request(options)
             .then(this.extractResponse.bind(this))
             .then(function(response) {
                 this.uploadForm.unmask();
@@ -240,19 +235,16 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
 
     /**
      * Извлечение результата
-     * fetch обращает внимание на заголовок ответа content-type. В зависимости от заголовка до данных можно получить доступ по разному.
      * @param {Object} response
      * @returns {Promise<{data: (*|*), isJsonFormat: boolean, statusText: *, ok, status: *}>}
      */
-    extractResponse: async function(response) {
-        const resText = await response.text();
-        const isJsonFormat = this.isJsonFormat(resText);
+    extractResponse: async function({responseText, status, statusText}) {
         return {
-            ok: response.ok,
-            status: response.status,
-            statusText: response.statusText,
-            isJsonFormat,
-            data: resText,
+            ok: statusText.toLowerCase() === 'ok',
+            status,
+            statusText,
+            isJsonFormat: this.isJsonFormat(responseText),
+            data: responseText,
         };
     },
 

package/src/common/panel/WindowWrap.js

@@ -161,7 +161,8 @@ Ext.define('Coon.common.panel.WindowWrap', {
             this.doClose();
         }, this);
 
-        this.content.on('titlechange', function(view, title) {
+        this.content.on('titlechange', function(_, title) {
+            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/common/panel/dropzone/UniversalMultiUploadForm.js

@@ -114,7 +114,7 @@ Ext.define('Coon.common.panel.dropzone.UniversalMultiUploadForm', {
         const docElem = document.documentElement;
         const y = window.innerHeight|| docElem.clientHeight;
         this.height = y > 0 ? y * 0.8 : 600;
-        this.title = this.title || 'Форма загрузки данных';
+        // this.title = this.title || 'Форма загрузки данных';
         this.buttons = this.createButtons();
         this.uploadForm = Ext.create('Ext.form.Panel', {
             reference: 'formPanelRef',

package/src/common/panel/dropzone/UploadDropZone.js

@@ -15,7 +15,7 @@ Ext.define('Coon.common.panel.dropzone.UploadDropZone', {
         <span><i class="fa fa-cloud-upload-alt icon-upload" style=""></i></span>
         ${this.baseText}
      </div>
-    <input name="files[]" type="file" class="file-input" />
+    <input name="files[]" type="file" multiple class="file-input" />
 </div>`);
         this.callParent();
     },

package/src/report/component/reportpanel/NorthPanel.js

@@ -169,7 +169,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         Ext.merge(this, properties);
         this.filterPlugins.push({
             ptype: 'EnterConfirmFormPlugin',
-            confirmHandler: this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel) : Ext.emptyFn,
+            confirmHandler: report ? Ext.bind(report.filterHandler, report) : Ext.emptyFn,
         });
         this.filterPlugins.push(Ext.apply({
             ptype: 'FormFieldFocusPlugin',

package/src/report/plugin/grid/OpenApiButtonPlugin.js

@@ -152,9 +152,8 @@ Ext.define('Coon.report.plugin.grid.OpenApiButtonPlugin', {
                     const data = Ext.JSON.decode(resp.responseText, true);
                     me.component.unmask();
                     Ext.isFunction(me.completeHandler) && me.completeHandler(data);
-
                     if (me.reloadAfterComplete) {
-                        me.component.fireEvent('needReload', this.reloadAfterComplete);
+                        me.component.fireEvent('needReload', me.reloadAfterComplete);
                     }
                     if (me.successMessage) {
                         Ext.Msg.alert(this.successTitle ? me.successTitle : 'Успешное выполнение'

package/src/uielement/component/UiCustomController.js

@@ -140,29 +140,66 @@ Ext.define('Coon.uielement.component.UiCustomController', {
         return staticPlace === 'end' ? `${contextPart}${delimiterPart}${staticPart}` : `${staticPart}${delimiterPart}${contextPart}`;
     },
 
-    setCustomPanelTitle(title) {
+    getComponentTitle() {
         const componentTitle = this.getView().componentTitle;
-        if (!title && Ext.isObject(componentTitle) && (componentTitle.static || componentTitle.context)) {
+        return Ext.isObject(componentTitle) &&
+                (componentTitle.static || componentTitle.context) &&
+                componentTitle;
+    },
+
+    setCustomPanelTitle() {
+        const setupTitle = (title, options = {}) => {
+            const view = this.getView();
+            if (!typeof title === 'string') {
+                return;
+            }
+            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            view.titleText = title;
+            if (
+                view.tab && typeof view.tab.setTooltip === 'function'
+            ) {
+                this.getView().tab.setTooltip(title);
+            }
+            if (!options.silent) {
+                view.fireEvent('titlechange', this.getView(), title);
+            }
+        };
+
+        const componentTitle = this.getComponentTitle();
+        if (componentTitle) {
             const {static: staticText, context} = componentTitle;
             const testContext = /^[a-zA-Z._]+$/;
             if (typeof context === 'string' && testContext.test(context)) {
-                this.getViewModel().bind(`{${context}}`, function(contextValue, ...args) {
-                    this.setCustomPanelTitle(
-                        this.makeComponentTitle(staticText, contextValue)
+                this.getViewModel().bind(`{${context}}`, function(contextValue) {
+                    setupTitle(
+                        this.makeComponentTitle(staticText, contextValue),
+                        {silent: true}
                     );
                 }, this);
             } else {
-                this.setCustomPanelTitle(
-                    this.makeComponentTitle(staticText)
+                setupTitle(
+                    this.makeComponentTitle(staticText),
+                    {silent: true}
                 );
             }
-            return;
+        } else {
+            let title = this.getView().getTitle();
+            if (Ext.isObject(title) && typeof title.getTitle === 'function') {
+                title = title.getTitle();
+            }
+            setupTitle(title);
         }
+    },
+
+    setupTitle(title, options = {}) {
         if (!typeof title === 'string') {
             return;
         }
+        title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
         this.getView().titleText = title;
-        this.getView().fireEvent('titlechange', this.getView(), title);
+        if (!options.silent) {
+            this.getView().fireEvent('titlechange', this.getView(), title);
+        }
         if (
             this.getView().tab &&
             typeof this.getView().tab.setTooltip === 'function'

package/src/version.js

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