ru.coon 3.0.24 → 3.0.26

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 3.0.26, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a0df7c2d955b5d5d24ba68a0fe0a97375acc5ee3)
+* TR-71648 fix:  исправлена подгрузка конфигурации плагина при выборе uiElement ([b90d1c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b90d1ce10022a274977c44a2a65b7fbb532c117f))
+* update: CHANGELOG.md ([7a7d54], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7a7d5486bb04c4eb44cef61633dcdf59a62fc1ed))
+
+# Version 3.0.25, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/29b2ff1b9c7d3c4fbe98425e94b868a19f332af4)
+* ## Fixes
+* <span style='color:red'> UiCPWrapper parent viewModel inheritance</span> ([ef0228], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ef02284c46d3807a10453b3a3aef9642d778f365))
+
+* update: CHANGELOG.md ([ecd6e3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ecd6e3ee6cbf4cf29e6a62f18cd48e8144caa6f4))
+
 # Version 3.0.24, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/380c0346c6949314e25b567d825bc43545743828)
 * HT-12505 fix: исправление ошибок взаимодействия с Selection Model MultiRangeSpreadsheetModel ([34fe95], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/34fe953d01cf35a13b9638e02d131a7e64baf88d))
 * HT-12894 feat: displayFieldTpl, displayFieldConverter для ReportLookupTag и SimplestReportCombo ([e0e531], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0e53115399c0b8a16cf4634247d56df6c43c406))

package/package.json

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

package/src/report/component/settings/plugin/ReportFormPluginGrid.js

@@ -102,12 +102,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
                 {
                     iconCls: 'fa fa-cog',
                     tooltip: 'Настройка',
-                    handler() {
-                        Ext.create({
-                            xtype: 'ReportFormPluginSettings',
-                            selection: Array.from(arguments)[5],
-                        });
-                    },
+                    handler: 'uiElementConfigure',
                 }
             ],
         },

package/src/report/component/settings/plugin/ReportFormPluginGridController.js

