ru.coon 3.0.47 → 3.0.48

package/src/report/component/BoundListPagingToolbar.scss

@@ -1,7 +1,7 @@
-.BoundListPagingToolbar {
-  .no-min-width-field {
-    > .x-form-text-field-body-default {
-      min-width: 40px !important;
-    }
-  }
-}
+.BoundListPagingToolbar {
+  .no-min-width-field {
+    > .x-form-text-field-body-default {
+      min-width: 40px !important;
+    }
+  }
+}

package/src/report/component/ClearFiltersButton.scss

@@ -1,40 +1,40 @@
-.ClearFiltersButton {
-  border: 1px solid #3D6780 !important;
-  border-radius: 6px;
-  padding: 6px;
-  background-color: #FFFFFF;
-
-
-  &.x-btn-over {
-    border: 1px solid #3D6780 !important;
-    border-radius: 6px;
-    padding: 6px;
-    background-color: #F5F7FA;
-  }
-
-  &.x-btn-disabled {
-    border: 1px solid #A3AAB2 !important;
-    border-radius: 6px;
-    padding: 6px;
-    background-color: #FFFFFF;
-  }
-
-  &.x-btn-disabled .x-btn-icon-el {
-    background-color: #A3AAB2;
-  }
-
-  &.x-btn-menu-active {
-    border: 1px solid #3D78BF !important;
-    background-color: #D8E4F2;
-    border-radius: 6px;
-  }
-  .x-btn-icon-el {
-    background-color: rgb(61, 103, 128);
-  }
-
-
-  .x-btn-icon-el {
-    width: 18px;
-    height: 18px;
-  }
-}
+.ClearFiltersButton {
+  border: 1px solid #3D6780 !important;
+  border-radius: 6px;
+  padding: 6px;
+  background-color: #FFFFFF;
+
+
+  &.x-btn-over {
+    border: 1px solid #3D6780 !important;
+    border-radius: 6px;
+    padding: 6px;
+    background-color: #F5F7FA;
+  }
+
+  &.x-btn-disabled {
+    border: 1px solid #A3AAB2 !important;
+    border-radius: 6px;
+    padding: 6px;
+    background-color: #FFFFFF;
+  }
+
+  &.x-btn-disabled .x-btn-icon-el {
+    background-color: #A3AAB2;
+  }
+
+  &.x-btn-menu-active {
+    border: 1px solid #3D78BF !important;
+    background-color: #D8E4F2;
+    border-radius: 6px;
+  }
+  .x-btn-icon-el {
+    background-color: rgb(61, 103, 128);
+  }
+
+
+  .x-btn-icon-el {
+    width: 18px;
+    height: 18px;
+  }
+}

package/src/report/component/ErrorWindow.scss

