ru.coon 3.0.61 → 3.0.67

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# Version 3.0.67, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d850ee12048246ba85557eef4475595043fc9d00)
+* HT-14811: исправление открытия редактора для характеристик FKV ([becf94], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/becf94689878553b8c8287c6260ca986a314b08e))
+* update: CHANGELOG.md ([ef54a3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ef54a339c72c36ce13a27672dff3cf89e35ddded))
+
+# Version 3.0.66, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/75bb3540f20b528ed830505b80d99216d572121c)
+* HT-14811: доработан внешний вид и открытие на редактирование характеристик FKV ([c55804], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c558045e343890c69c03801984b203b238cae552))
+* update: CHANGELOG.md ([dd323a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dd323a40af65c90d5ac4e59b03d48f365cbf003f))
+
+# Version 3.0.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b313f77a0208579201ce66ff042e5f548b54533d)
+* ## Fixes
+* <span style='color:red'> validator.mixin</span> ([8eadf3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eadf3f0b3b2843e2ea42bc3e577ed6db9f1b62b))
+
+* update: CHANGELOG.md ([196fe2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/196fe2b32f8bacb0551b5517ce7b458548945f6a))
+
+# Version 3.0.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/977abbf84dfd6b813420431d11c1202170cd2fe8)
+* ## Fixes
+* <span style='color:red'>fix show title only with staticText</span> ([05d479], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/05d479ef92447495d4246dda085656e2042b0889))
+
+* update: CHANGELOG.md ([9b97b4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9b97b4c4ca9abfda170712cf594ffb725b9e9f03))
+
+# Version 3.0.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb48b260e66b233a4cad92d0d856d0d8da4c021b)
+# Version 3.0.62, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8f3faa85fc70860397b0074b43d93aa9b9ffa00)
+* ## Fixes
+* <span style='color:red'>fix csrf in ReportTreeStore</span> ([cb402a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb402a1790a7b1081a5e8a17968db947ba583df9))
+
+* HT-14775 fix: Исправление ширины системного тулбара ([bdd783], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bdd7836f8eef889ec642e486e896d3910eeb1850))
+* update: CHANGELOG.md ([0624d1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0624d16d97c878b4e695b775a6a08cb00d3f12bd))
+
 # Version 3.0.61, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a79e6af1f962bbf5062d7a242281b679c4b0f35)
 * update: CHANGELOG.md ([dcc546], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcc5460b35c3144e1f382de27906035b5a6057d8))
 

package/package.json

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

package/src/common/component/characteristic/characteristicGroup/EntityGroupCharacteristicEditor.js

@@ -200,10 +200,16 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
                     if (context.field === 'mask') {
                         const editor = context.record.get('editor');
                         if (editor) {
-                            const proto = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+editor]].prototype;
-                            if (Ext.isObject(proto.editorOptions)) {
-                                context.column.field.triggers.info.show();
+                            const editorClass = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+editor]];
+                            if (editorClass) {
+                                const proto = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+editor]].prototype;
+                                if (Ext.isObject(proto.editorOptions)) {
+                                    context.column.field.triggers.info.show();
+                                } else {
+                                    context.column.field.triggers.info.hide();
+                                }
                             } else {
+                                console.error(`Редактор ${editor} не найден.`);
                                 context.column.field.triggers.info.hide();
                             }
                         } else {

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

@@ -226,6 +226,15 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
                     } else {
                         visibleValue = '';
                     }
