ru.coon 2.7.11 → 2.7.13

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 2.7.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2a509ebbdf7d3ddd07faaf3a42f0ef759a31cc4)
+* ## Fixes
+* <span style='color:red'>fix report property editor</span> ([ba33a6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ba33a6f5379601e92e243ee8f971fc5811ac648f))
+
+* update: CHANGELOG.md ([52e5a1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/52e5a14c22b9cf57be5d97fc73d81adfcd2c53f1))
+
+# Version 2.7.12, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0f357b6b648867b16809b8dc164e2dcdf023eac)
+* ## Features
+* <span style='color:green'>feat: HT-8422: make plugin</span> ([c0f288], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0f28814e230b079799bb7091ccfc6a4985027d7))
+* <span style='color:green'>feat: HT-8422: make plugin</span> ([3a716f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3a716f1e031351cc9cb7e824dd547bb26a209d8a))
+* <span style='color:green'>feat: HT-8422: make plugin</span> ([dfee6a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dfee6a538ab0930e3a6768024dd1cc3d680f379e))
+
+* upd ([20702b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20702be763b8d49e5844a472789d013fca40708b))
+* HT-8467 fix: Проверка наличия плагина перед использованием его методов. ([e531df], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e531df48524bc9ccef92c62463eea5d114f3a9cf))
+* update: CHANGELOG.md ([6a43ba], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6a43ba46583e65e72523c1b6f28c46049d02e372))
+
 # Version 2.7.11, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/df21c0308ab8f5fdc70b103cdc158aaa72a9b979)
 * BFL-12079 fix: Присваивание defaultValue до того как загрузится store в SimplestReportCombo в FilterPanel ([b5dbb5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b5dbb5c2b113b183124411080593e05878adff87))
 * BFL-12079 fix: Присваивание defaultValue до того как загрузится store в SimplestReportCombo в FilterPanel ([52df37], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/52df37900c87c581f0bf641cf1a46bb8ec064964))
@@ -12,6 +28,7 @@
 
 # Version 2.7.9, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b687fd4d4c5294233d74ca8f6b87c7448891da77)
 * ## Features
+* <span style='color:green'>feat: HT-8422: make plugin</span> ([47d667], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/47d667d764ed1bde1fc31aaa0e7510e42511bff6))
 * <span style='color:green'>feat: HT-7823: set max width picker width 600 px</span> ([001228], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/00122840bb50e6895a72e8a3b3cd8acfbccb3c94))
 
 * ## Fixes

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.7.11",
+  "version": "2.7.13",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/common/component/formeditor/UiCFCardsGrid.js