@@ -1,16 +1,16 @@
-.errorWindow {
-  .errorMessage {
-    pre {
-      font-size: 1em;
-      white-space: pre-wrap;
-      word-wrap: break-word;
-    }
-  }
-  .fullErrorText {
-    pre {
-      white-space: pre-wrap;
-    }
-
-  }
-
+.errorWindow {
+  .errorMessage {
+    pre {
+      font-size: 1em;
+      white-space: pre-wrap;
+      word-wrap: break-word;
+    }
+  }
+  .fullErrorText {
+    pre {
+      white-space: pre-wrap;
+    }
+
+  }
+
 }

package/src/report/component/ParameterizedReportCombo.scss

@@ -1,85 +1,85 @@
-.ParameterizedReportCombo{
-  
-  .combo-box-container {
-    display: inline-block;
-    max-width: 800px;
-    background-color: white;
-    border: 1px solid lightgray;
-    box-shadow: 0 4px 8px rgba(0,0,0,0.25), 0 5px 5px rgba(0,0,0,0.22);
-  }
-  
-  .headercontant {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-  }
-  
-  .tag {
-    padding-left: 10px;
-    color: lightgray;
-  }
-  .youmeant {
-    color: lightgray;
-    min-width:125px
-  }
-  
-  .sectionLabel {
-    color: lightgray;
-  }
-  
-  .headerresults {
-    display: flex;
-    flex-direction: row;
-    justify-content: right;
-  }
-  .tag.youmeant.results {
-    color: lightgray;
-  }
-  
-  .header {
-    display: grid;
-    grid-template-columns: 2fr 5fr 2fr;
-    grid-template-rows: fit-content;
-    grid-gap: .5em;
-    padding: 5px;
-  }
-  
-  .inn {
-    display: flex;
-    flex-direction: row;
-    justify-content: left;
-  }
-  
-  .tablecell {
-    display: grid;
-    grid-template-columns: 2fr 1fr;
-    grid-template-rows: fit-content;
-    grid-gap: .5em;
-    padding: 3px;
-    padding-top: 10px;
-    border-top: 1px solid whitesmoke;
-    cursor: hand;
-  }
-  
-  .contacttablecell {
-    display: grid;
-    grid-template-columns: 3fr 2fr 2fr;
-    grid-template-rows: fit-content;
-    grid-gap: .5em;
-    padding: 3px;
-    padding-top: 10px;
-    border-top: 1px solid whitesmoke;
-    cursor: hand;
-  }
-  
-  .headname {
-    text-align: right;
-    color: steelblue;
-  }
-  
-  .customer {
-    font-weight: 600;
-    color: steelblue;
-    font-size: 1.2em;
-  }
-}
+.ParameterizedReportCombo{
+  
+  .combo-box-container {
+    display: inline-block;
+    max-width: 800px;
+    background-color: white;
+    border: 1px solid lightgray;
+    box-shadow: 0 4px 8px rgba(0,0,0,0.25), 0 5px 5px rgba(0,0,0,0.22);
+  }
+  
+  .headercontant {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+  }
+  
+  .tag {
+    padding-left: 10px;
+    color: lightgray;
+  }
+  .youmeant {
+    color: lightgray;
+    min-width:125px
+  }
+  
+  .sectionLabel {
+    color: lightgray;
+  }
+  
+  .headerresults {
+    display: flex;
+    flex-direction: row;
+    justify-content: right;
+  }
+  .tag.youmeant.results {
+    color: lightgray;
+  }
+  
+  .header {
+    display: grid;
+    grid-template-columns: 2fr 5fr 2fr;
+    grid-template-rows: fit-content;
+    grid-gap: .5em;
+    padding: 5px;
+  }
+  
+  .inn {
+    display: flex;
+    flex-direction: row;
+    justify-content: left;
+  }
+  
+  .tablecell {
+    display: grid;
+    grid-template-columns: 2fr 1fr;
+    grid-template-rows: fit-content;
+    grid-gap: .5em;
+    padding: 3px;
+    padding-top: 10px;
+    border-top: 1px solid whitesmoke;
+    cursor: hand;
+  }
+  
+  .contacttablecell {
+    display: grid;
+    grid-template-columns: 3fr 2fr 2fr;
+    grid-template-rows: fit-content;
+    grid-gap: .5em;
+    padding: 3px;
+    padding-top: 10px;
+    border-top: 1px solid whitesmoke;
+    cursor: hand;
+  }
+  
+  .headname {
+    text-align: right;
+    color: steelblue;
+  }
+  
+  .customer {
+    font-weight: 600;
+    color: steelblue;
+    font-size: 1.2em;
+  }
+}

package/src/report/component/ReportPanel.js

@@ -181,6 +181,9 @@ Ext.define('Coon.report.component.ReportPanel', {
                         currentGroupLevel = currentGroupLevel[currentGroupLevel.length - 1].columns;
                     });
                     columnConfig.cls = 'x-column-header-group-item';
+
+                    columnConfig.draggable = false;
+
                     currentGroupLevel.push(columnConfig);
                     pushed = true;
                 }
@@ -986,6 +989,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             url: this.url || '/ReportFormData/get',
             timeout: this.timeout || undefined,
             pageSize: this.pageSize || reportBean[ns.$rowCountPerPageValue],
