ru.coon 2.7.41 → 2.7.43

package/src/report/plugin/configPanel/AddFilterConditionPluginConfigPanel.scss

@@ -1,53 +1,53 @@
-.AddFilterConditionPluginConfigPanel {
-        .svg-icon{
-                height: 24px;
-                width: 24px;
-        }
-        .fa{
-                height: 24px;
-                width: 24px;
-                padding-top: 6px;
-                color: black;
-        }
-
-        .x-segmented-button-item{
-                background-color: transparent;
-        }
-        .x-segmented-button-item:hover{
-                background-color: rgba(61, 103, 128, 0.04);
-        }
-        .x-segmented-button-item:active{
-                background-color: rgba(61, 103, 128, 0.12);
-        }
-        .x-btn-pressed .x-btn-icon-el {
-                color: #ffffff !important;
-        }
-        .x-segmented-button .x-segmented-button-item .x-btn-inner{
-                color: #3D6780;
-        }
-        .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
-                color: #3D6780;
-        }
-        .x-btn-icon-el{
-                color: #3D6780;
-        }
-}
-
-@include extjs-button-small-ui(
-        $ui: 'FilterSegmentedButton',
-        $padding: 8px 12px,
-        $color: #3D6780,
-        $icon-size: 16px,
-
-        $background-color-over: rgba(61, 103, 128, 0.04),
-        $background-color-focus-over: rgba(61, 103, 128, 0.04),
-
-        $background-color-pressed: rgba(61, 103, 128, 0.12),
-        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
-
-
-        $border-color: 'none',
-        $background-color: transparent,
-        $border-color-focus: #3D6780,
-        $background-color-focus: rgba(61, 103, 128, 0.12)
-);
+.AddFilterConditionPluginConfigPanel {
+        .svg-icon{
+                height: 24px;
+                width: 24px;
+        }
+        .fa{
+                height: 24px;
+                width: 24px;
+                padding-top: 6px;
+                color: black;
+        }
+
+        .x-segmented-button-item{
+                background-color: transparent;
+        }
+        .x-segmented-button-item:hover{
+                background-color: rgba(61, 103, 128, 0.04);
+        }
+        .x-segmented-button-item:active{
+                background-color: rgba(61, 103, 128, 0.12);
+        }
+        .x-btn-pressed .x-btn-icon-el {
+                color: #ffffff !important;
+        }
+        .x-segmented-button .x-segmented-button-item .x-btn-inner{
+                color: #3D6780;
+        }
+        .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
+                color: #3D6780;
+        }
+        .x-btn-icon-el{
+                color: #3D6780;
+        }
+}
+
+@include extjs-button-small-ui(
+        $ui: 'FilterSegmentedButton',
+        $padding: 8px 12px,
+        $color: #3D6780,
+        $icon-size: 16px,
+
+        $background-color-over: rgba(61, 103, 128, 0.04),
+        $background-color-focus-over: rgba(61, 103, 128, 0.04),
+
+        $background-color-pressed: rgba(61, 103, 128, 0.12),
+        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
+
+
+        $border-color: 'none',
+        $background-color: transparent,
+        $border-color-focus: #3D6780,
+        $background-color-focus: rgba(61, 103, 128, 0.12)
+);

package/src/report/plugin/configPanel/CopyRowsFromGridConfigPanel.js

@@ -95,6 +95,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
         ];
     },
     setContext: function(context) {
+        this.context = context;
         this.callParent(arguments);
         const visibleFields = context && context.fields ? context.fields.filter((field) => field.visibleSwitch === true) : [];
         if (visibleFields && visibleFields.length) {
@@ -161,20 +162,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
                     fieldLabel: 'Имя файла (без расширения)',
                     name: 'reportFileName',
                     msgTarget: 'under',
-                    validator: (value) => {
-                        if (Ext.isEmpty(value)) {
-                            return true;
-                        }
-                        const isValid = (function() {
-                            const rg1 = /^[^\\/:\*\?"<>\|]+$/; // запрещенные символы \ / : * ? " < > |
-                            const rg2 = /^\./; // не должно начинаться с точки (.)
-                            const rg3 = /^(nul|prn|con|lpt[0-9]|com[0-9])(\.|$)/i; // запрещенные имена файлов
-                            return function isValid(fname) {
-                                return rg1.test(fname) && !rg2.test(fname) && !rg3.test(fname);
-                            };
-                        })();
-                        return !isValid(value) ? 'Недопустимое имя файла' : true;
-                    },
+                    validator: this.reportFileNameValidator.bind(this),
                 },
                 {
                     xtype: 'container',
@@ -399,4 +387,36 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
             value: true,
         };
     },
+
+    reportFileNameValidator: function(value) {
+        if (Ext.isEmpty(value)) {
+            return true;
+        }
+
+        let templateErrorMessage;
+        try {
+            const params = {};
+            this.context.parameters.forEach((parameter) => {
+                params[parameter['reportParameterCd']] = '';
+            });
+            new Ext.XTemplate(value, {strict: true}).apply({
+                parameters: params,
+            });
+        } catch (err) {
+            templateErrorMessage = `Ошибка в шаблоне: ${err.message}`;
+            Coon.log.warn(templateErrorMessage);
+        }
+
+        const isValid = (function() {
+            const rg1 = /^[^\\/:\*\?"<>\|]+$/; // запрещенные символы \ / : * ? " < > |
+            const rg2 = /^\./; // не должно начинаться с точки (.)
+            const rg3 = /^(nul|prn|con|lpt[0-9]|com[0-9])(\.|$)/i; // запрещенные имена файлов
+            return function isValid(fname) {
+                return rg1.test(fname) && !rg2.test(fname) && !rg3.test(fname);
+            };
+        })();
+
+        return !isValid(value) ? 'Недопустимое имя файла':
+            templateErrorMessage ? templateErrorMessage: true;
+    },
 });

