ru.coon 2.5.67 → 2.6.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/ReportPropertiesAceEditor.js

@@ -51,9 +51,6 @@ Ext.define('Coon.report.component.settings.ReportPropertiesAceEditor', {
             xtype: 'UiAceEditor',
             height: 400,
             useLinter: true,
-            bind: {
-                value: '{aceEditorData}',
-            },
         }
     ],
 

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

@@ -2,6 +2,7 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
     extend: 'Ext.grid.Panel',
     alias: 'widget.ReportPropertiesGrid',
     alternateClassName: 'Sigma.component.report.settings.ReportPropertiesGrid',
+    cls: 'ReportPropertiesGrid',
     requires: [],
     controller: 'reportPropertiesGridController',
     config: {
@@ -24,7 +25,6 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
     },
     applyEnableAddProps: function(value) {
         this.lookup('addButton').setDisabled(!value);
-        this.lookup('editorButton').setDisabled(!value);
     },
     title: 'Свойства',
     selModel: {
@@ -48,33 +48,56 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
                 handler: 'deleteHandler',
                 reference: 'deleteButton',
                 disabled: true,
-            },
-            {
-                text: '{}',
-                tooltip: 'Открыть в редакторе',
-                ui: 'blue-text-button-border',
-                handler: 'openInEditor',
-                reference: 'editorButton',
             }
         ],
     }],
     columns: {
         defaults: {
-            required: true,
             xtype: 'hintColumn',
-            editor: {
-                xtype: 'textfield',
-                allowBlank: false,
-            },
+            required: true,
         },
         items: [
-            {text: 'Номер', dataIndex: 'sequenceNumber', width: 50, hidden: true},
-            {text: 'Ключ', dataIndex: 'key', flex: 1},
+            {
+                text: 'Номер',
+                dataIndex: 'sequenceNumber',
+                width: 50,
+                hidden: true,
+
+                editor: {
+                    xtype: 'textfield',
+                    allowBlank: true,
+                },
+            },
+            {
+                text: 'Ключ',
+                dataIndex: 'key',
+                flex: 1,
+                editor: {
+                    xtype: 'textfield',
+                    allowBlank: false,
+                },
+            },
             {
                 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,
             }
         ],
     },

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

@@ -0,0 +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;
+        }
+      }
+}

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

@@ -40,12 +40,11 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
             Coon.log.error('Unable to save data, some parameter properties have empty key or value');
             isValid = false;
         }
