ru.coon 2.5.25 → 2.5.26

package/src/report/component/settings/plugin/PluginSelectWindow.js

@@ -1,245 +1,245 @@
-Ext.define('Coon.report.component.settings.plugin.PluginSelectWindow', {
-    extend: 'Ext.window.Window',
-    xtype: 'PluginSelectWindow',
-    uses: [],
-    requires: [],
-    alternateClassName: [
-        'Sigma.common.components.report.settings.plugins.PluginSelectWindow',
-        'Sigma.component.report.settings.PluginSelectWindow'
-    ],
-
-    width: 1050,
-    height: 700,
-    closeAction: 'hide',
-    title: 'Выбор плагина',
-
-    layout: {
-        type: 'hbox',
-        pack: 'start',
-        align: 'stretch',
-    },
-
-    initComponent: function() {
-        const description = Ext.create('Ext.form.Label', {
-            frame: true,
-            scrollable: true,
-            flex: 1,
-            minHeight: 100,
-        });
-        const grid = this.grid = Ext.create('Ext.grid.Panel', {
-            store: {
-                fields: [
-                    {name: 'value'},
-                    {name: 'description'},
-                    {name: 'tags'}
-                ],
-                sorters: [
-                    {property: 'value', direction: 'ASC'}
-                ],
-            },
-            columns: [
-                {header: 'Плагин', dataIndex: 'value'},
-                {header: 'Тэг', dataIndex: 'tags', renderer: this.buttonsRenderer.bind(this)}
-            ],
-            forceFit: true,
-            scrollable: true,
-            flex: 1,
-            style: {
-                borderRight: '1px solid',
-            },
-        });
-        const pluginsData = this.getData();
-        this.filterField = Ext.create('Ext.form.field.Text', {
-            fieldLabel: 'Поиск по названию плагина',
-            listeners: {
-                'change': this.filter.bind(this),
-            },
-            triggers: {
-                clear: {
-                    cls: 'svg-icon svg-icon-cancel-small',
-                    tooltip: 'Очистить поле',
-                    hidden: false,
-                    handler: function() {
-                        this.clear();
-                    },
-                },
-            },
-        });
-        this.tagButtons = this.getTagsButtons(this.getTags(pluginsData));
-
-        this.items = [
-            {
-                layout: {
-                    type: 'vbox',
-                    pack: 'start',
-                    align: 'stretch',
-                },
-                items: [
-                    this.filterField,
-                    this.grid
-                ],
-                flex: 1,
-            },
-            {
-                layout: {
-                    type: 'vbox',
-                    pack: 'start',
-                    align: 'stretch',
-                },
-                padding: '0 0 0 5',
-                scrollable: true,
-                items: [
-                    {
-                        layout: {
-                            type: 'hbox',
-                            align: 'stretch',
-                        },
-                        items: [
-                            {
-                                xtype: 'label',
-                                text: 'Фильтр тэгов:',
-                                style: {
-                                    marginTop: '10px',
-                                },
-                            },
-                            {flex: 1},
-                            {
-                                xtype: 'button',
-                                ui: 'blue-text-button',
-                                text: 'Очистить фильтр',
-                                handler: function() {
-                                    this.tagButtons.forEach((b) => {
-                                        if (b.pressed) {
-                                            b.setPressed(false);
-                                        }
-                                    });
-                                    this.filter();
-                                }.bind(this),
-                            }
-                        ],
-                    },
-                    {
-                        layout: {
-                            type: 'table',
-                            columns: 3,
-                        },
-                        defaults: {
-                            bodyStyle: 'padding:20px',
-                            margin: '0 2 2 0',
-                        },
-                        items: this.tagButtons,
-                    },
-                    description
-                ],
-                flex: 1,
-            }
-        ];
-        grid.getStore().loadData(
-            this.getData()
-        );
-        grid.on('selectionchange', function(_, record) {
-            description.setText(record[0].get('description'), false);
-        }, this);
-        grid.on('itemdblclick', this.selectButtonHandler, this);
-        grid.on('rowkeydown', this.selectButtonHandler, this);
-        this.callParent();
-    },
-
-    buttonsRenderer: function(val) {
-        const id = Ext.id();
-        if (val && Ext.isArray(val)) {
-            Ext.defer(function() {
-                for (let i = 0; i < val.length; i ++) {
-                    Ext.widget('button', {
-                        renderTo: Ext.query('#'+id)[0],
-                        text: val[i],
-                        ui: 'blue-text-button',
-                        style: {
-                            padding: '0 0 0 0',
-                        },
-                        handler: function() {
-                            this.setTag(val[i]);
-                        }.bind(this),
-                    });
-                }
-            }, 50, this);
-        }
-        return Ext.String.format('<div id="{0}"></div>', id);
-    },
-
-    setTag: function(tag) {
-        this.query('[text='+tag+']')[0].click();
-    },
-
-    getData: function() {
-        const plugins = Coon.report.ReportEntity.getNormalPlugins();
-        return plugins.filter((plugin) => !plugin.isSingle || !this.exclude.has(plugin.value)).sort();
-    },
-
-    selectButtonHandler: function(_, record, el, rowIndex, e) {
-        if (e.type === 'keydown' && (e.getKey() === Ext.event.Event.ENTER) || e.type === 'dblclick') {
-            this.fireEvent(
-                'select',
-                record.get('value')
-            );
-            this.close();
-        }
-    },
-
-    filter: function() {
-        this.grid.getStore().clearFilter();
-        const searchString = this.filterField.getValue();
-        const selectedTags = [];
-        this.tagButtons.forEach((b) => {
-            if (b.pressed) {
-                selectedTags.push(b.text);
-            }
-        });
-        this.grid.getStore().filterBy(function(record) {
-            for (let i = 0; i < selectedTags.length; i++) {
-                if (!record.get('tags') || record.get('tags').indexOf(selectedTags[i]) === -1) {
-                    return false;
-                }
-            }
-            return (record.get('value').toLowerCase().indexOf(searchString.toLowerCase()) !== -1);
-        }, this);
-    },
-
-    getTagsButtons: function(tags) {
-        const tagButtons = [];
-        for (let i = 0; i < tags.length; i++) {
-            tagButtons.push(Ext.create({
-                xtype: 'button',
-                text: tags[i],
-                ui: 'blue-text-button-border',
-                width: 170,
-                enableToggle: true,
-                focusable: false,
-                handler: this.filter.bind(this),
-            }));
-        }
-        return tagButtons;
-    },
-
-    getTags: function(pluginsData) {
-        pluginsData = pluginsData || [];
-        let tagsMap = new Map();
-        for (let i = 0; i < pluginsData.length; i++) {
-            if (pluginsData[i].tags) {
-                pluginsData[i].tags.forEach((tag) => {
-                    tagsMap.set(tag, tagsMap.get(tag) ? tagsMap.get(tag) + 1 : 1);
-                });
-            }
-        }
-
-        tagsMap = new Map([...tagsMap.entries()].sort(
-            (a, b) => {
-                return (b[1] - a[1] === 0) ? (a[0].localeCompare(b[0])) : (b[1] - a[1]);
-            }
-        ));
-        const sortedTags = Array.from(tagsMap, function(entry) {
-            return entry[0];
-        });
-        return sortedTags;
-    },
-});
+Ext.define('Coon.report.component.settings.plugin.PluginSelectWindow', {
+    extend: 'Ext.window.Window',
+    xtype: 'PluginSelectWindow',
+    uses: [],
+    requires: [],
+    alternateClassName: [
+        'Sigma.common.components.report.settings.plugins.PluginSelectWindow',
+        'Sigma.component.report.settings.PluginSelectWindow'
+    ],
+
+    width: 1050,
+    height: 700,
+    closeAction: 'hide',
+    title: 'Выбор плагина',
+
+    layout: {
+        type: 'hbox',
+        pack: 'start',
+        align: 'stretch',
+    },
+
+    initComponent: function() {
+        const description = Ext.create('Ext.form.Label', {
+            frame: true,
+            scrollable: true,
+            flex: 1,
+            minHeight: 100,
+        });
+        const grid = this.grid = Ext.create('Ext.grid.Panel', {
+            store: {
+                fields: [
+                    {name: 'value'},
+                    {name: 'description'},
+                    {name: 'tags'}
+                ],
+                sorters: [
+                    {property: 'value', direction: 'ASC'}
+                ],
+            },
+            columns: [
+                {header: 'Плагин', dataIndex: 'value'},
+                {header: 'Тэг', dataIndex: 'tags', renderer: this.buttonsRenderer.bind(this)}
+            ],
+            forceFit: true,
+            scrollable: true,
+            flex: 1,
+            style: {
+                borderRight: '1px solid',
+            },
+        });
+        const pluginsData = this.getData();
+        this.filterField = Ext.create('Ext.form.field.Text', {
+            fieldLabel: 'Поиск по названию плагина',
+            listeners: {
+                'change': this.filter.bind(this),
+            },
+            triggers: {
+                clear: {
+                    cls: 'svg-icon svg-icon-cancel-small',
+                    tooltip: 'Очистить поле',
+                    hidden: false,
+                    handler: function() {
+                        this.clear();
+                    },
+                },
+            },
+        });
+        this.tagButtons = this.getTagsButtons(this.getTags(pluginsData));
+
+        this.items = [
+            {
+                layout: {
+                    type: 'vbox',
+                    pack: 'start',
+                    align: 'stretch',
+                },
+                items: [
+                    this.filterField,
+                    this.grid
+                ],
+                flex: 1,
+            },
+            {
+                layout: {
+                    type: 'vbox',
+                    pack: 'start',
+                    align: 'stretch',
+                },
+                padding: '0 0 0 5',
+                scrollable: true,
+                items: [
+                    {
+                        layout: {
+                            type: 'hbox',
+                            align: 'stretch',
+                        },
+                        items: [
+                            {
+                                xtype: 'label',
+                                text: 'Фильтр тэгов:',
+                                style: {
+                                    marginTop: '10px',
+                                },
+                            },
+                            {flex: 1},
+                            {
+                                xtype: 'button',
+                                ui: 'blue-text-button',
+                                text: 'Очистить фильтр',
+                                handler: function() {
+                                    this.tagButtons.forEach((b) => {
+                                        if (b.pressed) {
+                                            b.setPressed(false);
+                                        }
+                                    });
+                                    this.filter();
+                                }.bind(this),
+                            }
+                        ],
+                    },
+                    {
+                        layout: {
+                            type: 'table',
+                            columns: 3,
+                        },
+                        defaults: {
+                            bodyStyle: 'padding:20px',
+                            margin: '0 2 2 0',
+                        },
+                        items: this.tagButtons,
+                    },
+                    description
+                ],
+                flex: 1,
+            }
+        ];
+        grid.getStore().loadData(
+            this.getData()
+        );
+        grid.on('selectionchange', function(_, record) {
+            description.setText(record[0].get('description'), false);
+        }, this);
+        grid.on('itemdblclick', this.selectButtonHandler, this);
+        grid.on('rowkeydown', this.selectButtonHandler, this);
+        this.callParent();
+    },
+
+    buttonsRenderer: function(val) {
+        const id = Ext.id();
+        if (val && Ext.isArray(val)) {
+            Ext.defer(function() {
+                for (let i = 0; i < val.length; i ++) {
+                    Ext.widget('button', {
+                        renderTo: Ext.query('#'+id)[0],
+                        text: val[i],
+                        ui: 'blue-text-button',
+                        style: {
+                            padding: '0 0 0 0',
+                        },
+                        handler: function() {
+                            this.setTag(val[i]);
+                        }.bind(this),
+                    });
+                }
+            }, 50, this);
+        }
+        return Ext.String.format('<div id="{0}"></div>', id);
+    },
+
+    setTag: function(tag) {
+        this.query('[text='+tag+']')[0].click();
+    },
+
+    getData: function() {
+        const plugins = Coon.report.ReportEntity.getNormalPlugins();
+        return plugins.filter((plugin) => !plugin.isSingle || !this.exclude.has(plugin.value)).sort();
+    },
+
+    selectButtonHandler: function(_, record, el, rowIndex, e) {
+        if (e.type === 'keydown' && (e.getKey() === Ext.event.Event.ENTER) || e.type === 'dblclick') {
+            this.fireEvent(
+                'select',
+                record.get('value')
+            );
+            this.close();
+        }
+    },
+
+    filter: function() {
+        this.grid.getStore().clearFilter();
+        const searchString = this.filterField.getValue();
+        const selectedTags = [];
+        this.tagButtons.forEach((b) => {
+            if (b.pressed) {
+                selectedTags.push(b.text);
+            }
+        });
+        this.grid.getStore().filterBy(function(record) {
+            for (let i = 0; i < selectedTags.length; i++) {
+                if (!record.get('tags') || record.get('tags').indexOf(selectedTags[i]) === -1) {
+                    return false;
+                }
+            }
+            return (record.get('value').toLowerCase().indexOf(searchString.toLowerCase()) !== -1);
+        }, this);
+    },
+
+    getTagsButtons: function(tags) {
+        const tagButtons = [];
+        for (let i = 0; i < tags.length; i++) {
+            tagButtons.push(Ext.create({
+                xtype: 'button',
+                text: tags[i],
+                ui: 'blue-text-button-border',
+                width: 170,
+                enableToggle: true,
+                focusable: false,
+                handler: this.filter.bind(this),
+            }));
+        }
+        return tagButtons;
+    },
+
+    getTags: function(pluginsData) {
+        pluginsData = pluginsData || [];
+        let tagsMap = new Map();
+        for (let i = 0; i < pluginsData.length; i++) {
+            if (pluginsData[i].tags) {
+                pluginsData[i].tags.forEach((tag) => {
+                    tagsMap.set(tag, tagsMap.get(tag) ? tagsMap.get(tag) + 1 : 1);
+                });
+            }
+        }
+
+        tagsMap = new Map([...tagsMap.entries()].sort(
+            (a, b) => {
+                return (b[1] - a[1] === 0) ? (a[0].localeCompare(b[0])) : (b[1] - a[1]);
+            }
+        ));
+        const sortedTags = Array.from(tagsMap, function(entry) {
+            return entry[0];
+        });
+        return sortedTags;
+    },
+});