package/src/report/plugin/configPanel/ExecuteCommandButtonPluginConfigPanel.scss

@@ -1,5 +1,5 @@
-.addActionColumnMsg {
-	font-size: 15px;
-	margin: 0 0 0 12px;
-	color: red;
-}
+.addActionColumnMsg {
+	font-size: 15px;
+	margin: 0 0 0 12px;
+	color: red;
+}

package/src/report/plugin/configPanel/GroupRowsPluginConfigPanel.scss

@@ -1,3 +1,3 @@
-.tpl-key {
-    font-weight: bold;
-}
+.tpl-key {
+    font-weight: bold;
+}

package/src/report/plugin/configPanel/UiAceEditorField.scss

@@ -1,20 +1,20 @@
-.UiAceEditorField {
-  .ace-editor-editor{
-    width: 100%;
-    height: 100px;
-    display: block;
-    background-color: red !important;
-    min-height: 30px !important;
-  }
-  .ace-editor-content .x-grid-cell-editor{
-      width: 100%;
-      height: 100%;
-      display: block;
-      position: relative !important;
-      min-height: 100px;
-  }
-  .ace-editor-content .ace_editor{
-    height: 100%;
-    min-height: 100px;
-  }
-}
+.UiAceEditorField {
+  .ace-editor-editor{
+    width: 100%;
+    height: 100px;
+    display: block;
+    background-color: red !important;
+    min-height: 30px !important;
+  }
+  .ace-editor-content .x-grid-cell-editor{
+      width: 100%;
+      height: 100%;
+      display: block;
+      position: relative !important;
+      min-height: 100px;
+  }
+  .ace-editor-content .ace_editor{
+    height: 100%;
+    min-height: 100px;
+  }
+}

package/src/report/plugin/configPanel/common/pluginDescriptionLabel.scss