+                } else if (record.get('entity') == 'FKV') {
+                    const mask = record.get('mask');
+                    const maskText = mask.match(/link:"(.*?)"/);
+                    if (maskText) {
+                        meta.tdCls += ' FVK-cell_link';
+                        visibleValue = maskText[1];
+                    } else {
+                        visibleValue = val;
+                    }
                 } else if (record.get(ns.$entity) === 'FLV' && !Ext.isEmpty(val)) {
                     visibleValue = val.substring(40);
                 } else {
@@ -237,6 +246,9 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
                 return Coon.format.withHint(visibleValue, visibleValue || tooltip);
             },
             getEditor: function(record) {
+                if ((record.get('entity') === 'FKV') && record.get('mask')) {
+                    return false;
+                }
                 return Ext.create('Ext.grid.CellEditor', {
                     field: Ext.create('Ext.form.field.Text', {
                         allowBlank: false,

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

@@ -59,6 +59,16 @@
       }
     }
   }
+
+  .FVK-cell_link {
+    span {
+      color: #0B57D0;
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+  }
 }
 
 .CharacteristicGridEditor {

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

@@ -92,6 +92,8 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
 
         this.on('edit', this.afterEditHandler, this);
         this.factory = this.createFactory();
+
+        this.on('cellclick', this.cellclickHandler, this);
     },
 
     createAdditionButtons: function() {
@@ -292,6 +294,14 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
         }
     },
 
+    cellclickHandler(cmp, td, cellIndex, record) {
+        if (this.isEditableChar(record)) {
+            if ((record.get('entity') === 'FKV') && record.get('mask')) {
+                this.prepareType(record);
+            }
+        }
+    },
+
     // private
     calculateState: function() {
         if (this.addTypeButton) {

package/src/report/component/ReportPanel.js

@@ -1033,7 +1033,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         if (params.bar.items.length === 1) {
             return;
         }
-        params.bar.items.doSort((a, b) => {
+        params.bar.items.sortBy((a, b) => {
             if (a.position !== b.position) {
                 if (a.position < b.position) {
                     return -1;

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

@@ -16,6 +16,9 @@ Ext.define('Coon.report.component.reportpanel.ReportTreeStore', {
         getMethod: function() {
             return 'POST';
         },
+        getHeaders: function() {
+            return {'X-CSRF-Token': localStorage.getItem('CSRFToken')};
+        },
         url: 'ReportFormData/get',
         reader: {
             type: 'json',

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

@@ -108,7 +108,6 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
 
     computeInteractUIState() {
         const state = {disabled: false, hidden: !!this.invisibleByDefault};
-
         if (this.isButtonAdded()) {
             if (!this.dependOnGridParameters && !this.dependOnGridRow) {
                 return state;
@@ -120,9 +119,20 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
             state.disabled = this.isFilterDependedParamEmpty();
         }
 
-        if (!state.disabled && this.dependOnGridRow && this.isValidForRequiredParametersChecking()) {
-            const isRequiredParametersPassed = this.isRequiredParametersPassed();
-            state.disabled = this.skipRowValueCheck ? false : !isRequiredParametersPassed;
+        if (
+            !state.disabled &&
+            this.inputParametersConfig.haveRequiredReportParameters
+        ) {
+            state.disabled = !this.isRequiredParametersPassed('PRM');
+        }
+
+        if (
+            !state.disabled &&
+            this.dependOnGridRow &&
+            this.isValidForRequiredParametersChecking()
+        ) {
+            const isRequiredFLDParametersPassed = this.isRequiredParametersPassed('FLD');
+            state.disabled = this.skipRowValueCheck ? false : !isRequiredFLDParametersPassed;
         }
 
         state.hidden = this.isButtonHidden(state.disabled);
@@ -179,12 +189,27 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
      */
     computeRowInteractState() {
         let rowInteractEnabled= this.isRowInteractBySelection();
-        if (rowInteractEnabled && !Ext.isEmpty(this.dependOnGridParameters)) {
+        if (
+            rowInteractEnabled &&
+            !Ext.isEmpty(this.dependOnGridParameters)
+        ) {
             rowInteractEnabled = !this.isFilterDependedParamEmpty();
         }
-        if (rowInteractEnabled && this.dependOnGridRow && !this.isSelectionModelDefaultModeEnabled) {
-            rowInteractEnabled = this.skipRowValueCheck ? true : this.isRequiredParametersPassed();
+
+        if (
+            rowInteractEnabled &&
+            this.inputParametersConfig.haveRequiredReportParameters
+        ) {
+            rowInteractEnabled = this.isRequiredParametersPassed('PRM');
+        }
+
+        if (
+            rowInteractEnabled &&
+            this.dependOnGridRow
+        ) {
+            rowInteractEnabled = this.skipRowValueCheck ? true : this.isRequiredParametersPassed('FLD');
         }
+
         return {
             rowInteractEnabled,
         };
@@ -225,6 +250,10 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
             }
         });
 
+        const haveRequiredReportParameters=
+            parameters.filter((param) => param.editable &&
+                param.reportNavigationOptionContextSource === 'PRM').length > 0;
+
         return {
             selectionDependencyType: multiDependencyParameters.length > 0 ? 'multi' : 'single',
             multiDependencyParameters,
@@ -232,6 +261,7 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
             notRequiredMultiParameters,
             defaultParameters: reportIndependentParameters,
             onlyIndependentParameters,
+            haveRequiredReportParameters,
         };
     },
 
@@ -276,32 +306,31 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
     },
 
     /**
-     * Проверка того, что определены (заданы) значения входных параметров плагина, помеченных как обязательные.
-     * В рассмотрение берутся только параметры:
-     *  PRM - параметр отчета
-     *  FLD - поле выбранной записи.
-     * Достаточно чтобы значение было определено.
+     * Обязательные параметры плагина типа type (зависит от значения параметра репорта) настроены и заполнены.
+     * @param {string} type тип пареметра плагина (FLD, PRM)
      * @returns {boolean}
      */
-    isRequiredParametersPassed() {
-        const parameters = this.getRequiredParameters();
+    isRequiredParametersPassed(type) {
+        const parameters = this.getRequiredParameters(type);
         if (parameters.length === 0) {
             return true;
         }
-        const selected = this.component.getSelectionModel().getLastSelected();
-
         return parameters.every((param) => {
-            const paramValue = this.getParamValue(param, selected);
+            const paramValue = this.getParamValue(param);
             return !Ext.isEmpty(paramValue);
         });
     },
 
-    getRequiredParameters() {
+    getRequiredParameters(type) {
         const params = Array.isArray(this.parameters) ? this.parameters : [this.parameters];
-        return params.filter((param) => param && param.editable);
+        return params.filter((param) =>
+            param &&
+            param.editable &&
+            (!type || type === param.reportNavigationOptionContextSource)
+        );
     },
 
-    getParamValue(param, selectedRecord) {
+    getParamValue(param) {
         const {
             defaultValue,
             reportNavigationOptionContextSource: source,
@@ -314,7 +343,7 @@ Ext.define('Coon.report.plugin.grid.GridToolbarButtonPlugin', {
 
         switch (source) {
         case 'FLD':
-            return selectedRecord?.get(field);
+            return this.component.getContextManager()?.getSelectedRecord()?.get(field);
         case 'PRM':
             return this.component.contextMenu?.params?.[field];
         default:

package/src/report/toolbar/ReportGridToolbar.js

@@ -215,9 +215,8 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
     applyUserPreferences: function() {
         this.readUserPreferences();
         this.moveButtons();
-        this.reportPanel.sortButtons({bar: this});
-        this.layout.overflowHandler.menuButton.dropDownMenu.hide();
-        this.layout.overflowHandler.menuButton.dropDownMenu.show();
+        this.getLayout().overflowHandler.menuButton.dropDownMenu.hide();
+        this.getLayout().overflowHandler.menuButton.dropDownMenu.show();
     },
 
     reInitMenu(item) {
@@ -236,7 +235,7 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
     moveButtons() {
         const userFolded = this.foldItemsContainer;
         // пока hack. Иначе кнопки в скрытом контейнере торчат наружу
-        this.layout.overflowHandler.menuButton.dropDownMenu.getController().clearContainer(this);
+        this.getLayout().overflowHandler.menuButton.dropDownMenu.getController().clearContainer(this);
         // Переносим спрятанные элементы в скрытый контейнер userFolded
         Object.entries(this.userPreferences)
             .filter((cfgItem) => cfgItem[1].folded)

package/src/report/toolbar/layout/ReportToolbarOverflow.js

@@ -146,7 +146,6 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
 
     // Добавление кнопки в системный тулбар
     addButton: function(button) {
-        const me = this;
         if (button.pType !== 'ToolbarOverflowButton') {
             button.setTooltip(button.getText());
             button.setText('');
@@ -155,27 +154,25 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
         if (!button.arrowRequired === true) {
             button.arrowVisible = false;
         }
-        me.systemItems.push(button);
-        me.systemContainer.insert(0, button);
+        this.systemItems.push(button);
+        this.systemContainer.insert(0, button);
         this.setButtonsPositionsByPType();
         this.sortButtons();
         this.addMargins();
 
-        if (!me.systemContainer.rendered) {
-            me.systemContainer.on('afterrender', function(btn) {
-                this.systemContainer.setWidth(this.systemContainer.getWidth() + btn.getWidth());
-            }, me, {single: true});
+        if (!this.systemContainer.rendered) {
+            this.systemContainer.on('boxready', function() {
+                this.ReportGridToolbar.updateLayout();
+            }, this, {single: true});
         }
     },
 
     addMargins() {
-        this.systemContainer.items.each((btn, index, len) => {
-            !btn.hidden && btn.setMargin('0 0 0 8px');
-        });
-        const visibleButtons = this.systemContainer.items.filterBy(function(button) {
-            return !button.hidden;
+        const visibleButtons = this.systemContainer.query('button{isHidden()==false}');
+        visibleButtons.forEach((button) => {
+            button.setMargin('0 0 0 8px');
         });
-        const lastVisibleButton = visibleButtons.last();
+        const lastVisibleButton = visibleButtons.at(-1);
         if (lastVisibleButton) {
             lastVisibleButton.setMargin('0 8px');
         }
@@ -225,10 +222,9 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
         if (buttonsCount <= 1) {
             return false;
         }
-        this.systemContainer.items.each((button) => {
-            if (!['OptionsMenuButton', 'ToolbarOverflowButton'].includes(button.xtype) && button.itemId !== 'actionButton') {
-                button.position = this.pTypePriority[button.pType] || 0;
-            }
+
+        this.systemContainer.query('button:not(OptionsMenuButton):not(ToolbarOverflowButton):not(#actionButton)').forEach((button) => {
+            button.position = this.pTypePriority[button.pType] || 0;
         });
     },
 
@@ -236,7 +232,7 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
         if (this.systemContainer.items.length <= 1) {
             return;
         }
-        this.systemContainer.items.doSort((a, b) => {
+        this.systemContainer.items.sortBy((a, b) => {
             if (a.position < b.position) {
                 return -1;
             }

package/src/uielement/component/UiCustomController.js

@@ -179,7 +179,7 @@ Ext.define('Coon.uielement.component.UiCustomController', {
             } else {
                 setupTitle(
                     this.makeComponentTitle(staticText),
-                    {silent: true}
+                    {silent: false}
                 );
             }
         } else {

package/src/validator.js

@@ -166,8 +166,5 @@ Ext.define('Coon.validator', {
 });
 
 Ext.define('Coon.validator.mixin', {
-    constructor(validator) {
-        this.assert = Coon.validator.assert;
-        this.callParent(arguments);
-    },
+    assert: Coon.validator.assert,
 });

package/src/version.js

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