ru.coon 2.7.69 → 2.7.71

package/CHANGELOG.md

@@ -1,8 +1,19 @@
+# Version 2.7.71, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/71f09381b29db031d26baa580e8c18fc436a5a81)
+* ## Fixes
+* <span style='color:red'>fix GetUIStructure
+feat CharacteristicGridEditor: add toolbarItems property</span> ([f17c77], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f17c77399b0837727f61ef30e480988bec05ad6b))
+
+* update: CHANGELOG.md ([33ad55], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/33ad5587e168875b0d301cea8534201f4d45e972))
+
+# Version 2.7.70, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/59a687854e0184fdab48da4903012073767af558)
+* update: CHANGELOG.md ([2e7e20], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2e7e206f80da14f38108122ade650952c40ba565))
+
 # Version 2.7.69, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9d58f22601dbf5121b56d8fa32a6316c64b48a22)
 * ## Fixes
 * <span style='color:red'> PropertyDataParser.js : check if node is object before generating id.</span> ([e40912], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e409122912b679d8c5dcf41d57f9e031f96cf1b7))
 
 * TR-69409 Добавить возможность в ExecuteCommandPlugin выводить подтверждающее сообщение как Ext.toast ([524553], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/524553f5861fc4438f800edbe4bb92ede80ccdf4))
+* HT-9896 Нет разделителей у верхних групп заголовков отчета ([f680da], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f680daf403af3e77743264972ccbae1f9e578701))
 * update: CHANGELOG.md ([9064f2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9064f2d31af96906452b2d8e8d9818f7b85831e8))
 
 # Version 2.7.68, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/474af33a28e0c286c4e3d7e2b85eda7f2af80211)
@@ -23,6 +34,7 @@
 
 * remove getCircularReplacer ([9fea84], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9fea8459fda6fd3fcaa5889828cf4cd0b6f509a7))
 * HT-9879 fix: Исправление OpenURLButtonPlugin в части проверки наличия в url знака вопроса ([56a5db], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/56a5db0b7084db2439e67f3c1eb9b6c0dab8539b))
+* TR-68836 feat: Доработки по оформлению UI-элементов ([c20de4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c20de44ef7c46753eb37b3e6c6e18cb56a352f2a))
 * update: CHANGELOG.md ([107df2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/107df2d447bec0a2698a306cbb1ac3b5093bed74))
 
 # Version 2.7.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/575aaa8ea4982726ce21f98300e95aa55ecbb906)

package/package.json

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

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

@@ -74,7 +74,7 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
         this.tbar = {
             xtype: 'toolbar',
             overflowHandler: 'menu',
-            items: this.tbarItems,
+            items: (this.tbarItems || []).concat(this.toolbarItems || []),
             layout: {
                 type: 'hbox',
                 align: 'stretch',

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

@@ -81,7 +81,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
     },
     initComponent() {
         this.searchButton = Ext.widget('splitbutton', Ext.apply({
-            ui: 'orange-button',
+            ui: 'orange-button-ext',
             text: 'Поиск',
         }, this.findButtonConfig || {}));
 
@@ -92,7 +92,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         };
 
         this.clearButton = Ext.widget('button', Ext.apply({
-            ui: 'green-button',
+            ui: 'green-button-ext',
             text: 'Очистить',
         }, this.clearButtonConfig || {}));
 

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

@@ -1,3 +1,4 @@
+
 .NorthPanel{
     .activeToggle{
         color: #A9A9A9;
@@ -15,4 +16,58 @@
     .UiCFCell{
         margin: 0px 2px !important;
     }
+
+  @include sigma-button-small-ui(
+          $ui: 'orange-button-ext',
+          $background-color: $base-color-light,
+          $border-radius: 6px,
+          $border-width: 1px,
+          $border-color: $base-color-light,
+          $border-color-disabled: lighten($base-color-light, 20%),
+          $background-color-over: $base-color-light,
+          $background-color-focus: $base-color-light,
+          $background-color-pressed: $base-color-light,
+          $background-color-focus-over: $base-color-light,
+          $background-color-focus-pressed: $base-color-light,
+          $border-color-focus-pressed: $base-color-light,
+          $background-color-disabled: lighten($base-color-light, 20%),
+          $icon-size: 16px,
+          $font-size: 12px,
+          $padding: 6px 12px,
+          //$text-padding: 2px
+  );
+
+  @include sigma-button-small-ui(
+          $ui: 'green-button-ext',
+          $background-color: transparent,
+          $color : $base-color-light,
+          $iconColor : $base-color-light,
+          $border-width: 1px,
+          $inner-border-width-focus: 2px,
+          $border-radius: 6px,
+          $border-color: $base-color-light,
+          $border-color-disabled: lighten($base-color-light, 20%),
+          $color-over: white,
+          $color-focus: $base-color-light,
+          $color-focus-over: $base-color-light,
+          $color-pressed: white,
+          $color-focus-pressed: white,
+          $color-disabled: lighten($base-color-light, 20%),
+          $background-color-over: $base-color-light,
+          $background-color-focus: transparent,
+          $background-color-pressed: $base-color-light,
+          $background-color-focus-over: $base-color-light,
+          $background-color-focus-pressed: $base-color-light,
+          $background-color-disabled: transparent,
+          $icon-size: 16px,
+          $font-size: 12px,
+          $padding: 6px 12px,
+  );
+  .x-btn-icon-el-green-button-ext-small,
+  .x-btn-icon-el-orange-button-ext-small {
+    min-width: 16px !important;
+    min-height: 16px !important;
+    mask-size: 16px !important;
+  }
+
 }

package/src/report/component/reportpanel/ReportGrid.scss

@@ -1,7 +1,7 @@
 .ReportGrid {
   .x-grid-header-ct {
 
-    .x-column-header-group {
+    .x-column-header-group, .x-column-header-sub-group {
       border-right: 1px solid $panel-header-background-color !important;
     }
 
@@ -34,4 +34,19 @@
     bottom: 0;
     margin: auto 0;
   }
+
+  .x-btn-icon-el-blue-button-small,
+  .x-btn-icon-el-blue-text-button-small,
+  .x-btn-icon-el-blue-text-button-border-small,
+  .x-btn-icon-el-primary-with-icon-small,
+  .x-btn-icon-el-default-toolbar-small,
+  .x-btn-icon-el-green-button-small,
+  .x-btn-icon-el-orange-button-small {
+    min-width: 16px !important;
+    min-height: 16px !important;
+    mask-size: 16px !important;
+    &.x-fa {
+      font-size: 16px !important
+    }
+  }
 }

package/src/research/command/GetUiStructure.js

@@ -5,6 +5,9 @@ Ext.define('Coon.research.command.GetUIStructure', {
     decode(ui) {
         const rootName = `<b>CustomPanel</b> ${ui.id}`;
         const parse = (cfg, acc = {name: rootName, children: [], expanded: true}) => {
+            if (typeof cfg === 'string') {
+                return acc;
+            }
             cfg.expanded = true;
             cfg.source = 'editor';
             if (Array.isArray(cfg)) {
@@ -102,6 +105,7 @@ Ext.define('Coon.research.command.GetUIStructure', {
                 });
             }
         } catch (ex) {
+            console.error('GetUIStructure error: ', ex);
             result = {
                 name: 'Error parsing ui "propertyData"',
                 isParsingError: true,

package/src/version.js

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