ru.coon 2.7.4 → 2.7.6

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

@@ -1,37 +1,37 @@
-.ReportGrid {
-  .x-grid-header-ct {
-
-    .x-column-header-group {
-      border-right: 1px solid $panel-header-background-color !important;
-    }
-
-    .x-group-header {
-      .x-column-header-group-item {
-        border-top: 1px solid $panel-header-background-color !important;
-        border-right: 1px solid $panel-header-background-color;
-      }
-
-      .x-column-header-sub-group {
-        border-top: 1px solid $panel-header-background-color;
-      }
-    }
-    .filtered-column {
-      .x-column-header-text span{
-       text-decoration: underline;
-      }
-      font-style: italic;
-      font-weight: bold;
-    }
-  }
-
-  &:has(.hover-cell:hover, .editable-cell:hover) .editable-cell::before{
-    content: " ";
-    background: #BDBDBD;
-    width: 3px;
-    height: 26px;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    margin: auto 0;
-  }
-}
+.ReportGrid {
+  .x-grid-header-ct {
+
+    .x-column-header-group {
+      border-right: 1px solid $panel-header-background-color !important;
+    }
+
+    .x-group-header {
+      .x-column-header-group-item {
+        border-top: 1px solid $panel-header-background-color !important;
+        border-right: 1px solid $panel-header-background-color;
+      }
+
+      .x-column-header-sub-group {
+        border-top: 1px solid $panel-header-background-color;
+      }
+    }
+    .filtered-column {
+      .x-column-header-text span{
+       text-decoration: underline;
+      }
+      font-style: italic;
+      font-weight: bold;
+    }
+  }
+
+  &:has(.hover-cell:hover, .editable-cell:hover) .editable-cell::before{
+    content: " ";
+    background: #BDBDBD;
+    width: 3px;
+    height: 26px;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+  }
+}

package/src/report/component/settings/AddVersioningTab.js

@@ -1,19 +1,19 @@
-Ext.define('Coon.report.component.settings.AddVersioningTab', {
-    extend: 'Ext.Mixin',
-
-    mixinConfig: {
-        before: {
-            init: 'initAction',
-        },
-    },
-
-    initAction: function() {
-        if (this.isEnabled()) {
-            this.getView().add({xtype: 'ReportFormHistoryPanel'});
-        }
-    },
-
-    isEnabled: function() {
-        return Coon.setup.getOption('reportVersioning');
-    },
-});
+Ext.define('Coon.report.component.settings.AddVersioningTab', {
+    extend: 'Ext.Mixin',
+
+    mixinConfig: {
+        before: {
+            init: 'initAction',
+        },
+    },
+
+    initAction: function() {
+        if (this.isEnabled()) {
+            this.getView().add({xtype: 'ReportFormHistoryPanel'});
+        }
+    },
+
+    isEnabled: function() {
+        return Coon.setup.getOption('reportVersioning');
+    },
+});

package/src/report/component/settings/ReportFormEditPanel.scss

