ru.coon 3.0.7 → 3.0.8

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 3.0.8, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d002a5973cb3a56e4efc7376e0651fb859700ab1)
+* ## Features
+* <span style='color:green'>feat: HT-12388 add opening as a tab in CenterView option in OpenPanelPlugin</span> ([83a2f8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83a2f83dc1781307946e4f4d7dcbdd400fb95c38))
+* <span style='color:green'>feat: TR-70563 add style changes to vertica tabpanel</span> ([a0d06b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a0d06b4fbeaba0eafcc56fd7253b01be4eca99e7))
+
+* update: CHANGELOG.md ([d9b705], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9b705f81997d91fb868ce9c25dc4c845359b9c1))
+
 # Version 3.0.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/712d2dfc27e7a8fc0f987e0d0a84d0f47daa85af)
 * ## Features
 * <span style='color:green'>feat: NEVA-828: Доработка копирования плагинов, пересобираю объект что бы вложенные объекты не были ссылочными. + мелкие фиксы</span> ([5524d0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5524d0ac04332a4ebd845ef77a68295551a1d81b))

package/package.json

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

package/src/overrides/panel/TabPanel.scss

@@ -1,7 +1,9 @@
 .coonVerticalTabpanel {
+    border-top: solid #DEDEDE 1px;
+    z-index: 4;
     .x-tab-bar.x-tab-bar-vertical {
         background-color: #fff;
-
+        border-right: solid #DEDEDE 1px !important;
         .x-tab {
             position: static !important;
             padding: 8px 16px;
@@ -40,6 +42,10 @@
             font-weight: 400;
             line-height: var(--line-height);
         }
+
+        .x-tab-bar-body-default {
+            padding: 0;
+        }
     }
 
     .tab-dirty {

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

@@ -196,6 +196,7 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
                 {
                     uiElementCd: properties.uiElementCd,
                     xtype,
+                    source: this.$className.split('.').pop(),
                 }
             )
         );

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -13,6 +13,7 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         windowProperties: {},
         panelXType: undefined,
         uiElementCd: undefined,
+        openInTab: undefined,
         handlerName: undefined,
         dataMapping: {},
         panelEventListeners: {},
@@ -60,16 +61,62 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         }
     },
 
-    openPanel: function() {
-        const defaultProperties = this.defaultProperties || {};
-        const properties = Ext.apply(defaultProperties, this.properties);
-        this.panelXType = this.getFromModel(this.panelXType);
-        const panel = Ext.widget(this.panelXType, properties);
+    openInCenterView(panel, properties) {
+        this.getCenterView();
+        if (!this.centerView) {
+            const frameview = this.getCmp().up('frameview');
+            if (frameview) {
+                Ext.toast(`В режиме редактирования кастомной панели нельзя открыть панель ${this.uiElementCd} во вкладке.`);
+            }
+            Coon.log.debug('panel cannot be open in centerView from CustomPanelEditor');
+            return;
+        }
+
+        const componentContextId = Coon.util.ContextManager.generateKey(
+            Object.assign(
+                {},
+                properties,
+                {
+                    uiElementCd: properties.uiElementCd,
+                    params: this.initArguments,
+                    xtype: this.panelXType,
+                    source: this.$className.split('.').pop(),
+                }
+            )
+        );
+        panel.componentContextId = componentContextId;
+
+        if (this.hasInCenterView(componentContextId)) {
+            this.centerView.setActiveComponent({componentContextId});
+            return;
+        }
+
+        this.centerView.setActiveComponent(panel);
+        Coon.Function.executeComponentDoInit(panel, this.initArguments);
+        panel.setClosable(true);
+        panel.on('afterlayout', function(panel) {
+            panel.focus();
+        }, this, {single: true});
+    },
+
+    getCenterView() {
+        if (!this.centerView) {
+            this.centerView = this.centerView || this.getCmp().up('centerview');
+        }
+        return this.centerView;
+    },
+
+    hasInCenterView(componentContextId) {
+        return !!this.centerView.findComponent(componentContextId);
+    },
+
+    openInWindowWrap(panel) {
         const defaultWindowConfig = {
             height: 450,
             width: 780,
         };
         Ext.apply(defaultWindowConfig, this.windowProperties);
+
         const openWindow = Ext.widget('WindowWrap', Ext.applyIf({
             items: panel,
         }, defaultWindowConfig || {}));
@@ -79,12 +126,9 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         });
 
         openWindow.on('afterrender', function() {
-            const initArguments = {};
-            for (const name in this.parameters) {
-                initArguments[name] = this.getFromModel(this.parameters[name]);
-            }
-            Coon.Function.executeComponentDoInit(panel, initArguments);
+            Coon.Function.executeComponentDoInit(panel, this.initArguments);
         }, this);
+
         if (!Ext.isEmpty(this.panelEventListeners)) {
             for (const eventName in this.panelEventListeners) {
                 if (this.panelEventListeners.hasOwnProperty(eventName)) {
@@ -92,6 +136,29 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
                 }
             }
         }
+
         openWindow.show();
     },
+
+    setInitArguments() {
+        this.initArguments = {};
+        for (const name in this.parameters) {
+            this.initArguments[name] = this.getFromModel(this.parameters[name]);
+        }
+    },
+
+    openPanel: function() {
+        const defaultProperties = this.defaultProperties || {};
+        const properties = Ext.apply(defaultProperties, this.properties);
+        this.panelXType = this.getFromModel(this.panelXType);
+        const panel = Ext.widget(this.panelXType, properties);
+
+        this.setInitArguments();
+
+        if (this.openInTab) {
+            this.openInCenterView(panel, properties);
+        } else {
+            this.openInWindowWrap(panel);
+        }
+    },
 });

package/src/uielement/plugin/configPanel/OpenPanelPluginConfigPanelFormEditor.js

@@ -16,6 +16,7 @@ Ext.define('Coon.uielement.plugin.configPanel.OpenPanelPluginConfigPanelFormEdit
             handlerName: '',
             panelEventListeners: [],
             activeAceTab: 'parameters',
+            openInTab: false,
         },
     },
     layout: {
@@ -61,6 +62,25 @@ Ext.define('Coon.uielement.plugin.configPanel.OpenPanelPluginConfigPanelFormEdit
                 value: '{panelXType}',
             },
         },
+        {
+            items: [
+                {
+                    boxLabel: 'Открыть во вкладке[по умолчанию откроется в модальном окне(WindowWrap)]',
+                    xtype: 'checkbox',
+                    name: 'openInTab',
+                    margin: 0,
+                    bind: {
+                        value: '{openInTab}',
+                    },
+                },
+                {
+                    html: `<p style="font: 400 12px / 16px Roboto, sans-serif; margin: 0 0 0 30px">
+                            (при выборе данной опции, находясь в режиме редактирования кастомной
+                            панели будет невозможным проверка открытия данной uiElementCd)
+                            </p>`,
+                }
+            ],
+        },
         {
             xtype: 'tabpanel',
             itemId: 'propTabPanel',
@@ -91,7 +111,7 @@ Ext.define('Coon.uielement.plugin.configPanel.OpenPanelPluginConfigPanelFormEdit
         {
             xtype: 'ReportPropertiesGrid',
             title: 'panelEventListeners',
-            flex: 2,
+            flex: 3,
             columns: [
                 {
                     text: 'event',
@@ -232,6 +252,7 @@ Ext.define('Coon.uielement.plugin.configPanel.OpenPanelPluginConfigPanelFormEdit
                 result[el] = vm.get(el);
             }
         });
+        result['openInTab'] = vm.get('openInTab');
         return result;
     },
 });

package/src/version.js

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