+            sealedColumns: true,
             viewConfig: {
                 emptyText: 'Не найдено записей, удовлетворяющих условию.',
                 enableTextSelection: this.enableTextSelection,

package/src/report/component/ReportPanel.scss

@@ -1,69 +1,69 @@
-.ReportPanel {
-  $report-tile-background: #ffffff;
-  $report-font-color: #878ea2;
-  //margin: 0 20px;
-  overflow: visible;
-  .x-column-header-text {
-    text-overflow: clip ;
-  }
-  .x-tool-tool-el {
-    width: 20px;
-    height: 16px;
-    margin-right: 11px;
-    background-color: #f6f6f6;
-  }
-
-  /*.x-panel-header-default {
-    padding: 6px 16px;
-    background-color: #f6f6f6;
-    font-size: 17px;
-    .x-title-text {
-      color: #3e4752;
-    }
-
-  }*/
-
-  .x-toolbar-default{
-    background-color: #ffffff;
-  }
-
-  .x-grid-header-ct {
-    -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
-    -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
-    box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
-  }
-
-  .x-panel-body {
-    background-color: $report-tile-background;
-
-    border-radius: 3px;
-
-    -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
-    -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
-    box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
-  }
-
-  > .x-panel-body {
-    border-top: none;
-  }
-
-  .x-grid-item:first-child {
-    border-top: none !important;
-  }
-
-  .x-grid-item:last-child {
-    border-bottom: none !important;
-  }
-
-  .x-grid-inner-locked {
-    border-right-color: $report-font-color;
-  }
-
-  .x-column-header-text {
-    margin-right: 0;
-  }
-
-  .x-group-sub-header {
-    border-top: 0px solid #ebecee;
-  }
-}
+.ReportPanel {
+  $report-tile-background: #ffffff;
+  $report-font-color: #878ea2;
+  //margin: 0 20px;
+  overflow: visible;
+  .x-column-header-text {
+    text-overflow: clip ;
+  }
+  .x-tool-tool-el {
+    width: 20px;
+    height: 16px;
+    margin-right: 11px;
+    background-color: #f6f6f6;
+  }
+
+  /*.x-panel-header-default {
+    padding: 6px 16px;
+    background-color: #f6f6f6;
+    font-size: 17px;
+    .x-title-text {
+      color: #3e4752;
+    }
+
+  }*/
+
+  .x-toolbar-default{
+    background-color: #ffffff;
+  }
+
+  .x-grid-header-ct {
+    -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
+    -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
+    box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
+  }
+
+  .x-panel-body {
+    background-color: $report-tile-background;
+
+    border-radius: 3px;
+
+    -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
+    -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
+    box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.25);
+  }
+
+  > .x-panel-body {
+    border-top: none;
+  }
+
+  .x-grid-item:first-child {
+    border-top: none !important;
+  }
+
+  .x-grid-item:last-child {
+    border-bottom: none !important;
+  }
+
+  .x-grid-inner-locked {
+    border-right-color: $report-font-color;
+  }
+
+  .x-column-header-text {
+    margin-right: 0;
+  }
+
+  .x-group-sub-header {
+    border-top: 0px solid #ebecee;
+  }
+}

package/src/report/component/SimpleReportTag.scss

@@ -1,22 +1,22 @@
-.simple-report-tag{
-  .x-tagfield-input{
-    margin: 0;
-    padding: 0;
-    overflow-x: hidden;
-  }
-  .x-tagfield-item{
-    margin: 4px 6px 2px 0;
-    &.mark-to-remove{
-      background-color: #ef5350;
-    }
-    .x-tagfield-item-text{
-      line-height: 110%;
-      padding-top: 3px;
-      padding-bottom: 3px;
-    }
-  }
-
-  .x-placeholder-label {
-    display: none;
-  }
-}
+.simple-report-tag{
+  .x-tagfield-input{
+    margin: 0;
+    padding: 0;
+    overflow-x: hidden;
+  }
+  .x-tagfield-item{
+    margin: 4px 6px 2px 0;
+    &.mark-to-remove{
+      background-color: #ef5350;
+    }
+    .x-tagfield-item-text{
+      line-height: 110%;
+      padding-top: 3px;
+      padding-bottom: 3px;
+    }
+  }
+
+  .x-placeholder-label {
+    display: none;
+  }
+}

package/src/report/component/calculator/ReportCalculatorHistoryPlugin.scss