@@ -1,87 +1,87 @@
-.ReportFormEditPanel {
-  .highlight-filter-field {
-    .x-form-trigger-wrap-default {
-      background-color: rgba(0, 120, 201, 0.2);
-    }
-  }
-
-  .ReportFormPluginGrid {
-    .x-btn-default-toolbar-small {
-      .svg-icon {
-        background-color: $base-color;
-      }
-    }
-  }
-
-  .deletedRecord {
-    color: darkred;
-    text-decoration: line-through;
-  }
-
-  .readOnlyRecord {
-    .x-grid-td {
-      background-color: #f5f5f5;
-      color: #555;
-    }
-  }
-
-  .readOnlyDeletedRecord {
-    .x-grid-td {
-      color: darkred;
-      text-decoration: line-through;
-      background-color: #f5f5f5;
-    }
-  }
-
-  .x-grid-item {
-    .excluded-record {
-      color: #ff9e9e;
-    }
-
-    .duplicate-record{
-      outline: 1px solid #cb89ff;
-    }
-  }
-
-  .x-panel-body {
-    background-color: white;
-  }
-
-  .textareastyle {
-    margin-top: 10px;
-
-    textarea {
-      padding: 6px;
-    }
-  }
-
-  .x-form-textarea-body {
-    height: inherit;
-  }
-
-  .x-segmented-button {
-    border: 1px solid #3d6780;
-    border-radius: 6px;
-    overflow: hidden;
-
-    .x-segmented-button-item {
-      padding: 6px 8px;
-      background-color: #ffffff;
-      .x-btn-inner {
-        color: #3d6780;
-      }
-
-      &.x-btn-pressed {
-        background-color: #3d6780;
-        .x-btn-inner {
-          color: #ffffff;
-        }
-      }
-    }
-
-    & > *:not(:last-child) {
-      border-right: 1px solid #3d6780;
-    }
-  }
-}
-
+.ReportFormEditPanel {
+  .highlight-filter-field {
+    .x-form-trigger-wrap-default {
+      background-color: rgba(0, 120, 201, 0.2);
+    }
+  }
+
+  .ReportFormPluginGrid {
+    .x-btn-default-toolbar-small {
+      .svg-icon {
+        background-color: $base-color;
+      }
+    }
+  }
+
+  .deletedRecord {
+    color: darkred;
+    text-decoration: line-through;
+  }
+
+  .readOnlyRecord {
+    .x-grid-td {
+      background-color: #f5f5f5;
+      color: #555;
+    }
+  }
+
+  .readOnlyDeletedRecord {
+    .x-grid-td {
+      color: darkred;
+      text-decoration: line-through;
+      background-color: #f5f5f5;
+    }
+  }
+
+  .x-grid-item {
+    .excluded-record {
+      color: #ff9e9e;
+    }
+
+    .duplicate-record{
+      outline: 1px solid #cb89ff;
+    }
+  }
+
+  .x-panel-body {
+    background-color: white;
+  }
+
+  .textareastyle {
+    margin-top: 10px;
+
+    textarea {
+      padding: 6px;
+    }
+  }
+
+  .x-form-textarea-body {
+    height: inherit;
+  }
+
+  .x-segmented-button {
+    border: 1px solid #3d6780;
+    border-radius: 6px;
+    overflow: hidden;
+
+    .x-segmented-button-item {
+      padding: 6px 8px;
+      background-color: #ffffff;
+      .x-btn-inner {
+        color: #3d6780;
+      }
+
+      &.x-btn-pressed {
+        background-color: #3d6780;
+        .x-btn-inner {
+          color: #ffffff;
+        }
+      }
+    }
+
+    & > *:not(:last-child) {
+      border-right: 1px solid #3d6780;
+    }
+  }
+}
+

package/src/report/component/settings/ReportPropertiesGrid.js

@@ -1,3 +1,16 @@
+/**
+ * При инстанцировании компонента можно задать свойство extraColumns, содержащее список дополнительных колонок грида.
+ * extraColumns: [
+ *                {
+ *                   text: 'Описание',
+ *                   dataIndex: 'description',
+ *                   insertAfter: {
+ *                        dataIndex: 'value',
+ *                   },
+ *                }
+ * ],
+ * insertAfter означает, что колонка "Описание " будет добавлена после колонки с dataIndex='value'. Можно также использовать insertBefore.
+ */
 Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
     extend: 'Ext.grid.Panel',
     alias: 'widget.ReportPropertiesGrid',
@@ -65,61 +78,51 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
             }
         ],
     }],