package/src/report/component/settings/plugin/ReportFormPluginGrid.js

@@ -14,6 +14,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
         'Coon.common.field.IDField'
     ],
     controller: 'reportformplugingridcontroller',
+    autoGenerateUiElementId: true,
     loadMask: true,
     stripeRows: true,
     twoWayBindable: ['data'],
@@ -94,8 +95,25 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
         ],
     }],
     columns: [
+        {
+            xtype: 'actioncolumn',
+            width: 50,
+            items: [
+                {
+                    iconCls: 'fa fa-cog',
+                    tooltip: 'Настройка',
+                    handler() {
+                        Ext.create({
+                            xtype: 'ReportFormPluginSettings',
+                            selection: Array.from(arguments)[5],
+                        });
+                    },
+                }
+            ],
+        },
         {
             dataIndex: 'xtype',
+            hidden: true,
             header: '',
             width: 60,
             sortable: false,
@@ -120,7 +138,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
             renderer(v, metaData) {
                 if (Coon.report.ReportEntity.isAliasExist(v)) {
                     return v && v.split('').map((char) => {
-                        return Coon.util.isUpperLetter(char) ? `<span style="font-weight:bold;color: brown">${char}</span>` : char;
+                        return Coon.util.isUpperLetter(char) ? `<span style='font-weight:bold;color: brown'>${char}</span>` : char;
                     }).join('');
                 } else {
                     metaData.tdStyle = 'color:red;';
@@ -137,21 +155,14 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
             sortable: false,
             tooltip: 'разрешенные символы: a-zA_Z0-9_-.',
             flex: 0.35,
+            hidden: true,
             editor: {
                 xtype: 'IDField',
                 allowBlank: false,
                 triggers: {
                     autoGenerateUiElement: {
                         cls: 'x-fa fa-magic',
-                        handler(editorField) {
-                            const record = editorField.up('grid').selection;
-                            if (record) {
-                                const prefix = record.get('xtype').split('').filter(Coon.util.isUpperLetter).join('');
-                                editorField.setValue(prefix + '-' + Date.now().toString());
-                            } else {
-                                editorField.setValue(Date.now().toString());
-                            }
-                        },
+                        handler: 'autoGenerateUiElementHandler',
                     },
                     resetUiElement: {
                         cls: 'x-fa fa-times',
@@ -167,9 +178,6 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
                     },
                 },
             },
-            bind: {
-                hidden: '{formEditor}',
-            },
         },
         {
             header: 'Тип',
@@ -189,10 +197,10 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGrid', {
             renderer: function(v, _, rec) {
                 if (!v) {
                     return `
-                        <div data-qtip="плагин не активен, для активации укажите тип" style="text-align:center;color: brown;font-size: 0.9em;">
-                            <span class="x-fa fa-exclamation" />
+                        <div data-qtip='плагин не активен, для активации укажите тип' style='text-align:center;color: brown;font-size: 0.9em;'>
+                            <span class='x-fa fa-exclamation' />
                             плагин не активен
-                            <span class="x-fa fa-exclamation" />
+                            <span class='x-fa fa-exclamation' />
                         </div>
                         
                     `;

package/src/report/component/settings/plugin/ReportFormPluginGridController.js

@@ -19,8 +19,8 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
         const initialText = deleteButton.initialConfig.text;
         deleteButton.setDisabled(Ext.isEmpty(selection));
         this.lookup('cloneButton').setDisabled(Ext.isEmpty(selection));
-        deleteButton.setText(!Ext.isEmpty(selection)?
-            (selection[0].get('isDeleted')? 'Восстановить' : initialText) : initialText);
+        deleteButton.setText(!Ext.isEmpty(selection) ?
+            (selection[0].get('isDeleted') ? 'Восстановить' : initialText) : initialText);
     },
 
     addHandler: function(xtype) {
@@ -32,9 +32,12 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
         data['jsonProperties'] = [];
         data['xtype'] = xtype;
         data['sequenceNumber'] = this.getNextIDSeq();
+        if (view.autoGenerateUiElementId) {
+            data['uiElement'] = this.generateUiElementId(data);
+        }
         view.getStore().add(data);
         view.publishState('data', view.getData());
-        view.getSelectionModel().select(view.getStore().getCount() -1);
+        view.getSelectionModel().select(view.getStore().getCount() - 1);
     },
     createPluginSelectWindow: function() {
         const view = this.getView();
@@ -110,7 +113,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
                 view.getStore().remove(record);
             } else {
                 record.set('isDeleted', !record.get('isDeleted'));
-                deleteButton.setText(record.get('isDeleted')? 'Восстановить' : initialText);
+                deleteButton.setText(record.get('isDeleted') ? 'Восстановить' : initialText);
             }
             view.publishState('data', view.getData());
         }
@@ -125,10 +128,11 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
         data['uiElement'] = '';
         data['sortSequence'] = this.getNextSeq();
         data['sequenceNumber'] = this.getNextIDSeq();
-        if (data) {
-            view.getStore().add(data);
-            view.publishState('data', view.getData());
+        if (view.autoGenerateUiElementId) {
+            data['uiElement'] = this.generateUiElementId(data);
         }
+        view.getStore().add(data);
+        view.publishState('data', view.getData());
     },
 
     beforeCellEditHandler: function(cellEditingPlugin, cellContext) {
@@ -292,5 +296,18 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
             },
         });
     },
-
+    autoGenerateUiElementHandler(editorField) {
+        const record = editorField.up('grid').selection;
+        record && editorField.setValue(this.generateUiElementId(record.getData()));
+    },
+    generateUiElementId: function(data) {
+        const {xtype} = data;
+        const reportId = this.getViewModel().get('report.reportId');
+        const pluginClass = Ext.ClassManager.getByAlias('plugin.' + xtype);
+        let id;
+        if (pluginClass && typeof pluginClass.getPluginId === 'function') {
+            id = pluginClass.getPluginId();
+        }
+        return [reportId, xtype, id || Date.now()].join('_');
+    },
 });

package/src/report/component/settings/plugin/ReportFormPluginPanel.js

@@ -27,11 +27,13 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanel', {
             style: 'margin-right: 8px;',
             bodyPadding: 8,
             reference: 'paramPanel',
-            title: 'Параметры плагина',
             region: 'center',
             flex: 1,
             split: true,
             layout: 'fit',
+            bind: {
+                title: 'Параметры плагина {pluginsGrid.selection.xtype}: {pluginsGrid.selection.uiElement}',
+            },
         }
     ],
 });