@@ -1,9 +1,9 @@
-.pluginDescriptionLabel {
-    height: 2.5em;
-    margin: 5px 10px;
-    text-overflow: clip;
-    overflow: hidden;
-    .x-form-display-field {
-        color: #555!important;
-    }
+.pluginDescriptionLabel {
+    height: 2.5em;
+    margin: 5px 10px;
+    text-overflow: clip;
+    overflow: hidden;
+    .x-form-display-field {
+        color: #555!important;
+    }
 }

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

@@ -389,7 +389,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     execute: function() {
         const reportPanel = this.component.up('ReportPanel');
         const selected = this.getSelected()[0];
-        const name = this.getParameterPartName(this.reportFileName) ||
+        const name = this.getTemplatedFileName(this.reportFileName) ||
             (selected && selected.data['CM_REPORT_CD']) ||
             this.tryToGetTitle() ||
             (reportPanel && reportPanel.reportId) ||
@@ -423,17 +423,23 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         reportPanel && reportPanel.unmask();
     },
 
-    getParameterPartName: function(message) {
-        if (Ext.isString(message) && message.match(/{.*}/g) !== null) {
-            return this.getTemplatedMessage(message);
+    /**
+     * Имя файла может содержать шаблон
+     * @param fileName имя файла
+     * @returns {*}
+     */
+    getTemplatedFileName: function(fileName) {
+        if (!Ext.isString(fileName) || fileName.match(/{.*}/g) === null) {
+            return fileName;
         }
-        return message;
-    },
-
-    getTemplatedMessage: function(message) {
-        return new Ext.XTemplate(message).apply({
-            parameters: this.component.up('ReportPanel').currentParamList,
-        });
+        try {
+            fileName = new Ext.XTemplate(fileName, {strict: true}).apply({
+                parameters: this.component.up('ReportPanel').currentParamList,
+            });
+        } catch (err) {
+            Coon.log.warn(err);
+        }
+        return fileName;
     },
 
     normalizeFileName: function(fileName) {

package/src/report/plugin/grid/GridRowStylePlugin.scss

@@ -1,56 +1,56 @@
-
-.boldOnRow.x-grid-row {
-  font-weight: bold;
-}
-
-.italicOnRow.x-grid-row {
-  font-style: italic;
-}
-
-.underlineOnRow.x-grid-row {
-  text-decoration: underline;
-}
-
-.linkColor.x-grid-row {
-  a {
-    color: inherit;
-  }
-}
-
-.boldOnRow .x-grid-row {
-  font-weight: bold;
-}
-
-.italicOnRow .x-grid-row {
-  font-style: italic;
-}
-
-.underlineOnRow .x-grid-row {
-  text-decoration: underline;
-}
-
-.linkColor .x-grid-row {
-  a {
-    color: inherit;
-  }
-}
-
-.x-grid-checkcolumn::after {
-  color: inherit !important;
-  font-weight: inherit;
-  font-style: inherit;
-}
-
-.x-grid-cell-inner .link-button {
-  color: inherit !important;
-  font-weight: inherit;
-  font-style: inherit;
-}
-
-.x-grid-cell-inner {
-  a {
-    font-weight: inherit;
-    font-style: inherit;
-    color: inherit;
-  }
-}
+
+.boldOnRow.x-grid-row {
+  font-weight: bold;
+}
+
+.italicOnRow.x-grid-row {
+  font-style: italic;
+}
+
+.underlineOnRow.x-grid-row {
+  text-decoration: underline;
+}
+
+.linkColor.x-grid-row {
+  a {
+    color: inherit;
+  }
+}
+
+.boldOnRow .x-grid-row {
+  font-weight: bold;
+}
+
+.italicOnRow .x-grid-row {
+  font-style: italic;
+}
+
+.underlineOnRow .x-grid-row {
+  text-decoration: underline;
+}
+
+.linkColor .x-grid-row {
+  a {
+    color: inherit;
+  }
+}
+
+.x-grid-checkcolumn::after {
+  color: inherit !important;
+  font-weight: inherit;
+  font-style: inherit;
+}
+
+.x-grid-cell-inner .link-button {
+  color: inherit !important;
+  font-weight: inherit;
+  font-style: inherit;
+}
+
+.x-grid-cell-inner {
+  a {
+    font-weight: inherit;
+    font-style: inherit;
+    color: inherit;
+  }
+}

package/src/report/plugin/grid/ReportTabContainerPlugin.scss

@@ -1,3 +1,3 @@
-.x-tab-bar-default-top .x-tab-bar-body-default {
-  padding-top: 0;
-}
+.x-tab-bar-default-top .x-tab-bar-body-default {
+  padding-top: 0;
+}

package/src/report/plugin/grid/ToggleColumnsPlugin.scss

@@ -1,7 +1,7 @@
-.ToggleColumnsPlugin {
-  .toggle-pressed {
-    .x-btn-icon-el-blue-text-button-small.svg-icon {
-      background-color: #1E3B4B;
-    }
-  }
-}
+.ToggleColumnsPlugin {
+  .toggle-pressed {
+    .x-btn-icon-el-blue-text-button-small.svg-icon {
+      background-color: #1E3B4B;
+    }
+  }
+}

package/src/report/plugin/grid/ToolbarButtonPlugin.scss

@@ -1,3 +1,3 @@
-.x-grid-cell-inner-action-col {
-	text-align: center !important;
-}
+.x-grid-cell-inner-action-col {
+	text-align: center !important;
+}

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

@@ -10,10 +10,14 @@ Ext.define('Coon.report.plugin.grid.TreeNestingToolbarButtonPlugin', {
 
     isSingle: true,
 
+    iconEnabled: 'svg-icon svg-icon-scheme-3',
+    iconDisabled: 'svg-icon svg-icon-disabled svg-icon-scheme-3',
+
     createToolbarItem: function() {
         this.nestingButton = Ext.create({
             xtype: 'button',
-            iconCls: 'svg-icon svg-icon-scheme-3',
+            iconCls: this.iconDisabled,
+            ui: 'blue-text-button',
             disabled: true,
             width: 66,
             height: 40,
@@ -32,15 +36,21 @@ Ext.define('Coon.report.plugin.grid.TreeNestingToolbarButtonPlugin', {
         reportTree.getStore().on('load', function() {
             const records = reportTree.getStore().getRange();
             if (!records.length) {
+                this.setDisabledButton(true, this.iconDisabled, null);
                 return;
             }
 
-            const menus = this.getMenu(reportTree);
-            this.nestingButton.setDisabled(false);
-            this.nestingButton.setMenu(menus, false);
+            const menu = this.getMenu(reportTree);
+            this.setDisabledButton(false, this.iconEnabled, menu);
         }, this);
     },
 
+    setDisabledButton: function(isDisabled, icon, menu) {
+        this.nestingButton.setDisabled(isDisabled);
+        this.nestingButton.setIconCls(icon);
+        this.nestingButton.setMenu(menu, false);
+    },
+
     getMenu: function(reportTree) {
         return [
             {

package/src/research/ResearchTreeView.scss

@@ -1,19 +1,19 @@
-.ResearchTreeView {
-  span.field-rep-name {
-    font-weight: bold;
-  }
-
-  span.field-ui-name {
-    font-weight: bold;
-  }
-
-  span.component-type-name {
-    font-weight: bold;
-  }
-
-  .x-tab-default .x-tab-close-btn:before {
-    content: '\f00d';
-    color: gray;
-  }
-
-}
+.ResearchTreeView {
+  span.field-rep-name {
+    font-weight: bold;
+  }
+
+  span.field-ui-name {
+    font-weight: bold;
+  }
+
+  span.component-type-name {
+    font-weight: bold;
+  }
+
+  .x-tab-default .x-tab-close-btn:before {
+    content: '\f00d';
+    color: gray;
+  }
+
+}

package/src/security/component/RoleFileUploadForm.scss

@@ -1,5 +1,5 @@
-.RoleFileUploadForm {
-    .x-btn-inner {
-        color: black!important;
-    }
+.RoleFileUploadForm {
+    .x-btn-inner {
+        color: black!important;
+    }
 }

package/src/security/component/ui/UiCPRestrictionEditor.scss

@@ -1,5 +1,5 @@
-.UiCPRestrictionEditor {
-    .saveBtn:not(.x-item-disabled) .x-btn-inner{
-        color: red;
-    }
+.UiCPRestrictionEditor {
+    .saveBtn:not(.x-item-disabled) .x-btn-inner{
+        color: red;
+    }
 }

package/src/security/securitySettingComponent/RoleEditPanel.scss

@@ -1,17 +1,17 @@
-.RoleEditPanel {
-  .x-grid-item {
-    .checked-row {
-      background-color: #f7f7f8;
-    }
-  }
-  .x-grid-item {
-    .unchecked-row {
-      background-color: white;
-    }
-  }
-  .x-grid-row {
-      &:hover {
-        background-color: #ebecee;
-      }
-  }
+.RoleEditPanel {
+  .x-grid-item {
+    .checked-row {
+      background-color: #f7f7f8;
+    }
+  }
+  .x-grid-item {
+    .unchecked-row {
+      background-color: white;
+    }
+  }
+  .x-grid-row {
+      &:hover {
+        background-color: #ebecee;
+      }
+  }
 }

package/src/uielement/component/MenuItemList.scss

@@ -1,35 +1,35 @@
-.MenuItemList {
-  .list-box {
-    border: 1px solid #e0e0e0;
-    margin: 3px;
-    //padding: 7px;
-    border-radius: 10px;
-  }
-
-  .parent-menu-item .x-treelist-item-text {
-    font-size: 16px;
-    color: #111;
-    font-weight: 600;
-  }
-
-  .x-treelist-item-text {
-    color: #1f5a8a;
-  }
-
-  .empty-bg {
-    background-color: #eeeeee !important;
-  }
-
-  .icon-orange {
-    background-color: #ff9800;
-    margin-top: 5px;
-  }
-
-  .x-treelist-row-over, .x-treelist-item-selected .x-treelist-row {
-    background-color: #FFFFFFFF;
-  }
-
-  .x-treelist-row-over .x-treelist-item-text, .x-treelist-item-selected .x-treelist-item-text {
-    color: #112b39;
-  }
-}
+.MenuItemList {
+  .list-box {
+    border: 1px solid #e0e0e0;
+    margin: 3px;
+    //padding: 7px;
+    border-radius: 10px;
+  }
+
+  .parent-menu-item .x-treelist-item-text {
+    font-size: 16px;
+    color: #111;
+    font-weight: 600;
+  }
+
+  .x-treelist-item-text {
+    color: #1f5a8a;
+  }
+
+  .empty-bg {
+    background-color: #eeeeee !important;
+  }
+
+  .icon-orange {
+    background-color: #ff9800;
+    margin-top: 5px;
+  }
+
+  .x-treelist-row-over, .x-treelist-item-selected .x-treelist-row {
+    background-color: #FFFFFFFF;
+  }
+
+  .x-treelist-row-over .x-treelist-item-text, .x-treelist-item-selected .x-treelist-item-text {
+    color: #112b39;
+  }
+}