ru.coon 2.8.53 → 2.8.55

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.8.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/64f911d4d6fb3907fa76bd53d21e5d260ebeb655)
+# Version 2.8.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/57cf1e02a88adae16228d487145fd5b1fa012078)
+* ## Features
+* <span style='color:green'>feat: AddDoInitSupportPlugin predefine input parameters in viewModel, UiCPWrapper add inheritViewModel property</span> ([cf7bf1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cf7bf17cf68a551b8746f750158964df33c22788))
+
+* update: CHANGELOG.md ([c15697], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c15697ca7b353c5521c832f5fc574fca5c5f8b94))
+
 # Version 2.8.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bcfb669a9fd715244f642af2782f77713ec4d9c5)
 # Version 2.8.52, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f09d0df73622befab3f7f6d08aaea3ad696e036d)
 * UiCustomPanel - force init empty parameters as 'null' (AddDoInitSupportPlugin) ([aed95f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aed95f7586a370fbee59166203d0482bc0a7ee42))

package/package.json

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

package/src/report/component/SimplestReportCombo.js

@@ -260,6 +260,9 @@ Ext.define('Coon.report.component.SimplestReportCombo', {
     },
 
     onComplete: function(map) {
+        if (this.destroyed) {
+            return;
+        };
         this.setBusy(false);
         if (this.DANGEROUS_AMOUNT_OF_DATA && map.length > this.DANGEROUS_AMOUNT_OF_DATA) {
             if (this.getCutDangerousAmount()) {

package/src/uielement/component/UiCPWrapper.js

@@ -63,6 +63,11 @@ Ext.define('Coon.uielement.component.UiCPWrapper', {
 
     renderPanel: function(panelConfig) {
         const config = Object.assign({}, panelConfig, this.initConfig);
+        config.inheritViewModel = this.inheritViewModel;
+        if (this.inheritViewModel) {
+            const parentViewModel = this.findParentByType('UiCustomPanel').getViewModel();
+            config.viewModel = parentViewModel;
+        }
         const panel = Ext.create('widget.UiCustomPanel', config);
         this.uiPanel = panel;
         panel.on('afterrender', function() {

package/src/uielement/component/UiCustomPanel.js

@@ -57,4 +57,26 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
 
     copyLink: false,
 
+    initComponent() {
+        if (!this.inheritViewModel) {
+            this.viewModel = this.viewModel || {type: 'UiCustomPanelViewModel'};
+            this.viewModel.data = this.viewModel.data || {};
+            this.viewModel = {
+                data: Ext.applyIf(this.viewModel.data, this.getViewModelData()),
+            };
+        }
+        this.callParent();
+    },
+
+    getViewModelData() {
+        const data = {};
+        const addDoInitSupportPlugin = this.plugins && this.plugins.find((plugin) => plugin.ptype === 'AddDoInitSupportPlugin');
+        if (addDoInitSupportPlugin) {
+            addDoInitSupportPlugin.parametersToModel.forEach((param) => {
+                data[param.value] = undefined;
+            });
+        }
+        return data;
+    },
+
 });

package/src/uielement/plugin/AddDoInitSupportPlugin.js

@@ -59,10 +59,9 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
         }
         const dataMapping = this.getInputParams();
         parameters.forEach((el, index) => {
-            if (!this.validatePath(dataMapping[index].valuePath)) {
-                return;
+            if (this.validatePath(dataMapping[index].valuePath) && (el !== null)) {
+                this.vm.set(dataMapping[index].valuePath, el);
             }
-            this.vm.set(dataMapping[index].valuePath, el || null);
         });
     },
 

package/src/version.js

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