@@ -218,10 +218,11 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
     },
 
     selectUiElementHandler: function(editorField) {
+        const xtype = editorField.up('grid').selection.get('xtype');
         const getListUiElementCd = function(value) {
             Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'UI_ELEMENTS_LIST',
                 Ext.encode([
-                    {type: 'XTYPE', value: editorField.up('grid').selection.get('xtype')},
+                    {type: 'XTYPE', value: xtype},
                     {type: 'UI_ELEMENT_CD', value: value}
                 ]))
                 .then((data) => {
@@ -341,37 +342,40 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
         const selectedPlugin = vm.get('pluginsGrid').selection;
         const lastUiElementId = selectedPlugin && selectedPlugin.get('lastUiElementId');
         selectedPlugin && selectedPlugin.set('lastUiElementId', uiElementId);
-        if (lastUiElementId !== uiElementId) {
-            this.isUiElementLinked(uiElementId, reportId, function(existLinkedTables) {
-                existLinkedTables && selectedPlugin && selectedPlugin.set('readOnly', true);
+        if (lastUiElementId === uiElementId) {
+            return;
+        }
+        const view = this.getView();
+        this.isUiElementLinked(uiElementId, reportId)
+            .then((isLinked) => {
+                isLinked && selectedPlugin && selectedPlugin.set('readOnly', true);
                 const uiElementCommand = Ext.create('command.GetUIElementCommand');
-                uiElementCommand.on('complete', function(data) {
+                uiElementCommand.on('complete', (data) => {
                     if (data && data.id && data.propertyData) {
-                        Ext.Msg.confirm('Подтверждение', 'Загрузить свойства указанного UiElement?', function(btn) {
+                        Ext.Msg.confirm('Подтверждение', 'Загрузить свойства указанного UiElement?', (btn) => {
                             if (btn === 'yes') {
                                 vm.set('pluginsGrid.selection.jsonProperties',
                                     Ext.isObject(data.propertyData) ? data.propertyData : Ext.decode(data.propertyData));
-                                this.getView().fireEvent('refreshUiElement');
+                                view.fireEvent('refreshUiElement');
                             }
-                        }, this);
+                        });
                     }
-                }, this);
+                });
                 uiElementCommand.execute(uiElementId, true);
-            }.bind(this));
-        }
+            })
+            .catch((error) => {
+                // todo: Обработать ситуацию, когда при проверке использования ui в репортах произошла ошибка
+            });
     },
 
-    isUiElementLinked: function(uiElementId, ownerReportId, callBackFn) {
-        const reportStore = Ext.create({xclass: 'store.ReportStore'});
-        reportStore.on('load', function(store, records) {
-            const linked = records && records.length > 0 && records.find((r) => r.get('NAME') !== ownerReportId);
-            callBackFn(linked);
-        }, this);
-        reportStore.loadWithReportParams({
-            params: {
-                parameterList: {'UI_ELEMENT_CD': uiElementId},
-                reportId: 'UI_ELEMENT_USED_TABLES',
-            },
+    isUiElementLinked: function(uiElementId, ownerReportId) {
+        return Coon.util.promisifyCmd({
+            command: 'command.GetDynamicReportDataCommand',
+            params: {reportId: 'UI_ELEMENT_USED_TABLES', parameterList: Ext.encode([{type: 'UI_ELEMENT_CD', value: uiElementId}])},
+        }).then((response) => {
+            const list = response && response.list;
+            const linked = Array.isArray(list) && list.find((row) => row.NAME !== ownerReportId);
+            return !!linked;
         });
     },
     autoGenerateUiElementHandler(editorField) {
@@ -384,4 +388,15 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
     generateUiElementId: function(data) {
         return Coon.report.ReportEntity.generateUiElementId(this.getReportId(), data);
     },
+    uiElementConfigure(view, rowIndex, colIndex, item, e, record) {
+        const settings = Ext.create({
+            xtype: 'ReportFormPluginSettings',
+            selection: record,
+        });
+        settings.on('uielementchanged', (uiElement) => {
+            record.set('uiElement', uiElement);
+            this.loadPropertiesUiElementCd(uiElement);
+            this.updateDependentReports(uiElement);
+        });
+    },
 });

package/src/report/component/settings/plugin/ReportFormPluginSettings.js

@@ -138,7 +138,8 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginSettings', {
                 });
         },
         applyHandler() {
-            this.vm.get('selection').set('uiElement', this.lookup('uiElementField').getValue());
+            const uiElement = this.lookup('uiElementField').getValue();
+            this.getView().fireEvent('uielementchanged', uiElement);
             this.closeHandler();
         },
         closeHandler() {

package/src/uielement/component/UiCPWrapper.js

@@ -137,18 +137,31 @@ Ext.define('Coon.uielement.component.UiCPWrapper', {
         });
     },
 
+    getParentViewModel() {
+        return this.parentViewModel && this.parentViewModel.isViewModel ?
+            this.parentViewModel :
+            (
+                this.up('UiCustomPanel') &&
+                this.up('UiCustomPanel').getViewModel() ||
+                this.lookupViewModel()
+            );
+    },
+
     setViewModelConfig(config) {
         config.viewModel = {};
         if ([null, false].includes(this.parentViewModel)) {
             return;
         }
-        const parentViewModel = (this.parentViewModel && this.parentViewModel.isViewModel) ?
-            this.parentViewModel :
-            this.up('UiCustomPanel').getViewModel();
+        const parentViewModel = this.getParentViewModel();
         if (this.inheritViewModel) {
-            config.viewModel = parentViewModel;
+            if (parentViewModel) {
+                config.viewModel = parentViewModel;
+            } else {
+                config.viewModel = {};
+                Coon.log.error('UICPWrapper has no viewModel!');
+            }
         } else {
-            config.viewModel.parent = parentViewModel;
+            config.viewModel.parent = parentViewModel || {};
         }
     },
 

package/src/version.js

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