@@ -25,7 +25,7 @@ Ext.define('Coon.common.component.formeditor.UiCFCardsGrid', {
             this.getViewModel().getStore('cardsStore').add({itemId: 'UiCFCard_' + Ext.id().replace('-', '_')});
         },
         deleteRow() {
-            this.getViewModel().getStore('cardsStore').remove(this.getViewModel().get('selection'));
+            this.getViewModel().getStore('cardsStore').remove(this.getView().getSelectionModel().getSelection());
         },
     },
     viewModel: {
@@ -66,4 +66,15 @@ Ext.define('Coon.common.component.formeditor.UiCFCardsGrid', {
     plugins: [
         {ptype: 'cellediting'}
     ],
+    selModel: {
+        selType: 'rowmodel',
+        mode: 'MULTI',
+    },
+    viewConfig: {
+        plugins: {
+            gridviewdragdrop: {
+                dragText: 'Перетащите что бы упорядочить',
+            },
+        },
+    },
 });

package/src/common/component/formeditor/UiCFCell.js

@@ -3,6 +3,7 @@ Ext.define('Coon.common.component.formeditor.UiCFCell', {
     extend: 'Ext.container.Container',
     controller: 'UiCFCellController',
     xtype: 'UiCFCell',
+    cls: 'UiCFCell',
     flex: 200,
     collapsible: true,
     margin: 5,

package/src/common/component/formeditor/UiCFCellController.js

@@ -169,17 +169,27 @@ Ext.define('Coon.common.component.formeditor.UiCFCellController', {
         if (this.readOnly) {
             return;
         }
-        const contextMenu = new Ext.menu.Menu({
-            closeAction: 'destroy',
-            items: this.getMenuItems(),
-            listeners: {
-                hide: function() {
-                    const me = this;
-                    Ext.defer(() => me.destroy(), 2000);
+        const doForm = () => {
+            const contextMenu = new Ext.menu.Menu({
+                closeAction: 'destroy',
+                items: this.getMenuItems(),
+                listeners: {
+                    hide: function() {
+                        const me = this;
+                        Ext.defer(() => me.destroy(), 2000);
+                    },
                 },
-            },
-        });
-        contextMenu.showAt(event.pageX, event.pageY);
+            });
+            contextMenu.showAt(event.pageX, event.pageY);
+        };
+        if (!Coon.UiCFFieldsConfig.menuIsLoaded) {
+            Coon.UiCFFieldsConfig.getMenuCfgFromStorage().then((data) => {
+                doForm();
+            });
+        } else {
+            doForm();
+        }
+
         event.preventDefault();
         return false;
     },

package/src/common/component/formeditor/UiCFConfigEditorWindow.js

@@ -0,0 +1,213 @@
+/* global Ext */
+Ext.define('Coon.common.component.formeditor.UiCFConfigEditorWindow', {
+    extend: 'Ext.window.Window',
+    controller: 'UiCFConfigEditorWindowController',
+    xtype: 'UiCFConfigEditorWindow',
+    layout: {
+        type: 'hbox',
+        align: 'stretch',
+    },
+    modal: true,
+    title: 'Редактирование конфига полей',
+    maximized: true,
+    buttons: [
+        {
+            text: 'Отмена',
+            handler: 'closeWindow',
+        },
+        {
+            text: 'Применить',
+            ui: 'orange-button',
+            handler: 'applyValues',
+        }
+    ],
+    viewModel: {
+        data: {
+            mainStoreSelection: null,
+            treeRowSelection: null,
+            ownPropertiesStoreSelection: null,
+            linter: {errors: null},
+        },
+        stores: {
+            mainStore: {
+                type: 'json',
+                fields: ['name', 'description', 'cfg', 'ownProperties'],
+                data: [],
+            },
+            ownPropertiesStore: {
+                type: 'json',
+                fields: ['name', 'value'],
+                data: [],
+            },
+            typeStore: {
+                type: 'json',
+                data: [{key: 'text'}, {key: 'int'}, {key: 'bool'}, {key: 'date'}, {key: 'dateFormat'},
+                    {key: 'timeFormat'}, {key: 'timeTextFormat'}, {key: 'reportsList'}, {key: 'html'},
+                    {key: 'cards'}, {key: 'radio'}, {key: 'segmented'}, {key: 'allowedExtensions'}, {key: 'reportField'}],
+                fields: ['key'],
+            },
+            menuStore: {
+                type: 'tree',
+                root: {
+                    expanded: true,
+                    text: 'Структура меню',
+                    fields: ['text'],
+                    children: [
+                        {
+                            text: '11',
+                            leaf: true,
+                            checked: false,
+                        },
+                        {
+                            text: '22',
+                            leaf: true,
+                            checked: true,
+                        }
+                    ],
+                },
+            },
+        },
+    },
+    items: [
+        {
+            xtype: 'grid',
+            title: 'Поля',
+            reference: 'mainGrid',
+            flex: 1,
+            tbar: [
+                {
+                    text: 'Добавить',
+                    handler: 'addRowMain',
+                },
+                {
+                    text: 'Удалить',
+                    handler: 'deleteRow',
+                    bind: {
+                        disabled: '{!mainStoreSelection}',
+                    },
+                }
+            ],
+            listeners: {
+                beforeselect: 'onBeforeSelectMain',
+            },
+            bind: {
+                store: '{mainStore}',
+                selection: '{mainStoreSelection}',
+            },
+            columns: [
+                {dataIndex: 'name', text: 'xtype', flex: 1, editor: {xtype: 'textfield'}},
+                {dataIndex: 'description', text: 'Наименование', flex: 1, editor: {xtype: 'textfield'}}
+            ],
+            plugins: [
+                {ptype: 'cellediting'}
+            ],
+        },
+        {
+            xtype: 'panel',
+            flex: 3,
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'panel',
+                    layout: {
+                        type: 'hbox',
+                        align: 'stretch',
+                    },
+                    flex: 1,
+                    items: [
+                        {
+                            xtype: 'grid',
+                            reference: 'privateGrid',
+                            title: 'Приватные свойства',
+                            width: 250,
+                            tbar: [
+                                {
+                                    text: 'Добавить',
+                                    handler: 'addRow',
+                                },
+                                {
+                                    text: 'Удалить',
+                                    handler: 'deleteRow',
+                                    bind: {
+                                        disabled: '{!ownPropertiesStoreSelection}',
+                                    },
+                                }
+                            ],
+                            listeners: {
+                                beforeselect: 'onBeforeSelectOwnProperties',
+                            },
+                            bind: {
+                                store: '{ownPropertiesStore}',
+                                selection: '{ownPropertiesStoreSelection}',
+                                disabled: '{!mainStoreSelection}',
+                            },
+                            columns: [
+                                {dataIndex: 'name', text: 'Property', flex: 1, editor: {xtype: 'textfield'}}
+                            ],
+                            plugins: [
+                                {ptype: 'cellediting'}
+                            ],
+                        },
+                        {
+                            flex: 1,
+                            bind: {
+                                disabled: '{!ownPropertiesStoreSelection}',
+                            },
+                            xtype: 'form',
+                            reference: 'ownPropertiesCfgForm',
+                            layout: 'form',
+                            items: [
+                                {xtype: 'textfield', flex: 1, allowBlank: false, fieldLabel: 'Наименование', name: 'description'},
+                                {
+                                    xtype: 'combo',
+                                    allowBlank: false,
+                                    bind: {
+                                        store: '{typeStore}',
+                                    },
+                                    queryMode: 'local',
+                                    displayField: 'key',
+                                    valueField: 'key', flex: 1, fieldLabel: 'Тип данных', name: 'type',
+                                },
+                                {xtype: 'textfield', flex: 2, fieldLabel: 'Описание', name: 'text'}
+                            ],
+                        }
+                    ],
+                },
+                {
+                    xtype: 'panel',
+                    flex: 1,
+                    layout: {
+                        type: 'hbox',
+                        align: 'stretch',
+                    },
+                    items: [
+                        {
+                            title: 'Дополнительная конфигурация',
+                            flex: 1,
+                            layout: 'fit',
+                            items: [
+                                {
+                                    xtype: 'UiAceEditor',
+                                    useLinter: true,
+
+                                    width: '100%',
+
+                                    bind: {
+                                        disabled: '{!mainStoreSelection}',
+                                    },
+                                    listeners: {
+                                        editorchange: 'onChangeAce',
+                                    },
+                                    reference: 'cfgPanel',
+                                }
+                            ],
+                        }
+                    ],
+                }
+            ],
+        }
+    ],
+});

package/src/common/component/formeditor/UiCFConfigEditorWindowController.js

@@ -0,0 +1,191 @@
+Ext.define('Coon.common.component.formeditor.UiCFConfigEditorWindowController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.UiCFConfigEditorWindowController',
+    init: function(view) {
+        const vm = this.getViewModel();
+        vm.bind('{mainStoreSelection}', 'onMainSelectionChange', this);
+        vm.bind('{ownPropertiesStoreSelection}', 'onOwnPropertiesStoreSelectionChange', this);
+
+        const doForm = () => {
+            vm.getStore('mainStore').loadData(Object.keys(Coon.UiCFFieldsConfig.UiCFFieldsConfig).map((key) => {
+                return Ext.apply(Coon.UiCFFieldsConfig.UiCFFieldsConfig[key], {'name': key});
+            }));
+        };
+        if (!Coon.UiCFFieldsConfig.settingsIsLoaded) {
+            Coon.UiCFFieldsConfig.getCfgFromStorage().then((data) => {
+                doForm();
+            });
+        } else {
+            doForm();
+        }
+    },
+    onOwnPropertiesStoreSelectionChange(record) {
+        const data = record && record.get('value') && Ext.isObject(record.get('value')) ? record.get('value'): {
+            'description': '',
+            'type': 'text',
+            'text': '',
+        };
+        const form = this.lookup('ownPropertiesCfgForm');
+        form.loadRecord(Ext.create('Ext.data.Model', Ext.apply({
+            fields: ['description', 'type', 'text'],
+        }, data)));
+        form.isValid();
+    },
+    onMainSelectionChange(record) {
+        let ownProperties = [];
+        let cfg = {};
+        if (record) {
+            const ownPropertiesRec = record.get('ownProperties');
+            if (Ext.isObject(ownPropertiesRec)) {
+                ownProperties = Object.keys(ownPropertiesRec).map((key) => {
+                    return {
+                        'name': key,
+                        'value': ownPropertiesRec[key],
+                    };
+                });
+            }
+            cfg = record.get('cfg') && Ext.isObject(record.get('cfg'))? record.get('cfg') : {};
+        }
+        this.lookup('cfgPanel').setValue(JSON5.stringify(cfg, undefined, 2));
+        this.getViewModel().getStore('ownPropertiesStore').loadData(ownProperties);
+    },
+    onChangeAce(ace) {
+        const cfgPanel = this.lookup('cfgPanel');
+        cfgPanel.doLint();
+    },
+    onBeforeSelectOwnProperties(model, selected) {
+        if (!model.selected.items[0]) {
+            return true;
+        }
+        return this.applyPrivateFormValues();
+    },
+    privateGridIsValid() {
+        const grid = this.lookup('privateGrid');
+        let gridValid = true;
+        if (!this.applyPrivateFormValues()) {
+            return false;
+        }
+        grid.getStore().getRange().forEach((rec) => {
+            if (!rec.get('name') || !/^[a-zA-Z]*$/.test(rec.get('name'))) {
+                gridValid = false;
+                Ext.Msg.show({
+                    title: 'Ошибка',
+                    message: 'Проверьте корректность заполнения Properties. Значениие может содержать только латинские символы',
+                    icon: Ext.Msg.ERROR,
+                    buttons: Ext.Msg.OK,
+                });
+                return false;
+            }
+        });
+        return gridValid;
+    },
+    applyMainGridValues() {
+        const privateGrid = this.lookup('privateGrid');
+        const mainGrid = this.lookup('mainGrid');
+        const record = mainGrid.getSelection()[0];
+        if (!this.privateGridIsValid()) {
+            return false;
+        }
+        const cfgPanel = this.lookup('cfgPanel');
+        if (!cfgPanel.isValid()) {
+            Ext.Msg.show({
+                title: 'Ошибка',
+                message: 'В дополнительной конфигурации есть ошибки',
+                icon: Ext.Msg.ERROR,
+                buttons: Ext.Msg.OK,
+            });
+            return false;
+        }
+        if (record) {
+            const obj = {};
+            privateGrid.getStore().getRange().forEach((rec) => {
+                obj[rec.get('name')] = rec.get('value');
+            });
+            record.set('ownProperties', obj);
+            record.set('cfg', JSON5.parse(cfgPanel.getValue()));
+        }
+        return true;
+    },
+    applyPrivateFormValues() {
+        const grid = this.lookup('privateGrid');
+        const form = this.lookup('ownPropertiesCfgForm');
+        const record = grid.getSelection()[0];
+        if (record) {
+            if (!form.isValid()) {
+                Ext.Msg.show({
+                    title: 'Ошибка',
+                    message: 'Проверьте корректность заполнения полей формы',
+                    icon: Ext.Msg.ERROR,
+                    buttons: Ext.Msg.OK,
+                });
+                return false;
+            }
+            record.set('value', this.lookup('ownPropertiesCfgForm').getValues());
+        }
+        return true;
+    },
+    mainGridIsValid() {
+        const grid = this.lookup('mainGrid');
+        let gridValid = true;
+        if (!this.applyMainGridValues()) {
+            return false;
+        }
+        grid.getStore().getRange().forEach((rec) => {
+            if (!rec.get('name') || !/^[a-zA-Z]*$/.test(rec.get('name')) || !rec.get('description')) {
+                gridValid = false;
+                Ext.Msg.show({
+                    title: 'Ошибка',
+                    message: 'Проверьте корректность заполнения полей. Значениие xtype может содержать только латинские символы, наименование' +
+                        'не может быть пустым',
+                    icon: Ext.Msg.ERROR,
+                    buttons: Ext.Msg.OK,
+                });
+                return false;
+            }
+        });
+        return gridValid;
+    },
+    onBeforeSelectMain(model, selected) {
+        if (!model.selected.items[0]) {
+            return true;
+        }
+        if (!this.applyMainGridValues()) {
+            return false;
+        }
+    },
+    addRow(button) {
+        button.up('grid').getStore().add({});
+    },
+    addRowMain(button) {
+        button.up('grid').getStore().add({'ownProperties': '{}', 'cfg': '{}'});
+    },
+    deleteRow(button) {
+        button.up('grid').getStore().remove(button.up('grid').getSelection()[0]);
+    },
+    closeWindow() {
+        this.getView().close();
+    },
+    applyValues() {
+        if (!this.mainGridIsValid()) {
+            return false;
+        }
+        const obj = {};
+        const grid = this.lookup('mainGrid');
+        grid.getStore().getRange().forEach((rec) => {
+            obj[rec.get('name')] = {
+                description: rec.get('description'),
+                cfg: rec.get('cfg') || {},
+                ownProperties: rec.get('ownProperties') || {},
+                userCfg: Coon.UiCFFieldsConfig.UiCFFieldsConfig[rec.get('name')] ?
+                    Coon.UiCFFieldsConfig.UiCFFieldsConfig[rec.get('name')]['userCfg'] : {},
+            };
+        });
+        this.getView().mask('Подождите, идет сохранение');
+        Coon.UiCFFieldsConfig.setCfgToStorage(obj).then(() => {
+            Coon.UiCFFieldsConfig.UiCFFieldsConfig = obj;
+            this.getView().unmask();
+            this.fireViewEvent('changesSaved');
+            this.closeWindow();
+        });
+    },
+});

package/src/common/component/formeditor/UiCFContainerController.js

@@ -70,18 +70,30 @@ Ext.define('Coon.common.component.formeditor.UiCFContainerController', {
         if (this.readOnly) {
             return;
         }
-        const menu = this.getMenuItems();
-        const contextMenu = new Ext.menu.Menu({
-            closeAction: 'destroy',
-            items: menu[0]['menu'],
-            listeners: {
-                hide: function() {
-                    const me = this;
-                    Ext.defer(() => me.destroy(), 2000);
-                },
-            },
-        });
-        contextMenu.showAt(event.pageX, event.pageY);
+        const doForm = () => {
+            const menu = this.getMenuItems();
+            const contextMenu = new Ext.menu.Menu({
+                closeAction: 'destroy',
+                collapsible: false,
+
+                items: menu[0]['menu'],
+                /* listeners: {
+                    hide: function() {
+                        const me = this;
+                        Ext.defer(() => me.destroy(), 2000);
+                    },
+                },*/
+            });
+            contextMenu.showAt(event.pageX, event.pageY);
+        };
+        if (!Coon.UiCFFieldsConfig.menuIsLoaded) {
+            Coon.UiCFFieldsConfig.getMenuCfgFromStorage().then((data) => {
+                doForm();
+            });
+        } else {
+            doForm();
+        }
+
         event.preventDefault();
         return false;
     },
@@ -191,17 +203,11 @@ Ext.define('Coon.common.component.formeditor.UiCFContainerController', {
         const menuItems = [
             {
                 text: 'добавить', iconCls: 'fa fa-plus',
-                menu: Coon.UiCFFieldsConfig.getFieldsTypes().map((item) => {
-                    return {
-                        text: item.description,
-                        iconCls: '',
-                        handler: () => {
-                            me.addRow(item.type, activeRow);
-                        },
-                    };
-                }),
+                menu: Coon.UiCFFieldsConfig.getMenuCfg(me, 'addRow', activeRow),
             }
         ];
+        // me.addRow(item.type, activeRow);
+
         const cnt = this.getUiCFEditorController();
         const cell = cnt.copyCell || cnt.cutCell;
         if (cell && cell.getView() && cell.getView().id !== this.getView().id) {