@@ -1,33 +1,33 @@
-.historyMenu {
-    padding: 0;
-
-    .history-container {
-        left: 0 !important;
-        width: 354px !important;
-        padding-left: 16px;
-        cursor: pointer;
-        .x-box-inner {
-            width: 338px !important;
-        }
-    }
-
-    .history-item-field {
-        margin-top: 3px !important;
-    }
-
-    .history-container:hover {
-        background-color: #EBECEE;
-    }
-
-    .history-item-remove-button {
-        margin-top: 2px !important;
-        left: 289px !important;
-        z-index: 2;
-    }
-
-    .history-item-remove-button.x-btn-over {
-        background-color: #EBECEE !important;
-        color: #111111 !important;
-    }
-}
-
+.historyMenu {
+    padding: 0;
+
+    .history-container {
+        left: 0 !important;
+        width: 354px !important;
+        padding-left: 16px;
+        cursor: pointer;
+        .x-box-inner {
+            width: 338px !important;
+        }
+    }
+
+    .history-item-field {
+        margin-top: 3px !important;
+    }
+
+    .history-container:hover {
+        background-color: #EBECEE;
+    }
+
+    .history-item-remove-button {
+        margin-top: 2px !important;
+        left: 289px !important;
+        z-index: 2;
+    }
+
+    .history-item-remove-button.x-btn-over {
+        background-color: #EBECEE !important;
+        color: #111111 !important;
+    }
+}
+

package/src/report/component/calculator/ReportCalculatorMenuItem.scss

@@ -1,57 +1,57 @@
-.ReportCalculatorMenuItem {
-  .hidden-focus-button.x-btn-default-small {
-    padding: 0 !important;
-  }
-
-  // стили для кнопок калькулятора в контекстном меню
-  .calculator-contextmenu-button-type1 {
-    border: 1px solid #8B8B8B !important;
-    border-radius: 6px;
-    padding: 6px 12px;
-    .x-btn-inner-default-small {
-      font-size: 13px;
-      font-weight: 400 !important;
-      line-height: 16px;
-      padding: 0;
-    }
-    .x-btn-inner {
-      color: #888888;
-    }
-    .svg-icon {
-      background-color: #888888 !important;
-    }
-    &.x-btn-over {
-      background-color: #F5F5F5;
-      border: 1px solid #707070 !important;
-      .x-btn-inner {
-        color: #707070 !important;
-      }
-    }
-    &.x-btn-pressed {
-      background-color: #ECECEC !important;
-      border: 1px solid #707070 !important;
-      .x-btn-inner {
-        color: #707070 !important;
-      }
-    }
-    &:has(.x-btn-no-text) {
-      padding: 6px 6px;
-    }
-  }
-
-  .x-form-item-body-default {
-    min-height: 22px !important;
-  }
-  .x-form-cb-wrap-default {
-    height: 24px !important;
-  }
-  .sum-value-container {
-    display: flex;
-  }
-  .sum-icon {
-    color: gray !important;
-  }
-  .sum-value {
-    margin: 2px 0 0 4px
-  }
-}
+.ReportCalculatorMenuItem {
+  .hidden-focus-button.x-btn-default-small {
+    padding: 0 !important;
+  }
+
+  // стили для кнопок калькулятора в контекстном меню
+  .calculator-contextmenu-button-type1 {
+    border: 1px solid #8B8B8B !important;
+    border-radius: 6px;
+    padding: 6px 12px;
+    .x-btn-inner-default-small {
+      font-size: 13px;
+      font-weight: 400 !important;
+      line-height: 16px;
+      padding: 0;
+    }
+    .x-btn-inner {
+      color: #888888;
+    }
+    .svg-icon {
+      background-color: #888888 !important;
+    }
+    &.x-btn-over {
+      background-color: #F5F5F5;
+      border: 1px solid #707070 !important;
+      .x-btn-inner {
+        color: #707070 !important;
+      }
+    }
+    &.x-btn-pressed {
+      background-color: #ECECEC !important;
+      border: 1px solid #707070 !important;
+      .x-btn-inner {
+        color: #707070 !important;
+      }
+    }
+    &:has(.x-btn-no-text) {
+      padding: 6px 6px;
+    }
+  }
+
+  .x-form-item-body-default {
+    min-height: 22px !important;
+  }
+  .x-form-cb-wrap-default {
+    height: 24px !important;
+  }
+  .sum-value-container {
+    display: flex;
+  }
+  .sum-icon {
+    color: gray !important;
+  }
+  .sum-value {
+    margin: 2px 0 0 4px
+  }
+}