-        const columns = this.getView().getColumns();
-        const columnsReq = columns.map((column) => {
-            if (column.required) {
-                return column.dataIndex;
-            }
-        });
+        const columns = this.getView().getColumns()
+            .filter((c) => c.xtype !== 'actioncolumn');
+        const columnsReq = columns
+            .filter((column) => column.required === true)
+            .map((column) => column.dataIndex);
 
         properties.forEach((prop) => {
             if (!prop['isDeleted']) {
@@ -193,4 +192,130 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
     updateProperties: function() {
         this.getView().publishState('data', Coon.Function.serializeRecords(this.getView().getStore().getRange()));
     },
+
+    /**
+     * open editional editor to change value
+     */
+    openValueEditor: function(grid, rowIndex, colIndex) {
+        const rec = grid.getStore().getAt(rowIndex);
+        const value = rec.get('value');
+
+        // set row as selected
+        grid.setSelection(rec);
+
+        const chooseMode = (button) => {
+            const mode = button.getText();
+            const value = win.down('UiAceEditor').getValue();
+
+            // rerender editor
+            win.removeAll();
+            const editor = Ext.widget('UiAceEditor', {
+                useLinter: mode === 'json' ? true : false,
+                mode,
+                enableEmptyValue: true,
+            });
+            editor.on('boxready', function() {
+                if (mode === 'javascript') {
+                    // filter annotations
+                    const doLint = new Ext.util.DelayedTask(function() {
+                        editor.editor.getSession().$annotations.filter((a) => a.text !== 'Missing name in function declaration.');
+                        editor.highlightErrors();
+                    });
+                    editor.editor.on('change', function(action, editor) {
+                        const value = editor.getValue();
+                        // remove annotation if Javascript mode enabled
+                        doLint.delay(1000, undefined, undefined, [value]);
+                    });
+                }
+            });
+            win.add(editor);
+
+            setTimeout(() => {
+                win.down('UiAceEditor').setValue(value);
+            }, 0);
+        };
+
+        const win = Ext.widget('WindowWrap', {
+            layout: 'fit',
+            width: 660,
+            height: 430,
+            title: 'Редактирование свойства ' + rec.get('key') || '',
+            cls: 'ReportPropertiesModifier',
+            tbar: [
+                {
+                    xtype: 'segmentedbutton',
+                    items: [
+                        {
+                            itemId: 'modeText',
+                            text: 'text',
+                            pressed: true,
+                            handler: chooseMode,
+                        },
+                        {
+                            itemId: 'modeJavascript',
+                            text: 'javascript',
+                            handler: chooseMode,
+                        },
+                        {
+                            itemId: 'modeJson',
+                            text: 'json',
+                            handler: chooseMode,
+                        }
+                    ],
+                }
+            ],
+            items: [{
+                xtype: 'UiAceEditor',
+                useLinter: false,
+                mode: 'text',
+            }],
+            buttons: [
+                {
+                    xtype: 'button',
+                    text: 'Сохранить',
+                    ui: 'orange-button',
+                    handler: function() {
+                        const me = this;
+                        const hasErrors = me.up('WindowWrap').down('UiAceEditor').getErrors().length > 0;
+
+                        // eslint-disable-next-line require-jsdoc
+                        function save() {
+                            rec.set({
+                                value: me.up('WindowWrap').down('UiAceEditor').getValue(),
+                            });
+                            me.up('WindowWrap').close();
+                        };
+
+                        if (hasErrors) {
+                            Ext.Msg.show({
+                                title: 'Ошибка при вводе значения',
+                                message: 'Сохранить значение?',
+                                buttons: Ext.Msg.YESNO,
+                                icon: Ext.Msg.WARNING,
+                                fn: function(btn) {
+                                    if (btn === 'yes') {
+                                        save();
+                                    }
+                                },
+                            });
+                            return;
+                        }
+                        save();
+                    },
+                },
+                {
+                    xtype: 'button',
+                    text: 'Закрыть',
+                    ui: 'green-button',
+                    handler: function() {
+                        this.up('WindowWrap').close();
+                    },
+                }
+            ],
+        });
+        win.show();
+
+        win.down('UiAceEditor').setValue(value);
+        win.down('UiAceEditor').editor.focus();
+    },
 });

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/parameter/ReportFormParameterEditPanel.js

@@ -1,64 +1,64 @@
-Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPanel', {
-    extend: 'Ext.panel.Panel',
-    alias: 'widget.ReportFormParameterEditPanel',
-    alternateClassName: 'Sigma.component.report.settings.ReportFormParameterEditPanel',
-    requires: [
-        'Coon.report.component.settings.ReportFieldPropertiesGrid',
-        'Coon.report.component.settings.parameter.ReportFormParametersGrid'
-    ],
-    controller: 'reportformparametereditpanelcontroller',
-    frame: true,
-    title: 'Параметры',
-    layout: 'border',
-    defaults: {
-        border: false,
-        split: true,
-    },
-    items: [
-        {
-            region: 'center',
-            layout: 'border',
-            items: [
-                {
-                    xtype: 'ReportFormParametersGrid',
-                    region: 'center',
-                    reference: 'parametersGrid',
-                    bind: {
-                        data: '{report.parameters}',
-                    },
-                    listeners: {
-                        'showfilterpanel': 'showFilterPanel',
-                    },
-                },
-                {
-                    xtype: 'ReportPropertiesGrid',
-                    width: 500,
-                    scrollable: true,
-                    split: true,
-                    frame: false,
-                    region: 'east',
-                    reference: 'parameterProperties',
-                    bind: {
-                        enableAddProps: '{enableAddParamProps}',
-                        data: '{parametersGrid.selection.properties}',
-                    },
-                }
-            ],
-        },
-        {
-            xtype: 'panel',
-            title: 'Предпросмотр панели фильтрации отчета',
-            region: 'south',
-            scrollable: true,
-            split: true,
-            height: 400,
-            reference: 'filterPanelContainer',
-            tbar: [{
-                text: 'Обновить',
-                ui: 'blue-text-button-border',
-                handler: 'showFilterPanel',
-            }],
-        }
-    ],
-});
-
+Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPanel', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.ReportFormParameterEditPanel',
+    alternateClassName: 'Sigma.component.report.settings.ReportFormParameterEditPanel',
+    requires: [
+        'Coon.report.component.settings.ReportFieldPropertiesGrid',
+        'Coon.report.component.settings.parameter.ReportFormParametersGrid'
+    ],
+    controller: 'reportformparametereditpanelcontroller',
+    frame: true,
+    title: 'Параметры',
+    layout: 'border',
+    defaults: {
+        border: false,
+        split: true,
+    },
+    items: [
+        {
+            region: 'center',
+            layout: 'border',
+            items: [
+                {
+                    xtype: 'ReportFormParametersGrid',
+                    region: 'center',
+                    reference: 'parametersGrid',
+                    bind: {
+                        data: '{report.parameters}',
+                    },
+                    listeners: {
+                        'showfilterpanel': 'showFilterPanel',
+                    },
+                },
+                {
+                    xtype: 'ReportPropertiesGrid',
+                    width: 500,
+                    scrollable: true,
+                    split: true,
+                    frame: false,
+                    region: 'east',
+                    reference: 'parameterProperties',
+                    bind: {
+                        enableAddProps: '{enableAddParamProps}',
+                        data: '{parametersGrid.selection.properties}',
+                    },
+                }
+            ],
+        },
+        {
+            xtype: 'panel',
+            title: 'Предпросмотр панели фильтрации отчета',
+            region: 'south',
+            scrollable: true,
+            split: true,
+            height: 400,
+            reference: 'filterPanelContainer',
+            tbar: [{
+                text: 'Обновить',
+                ui: 'blue-text-button-border',
+                handler: 'showFilterPanel',
+            }],
+        }
+    ],
+});
+

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);
+        }
+    }
 }