-    columns: {
-        defaults: {
-            xtype: 'hintColumn',
-            required: true,
-        },
-        items: [
-            {
-                text: 'Номер',
-                dataIndex: 'sequenceNumber',
-                width: 50,
-                hidden: true,
+    columns: [
+        {
+            text: 'Номер',
+            dataIndex: 'sequenceNumber',
+            width: 50,
+            hidden: true,
 
-                editor: {
-                    xtype: 'textfield',
-                    allowBlank: true,
-                },
-            },
-            {
-                text: 'Ключ',
-                dataIndex: 'key',
-                flex: 1,
-                editor: {
-                    xtype: 'textfield',
-                    allowBlank: false,
-                },
+            editor: {
+                xtype: 'textfield',
+                allowBlank: true,
             },
-            {
-                text: 'Значение',
-                dataIndex: 'value',
-                flex: 1,
-                editor: 'textfield',
-            },
-            {
-                text: 'Описание',
-                dataIndex: 'description',
-                flex: 2,
-            },
-            {
-                xtype: 'actioncolumn',
-                width: 50,
-                items: [{
-                    iconCls: 'svg-fa svg-fa-pencil',
-                    tooltip: 'Редактировать',
-                    handler: 'openValueEditor',
-                }],
+        },
+        {
+            text: 'Ключ',
+            dataIndex: 'key',
+            flex: 1,
+            editor: {
+                xtype: 'textfield',
+                allowBlank: false,
             },
-            {
-                text: 'mode',
-                dataIndex: 'mode',
-                width: 50,
-                required: false,
-                hidden: true,
-            }
-        ],
-    },
+        },
+        {
+            text: 'Значение',
+            dataIndex: 'value',
+            flex: 1,
+            editor: 'textfield',
+        },
+        {
+            xtype: 'actioncolumn',
+            width: 50,
+            items: [{
+                iconCls: 'svg-fa svg-fa-pencil',
+                tooltip: 'Редактировать',
+                handler: 'openValueEditor',
+            }],
+        },
+        {
+            text: 'mode',
+            dataIndex: 'mode',
+            width: 50,
+            required: false,
+            hidden: true,
+        }
+    ],
+
     plugins: [
         {ptype: 'cellediting', clicksToEdit: 2},
         {ptype: 'CopyRowsFromGrid'},
@@ -142,4 +145,20 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
     listeners: {
         boxready: 'onGridReady',
     },
+    initComponent() {
+        if (Array.isArray(this.extraColumns) && this.extraColumns.length) {
+            this.columns = this.columns.reduce((acc, column) => {
+                const foundBefore = this.extraColumns.find((extraColumn) =>
+                    Ext.isObject(extraColumn.insertBefore) && extraColumn.insertBefore.dataIndex === column.dataIndex);
+                foundBefore && acc.push(foundBefore);
+                acc.push(column);
+                const foundAfter = this.extraColumns.find((extraColumn) =>
+                    Ext.isObject(extraColumn.insertAfter) && extraColumn.insertAfter.dataIndex === column.dataIndex);
+                foundAfter && acc.push(foundAfter);
+                return acc;
+            }, []);
+        }
+        this.columns.map((el) => Ext.applyIf(el, {xtype: 'hintColumn', required: true}));
+        this.callParent(arguments);
+    },
 });

package/src/report/component/settings/ReportPropertiesGrid.scss

@@ -1,26 +1,26 @@
-.ReportPropertiesModifier {
-    .x-segmented-button {
-        border: 1px solid #3d6780;
-        border-radius: 6px;
-        overflow: hidden;
-    
-        .x-segmented-button-item {
-          padding: 6px 8px;
-          background-color: #ffffff;
-          .x-btn-inner {
-            color: #3d6780;
-          }
-    
-          &.x-btn-pressed {
-            background-color: #3d6780;
-            .x-btn-inner {
-              color: #ffffff;
-            }
-          }
-        }
-    
-        & > *:not(:last-child) {
-          border-right: 1px solid #3d6780;
-        }
-      }
+.ReportPropertiesModifier {
+    .x-segmented-button {
+        border: 1px solid #3d6780;
+        border-radius: 6px;
+        overflow: hidden;
+    
+        .x-segmented-button-item {
+          padding: 6px 8px;
+          background-color: #ffffff;
+          .x-btn-inner {
+            color: #3d6780;
+          }
+    
+          &.x-btn-pressed {
+            background-color: #3d6780;
+            .x-btn-inner {
+              color: #ffffff;
+            }
+          }
+        }
+    
+        & > *:not(:last-child) {
+          border-right: 1px solid #3d6780;
+        }
+      }
 }

package/src/report/component/settings/field/ReportFormFieldsGrid.scss

@@ -1,5 +1,5 @@
-.ReportFormFieldsGrid {
-  .x-tree-icon-leaf {
-    color: lightgrey;
-  }
-}
+.ReportFormFieldsGrid {
+  .x-tree-icon-leaf {
+    color: lightgrey;
+  }
+}

package/src/report/component/settings/property/ReportPropertiesPanel.scss

@@ -1,13 +1,13 @@
-.ReportPropertiesPanel {
-    tr.is-deleted {
-        td.x-grid-cell {
-            text-decoration: line-through !important;
-            color: #f12d2d;
-        }
-    }
-    tr.is-new-rec {
-        td.x-grid-cell {
-            color: rgb(53, 179, 179);
-        }
-    }
+.ReportPropertiesPanel {
+    tr.is-deleted {
+        td.x-grid-cell {
+            text-decoration: line-through !important;
+            color: #f12d2d;
+        }
+    }
+    tr.is-new-rec {
+        td.x-grid-cell {
+            color: rgb(53, 179, 179);
+        }
+    }
 }

package/src/report/component/tab/ReportTabView.js

@@ -1,59 +1,59 @@
-/**
- * Created by dbandurin on 17.11.19.
- */
-Ext.define('Coon.report.component.tab.ReportTabView', {
-    extend: 'Ext.tab.Panel',
-    alias: 'widget.ReportTabView',
-    config: {
-        reports: [],
-    },
-    initComponent: function() {
-        this.items = this.items || [];
-        if (!Ext.isEmpty(this.reports)) {
-            if (Ext.isString(this.reports) || Ext.isObject(this.reports)) {
-                this.createReportTab(this.reports);
-            } else if (Ext.isArray(this.reports)) {
-                this.reports.forEach(Ext.bind(this.createReportTab, this));
-            }
-        }
-        this.callParent();
-    },
-
-    createReportTab: function(tabConfig) {
-        if (!Ext.isEmpty(tabConfig)) {
-            if (Ext.isString(tabConfig)) {
-                this.items.push(Ext.create({
-                    xtype: 'ReportPanel',
-                    reportID: tabConfig,
-                    hideFilterPanel: true,
-                }));
-            } else {
-                this.items.push(tabConfig);
-            }
-        }
-    },
-
-    doInit: function(params) {
-        this.items.items.forEach((item) => {
-            let parameters;
-            if (Ext.isFunction(item.getDoInitParametersFromContextObject)) {
-                parameters = item.getDoInitParametersFromContextObject(params);
-            } else {
-                parameters = params;
-                if (item.isReportEngineUsed) {
-                    parameters.params = params;
-                    parameters.autoFilter = true;
-                }
-            }
-            Coon.Function.executeComponentDoInit(item, parameters);
-        }
-        );
-    },
-    inputParameters: function() {
-        return [
-            {name: 'params'}
-        ];
-    },
-
-
-});
+/**
+ * Created by dbandurin on 17.11.19.
+ */
+Ext.define('Coon.report.component.tab.ReportTabView', {
+    extend: 'Ext.tab.Panel',
+    alias: 'widget.ReportTabView',
+    config: {
+        reports: [],
+    },
+    initComponent: function() {
+        this.items = this.items || [];
+        if (!Ext.isEmpty(this.reports)) {
+            if (Ext.isString(this.reports) || Ext.isObject(this.reports)) {
+                this.createReportTab(this.reports);
+            } else if (Ext.isArray(this.reports)) {
+                this.reports.forEach(Ext.bind(this.createReportTab, this));
+            }
+        }
+        this.callParent();
+    },
+
+    createReportTab: function(tabConfig) {
+        if (!Ext.isEmpty(tabConfig)) {
+            if (Ext.isString(tabConfig)) {
+                this.items.push(Ext.create({
+                    xtype: 'ReportPanel',
+                    reportID: tabConfig,
+                    hideFilterPanel: true,
+                }));
+            } else {
+                this.items.push(tabConfig);
+            }
+        }
+    },
+
+    doInit: function(params) {
+        this.items.items.forEach((item) => {
+            let parameters;
+            if (Ext.isFunction(item.getDoInitParametersFromContextObject)) {
+                parameters = item.getDoInitParametersFromContextObject(params);
+            } else {
+                parameters = params;
+                if (item.isReportEngineUsed) {
+                    parameters.params = params;
+                    parameters.autoFilter = true;
+                }
+            }
+            Coon.Function.executeComponentDoInit(item, parameters);
+        }
+        );
+    },
+    inputParameters: function() {
+        return [
+            {name: 'params'}
+        ];
+    },
+
+
+});