ru.coon 2.8.47 → 2.8.49

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 2.8.49, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ec11e7b7b820f1b1cb4623353bc6d1b43974f369)
+* ## Features
+* <span style='color:green'>feat: HT-11123: Обработка конфига компоненты вынесена из контроллера для получения конфига вложенного компонента до его инициализации</span> ([4f3f0d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f3f0d7a1fb29b5582c52e75912e5a12631bffde))
+
+* ## Fixes
+* <span style='color:red'>fix</span> ([f7ce88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f7ce88d8859e702af4521253068bda50df90c39b))
+
+* remove template 'beforeComplete' ([e746ea], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e746ea99a3adbb1b0b5e6eadac6068e1250a567a))
+* update: CHANGELOG.md ([58846f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/58846fbc62873ca4c56f685e85420bad0e56652b))
+
+# Version 2.8.48, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/201d12dfc121f4045867a23b2d92f9fe252191cf)
+* ## Fixes
+* <span style='color:red'>fix afterlayout -> afterlayoutanimation</span> ([4c5351], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4c535139895c0622dbacf836c5fc81b2d0d95727))
+
+* update: CHANGELOG.md ([c0d9e3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0d9e3e6975abd06fe70dfa62f1b84cb82fb2561))
+
 # Version 2.8.47, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5517082c79a0635a115fa036d9b16f6c3d973858)
 * ## Fixes
 * <span style='color:red'>fix ace version</span> ([4053a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4053a550fe3a2f49af198e6f44eff7c0a80d8b15))
@@ -111,16 +127,24 @@ remove unusual alternateClassName</span> ([7427bf], [link](http://gitlab-dbr.sig
 * <span style='color:red'>fix mode in booleaniconcolumn</span> ([5e360d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5e360d5194ee371e8f98a80e805c6385adefb766))
 * <span style='color:red'>fix xtype booleaniconcolumn</span> ([d02e5f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d02e5f191336db50627339b44ab5a4c55ea8aaac))
 
+* BFL-17254 рефактор типа сохранения userPropStorage ([d1ae82], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d1ae82d2d5d856da5dc04cb9cc64c5fbbd1c84b1))
+* BFL-17254 Улучшение читаемости алгоритма ([11aa89], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/11aa89bb7c27efd2593a6be5444fa45a03522f54))
+* исправление опечатки ([e57a17], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e57a171eddfc5f3615ce17f9f3f0708764ed7644))
+* исправление замечаний ([0ee5a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ee5a8addd7a5630f29a706fdc7b7535a06d71c2))
+* upd ([934879], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/93487925e08f8639bb474e19f5a9056a72bf6fad))
 * update: CHANGELOG.md ([f65bf5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f65bf563dbeb9d18d6330ee6db7bab486ba5ced9))
 
 # Version 2.8.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/396f1c8296522012f1f98d8dd7a0bb9296b990e0)
 * ## Features
+* <span style='color:green'>feat: запись при поиске параметров репорта, имеющих настройку автоподскановки</span> ([21b6c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/21b6c3cd5bafe96663842f117614df370b7fde34))
+* <span style='color:green'>feat: добавлен extraProps в параметры репорта</span> ([f6bfb8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f6bfb8e3d4bad8f9f1f3683414c7d98a61396c68))
 * <span style='color:green'>feat: [ReportPanel] htmlEncode tooltip. Closes NEVA-665.</span> ([7a95ab], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7a95ab2b56300ee0fcd4e2af1e3a2e491b42df12))
 * <span style='color:green'>feat: [ReportPanel] Добавлены tooltip на группы столбцов таблицы. Closes NEVA-665.</span> ([b19f87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b19f87c6fc5f1825da39249a96042bb297493a3b))
 * <span style='color:green'>feat new status icon</span> ([40a654], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/40a6541c23af2f7955b46d5181c4ec1bea7e7fe6))
 
 * ## Fixes
 * <span style='color:red'>fix condition</span> ([d16526], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d165266b8c349fbfbd250b12b6b39d5fa237d2f2))
+* <span style='color:red'> редактирование поля параметров репорта по двойному клику</span> ([f28ac1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f28ac1cbe0a9192838840b0882acb2eb7009d511))
 
 * HT-10932 Исправление применения настроек чекбокса в SetSingleParameterPlugin ([a619ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a619eccc567f07cf3c131529dd75de3f0d7e9ed8))
 * HT-10676 Доработка проверки корректности расположения плагина BindCustomPanelPlugin ([c48842], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c48842c7c39c3908f1d98ca4b0b84c7b829470cb))

package/package.json

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

package/src/app/Router.js

@@ -69,7 +69,7 @@ Ext.define('Coon.app.Router', {
         });
     },
     getRouterView() {
-        return Ext.ComponentQuery.query('centerview').shift();
+        return Ext.ComponentQuery.query('centerview')[0];
     },
     getActiveComponent() {
         const routerView = this.getRouterView();

package/src/app/viewPort/CenterViewController.js

@@ -37,6 +37,7 @@ Ext.define('Coon.app.viewPort.CenterViewController', {
                 }
             }
         },
+
         onRenderEditor(editor, id) {
             const c = editor.getController();
             typeof c.doInit === 'function' && c.doInit.call(c, id);

package/src/common/UserPropStorage.js

@@ -0,0 +1,105 @@
+/**
+ * Сохранение параметров пользователя по ключу:
+ *      component:componentId:module:key
+ *
+ * Сохранение происходит в зависимости от saveType:
+ *      localStorage (saveType = 'ls')
+ *      сервер (saveType = 'server')
+ **/
+Ext.define('Coon.common.UserPropStorage', {
+    component: undefined,
+    componentId: undefined,
+    module: undefined,
+    propList: undefined,
+    saveType: undefined,
+
+    constructor(config) {
+        Ext.apply(this, config);
+    },
+
+    saveProps(allProps) {
+        const saveProp = {};
+        this.propList.forEach((prop) => {
+            saveProp[prop] = allProps[prop];
+        });
+        switch (this.saveType) {
+        case 'ls':
+            return this.savePropsToLocalStorage(saveProp);
+        case 'server':
+            return this.savePropsToServer(saveProp);
+        }
+    },
+
+    deleteProps(props) {
+        switch (this.saveType) {
+        case 'ls':
+            return this.deletePropsFromLocalStorage(props || this.propList);
+        case 'server':
+            return this.deletePropsFromServer(props || this.propList);
+        }
+    },
+
+    getSavedProps() {
+        const currentKey = this.getCurrentKey();
+        switch (this.saveType) {
+        case 'ls':
+            const savedProps = Object.entries(localStorage)
+                .filter(([key]) => key.includes(currentKey));
+            return this.getDecodedValues(savedProps, currentKey);
+        case 'server':
+            // TODO: replace command
+            return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', {key: currentKey})
+                .then((data) => {
+                    return this.getDecodedValues(data, currentKey);
+                });
+        }
+    },
+
+    getDecodedValues(data, currentKey) {
+        return data.reduce((acc, [key, value]) => {
+            acc[key.replace(currentKey + ':', '')] = Ext.decode(value);
+            return acc;
+        }, {});
+    },
+
+    savePropsToLocalStorage(props) {
+        for (const [key, value] of Object.entries(props)) {
+            const propKey = this.getKey(key);
+            this.saveToLocalStorage(propKey, value);
+        }
+    },
+
+    savePropsToServer(props) {
+        let saveProps;
+        for (const [key, value] of Object.entries(props)) {
+            const propKey = this.getKey(key);
+            saveProps[propKey] = value;
+        }
+        // TODO: replace command
+        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', {props: saveProps});
+    },
+
+    deletePropsFromLocalStorage(props) {
+        props.forEach((key) => {
+            localStorage.removeItem(this.getKey(key));
+        });
+    },
+
+    deletePropsFromServer(props) {
+        const deleteKeys = props.map((key) => this.getKey(key));
+        // TODO: replace command
+        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', {keys: deleteKeys});
+    },
+
+    getCurrentKey() {
+        return `${this.component}:${this.componentId}:${this.module}`;
+    },
+
+    getKey(key) {
+        return `${this.getCurrentKey()}:${key}`;
+    },
+
+    saveToLocalStorage(key, value) {
+        localStorage.setItem(key, Ext.encode(value));
+    },
+});

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

@@ -13,4 +13,22 @@ Ext.define('Coon.common.component.formeditor.UiCFCell', {
     listeners: {
         beforeadd: 'onBeforeAdd',
     },
+    initComponent: function() {
+        const component = this.items[0];
+        if (component) {
+            if (component.rawCfg) {
+                Object.keys(component.rawCfg).forEach((key) => {
+                    const value = component.rawCfg[key]+'';
+                    if (value && Coon.format.startsWith(value, 'function')) {
+                        try {
+                            component[key] = eval('(' + value + ')').call(component);
+                        } catch (e) {
+                            Coon.log.error(`[UiCFCell] for property:${key} & value:${value}, error: ${e}`);
+                        }
+                    }
+                });
+            }
+        }
+        this.callParent();
+    },
 });

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

@@ -5,25 +5,10 @@ Ext.define('Coon.common.component.formeditor.UiCFCellController', {
     oldWidth: 0,
     minCellWidth: 150,
     readOnly: false,
-    init: function() {
+    init: function(cfg) {
         this.setDefaultMenuItems();
         this.initMouseEvents();
     },
-    onBeforeAdd(cell, component, index, eOpts) {
-        // console.log(component);
-        if (component.initialConfig.rawCfg) {
-            Object.keys(component.initialConfig.rawCfg).forEach((key) => {
-                const value = component.initialConfig.rawCfg[key]+'';
-                if (value && Coon.format.startsWith(value, 'function')) {
-                    try {
-                        component[key] = eval('(' + value + ')').call(component);
-                    } catch (e) {
-                        Coon.log.error(`[UiCFCellController] for property:${key} & value:${value}, error: ${e}`);
-                    }
-                }
-            });
-        }
-    },
     setDefaultMenuItems() {
         const rowCnt = this.getUiCFRowController();
         this.menuItems = {

package/src/report/component/ReportPanel.js

@@ -28,6 +28,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         'Coon.report.plugin.grid.GridContextPlugin',
         'Coon.report.command.LoadDynamicReportCommand',
         'Coon.common.plugin.*',
+        'Coon.common.UserPropStorage',
         'Ext.button.Button',
         'Ext.container.Container',
         'Ext.grid.feature.Grouping',
@@ -605,10 +606,36 @@ Ext.define('Coon.report.component.ReportPanel', {
             this.isConfigured = true;
             this.fireEvent('configured', response, this);
             this.grid.fireEvent('configured', response, this);
+            this.initUserPropStorage(response.parameters);
         }, this);
         command.execute(this.reportId);
     },
 
+    async initUserPropStorage(parameters) {
+        if (!parameters) {
+            return;
+        }
+        const saveParamList = parameters
+            .filter((param) => param.properties.saveLastUsedValue)
+            .map((param) => param.reportParameterCd);
+
+        const userParamStorage = Ext.create('Coon.common.UserPropStorage', {
+            component: 'report',
+            componentId: this.reportId,
+            module: 'reportParameter',
+            propList: saveParamList,
+            saveType: 'ls',
+        });
+        this.northPanel.on('filterhandlerevent', userParamStorage.saveProps, userParamStorage);
+        this.northPanel.clearButton.on('click', function() {
+            userParamStorage.deleteProps();
+        });
+        const savedProps = await userParamStorage.getSavedProps();
+        if (savedProps) {
+            this.fillFilter(true, savedProps);
+        }
+    },
+
     /* checkPluginsCompatibility: function(plugins) {
         if (this.hideFilterPanel) {
             return plugins.filter((plugin) => plugin.uiElement.xtype !== 'ReportGroupsFieldValidationPlugin');
@@ -1033,7 +1060,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             this.grid.clear();
             this.currentParamList = this.northPanel.collectParams();
             this.filtered = true;
-            this.northPanel.fireEvent('filterhandlerevent');
+            this.northPanel.fireEvent('filterhandlerevent', Object.assign({}, this.currentParamList));
             this.beforeCommandExecuter(this.beforeApplyFilterCommand(this), [this.currentParamList], function() {
                 this.loadData(this.currentParamList, typeof invalidateCache === 'boolean' && invalidateCache);
             });

package/src/report/component/reportpanel/NorthPanel.js

@@ -191,7 +191,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         }, this);
 
         this.filterContainer.removeAll();
-        filterPanel.on('afterlayout', function(cmp) {
+        filterPanel.on('afterlayoutanimation', function(cmp) {
             this.recalculateHeight(cmp.getHeight());
         }, this, {single: true});
         this.filterContainer.add(filterPanel);

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

@@ -0,0 +1,123 @@
+Ext.define('Coon.report.component.settings.ReportParametersExtraPropsGrid', {
+    extend: 'Ext.grid.Panel',
+    alias: 'widget.ReportParametersExtraPropsGrid',
+    title: 'Дополнительные свойства',
+
+    controller: {
+
+        mainRecord: null,
+
+        init: function() {
+            this.parameterPropertiesGrid = this.getView().parameterPropertiesGrid;
+            this.parametersGrid = this.getView().parametersGrid;
+            this.parameterPropertiesGrid.getStore().on('datachanged', this.loadData, this);
+            this.initLoad();
+        },
+
+        initLoad() {
+            this.defaultProps = {
+                'общее свойство': [
+                    {
+                        name: 'saveLastUsedValue',
+                        description: 'Сохраняет значение параметра после поиска, и подставляет их при повторном открытии.',
+                        type: 'boolean',
+                        fields: 'all',
+                        value: 'true',
+                    }
+                ],
+            };
+            this.loadData();
+        },
+
+        loadData: function() {
+            this.getView().hide();
+            this.getViewModel().getStore('mainStore').removeAll();
+            const selection = this.parametersGrid.getSelectionModel().getSelection();
+            const mainRecord = selection.length > 0 ? selection[0] : null;
+            if (!mainRecord) {
+                return;
+            }
+            const data = [];
+            const propertySet = this.parameterPropertiesGrid.getStore().getRange().reduce((acc, item) => {
+                if (!item.get('isDeleted')) {
+                    acc.add(item.get('key'));
+                }
+                return acc;
+            }, new Set());
+            Object.keys(this.defaultProps).forEach((key) => {
+                this.defaultProps[key].forEach((config) => {
+                    if (propertySet.has(config.name)) {
+                        return;
+                    }
+                    if (config.fields === 'all' || !config.fields) {
+                        config['plugin'] = key;
+                        data.push(config);
+                    }
+                    if (Ext.isArray(config.fields) && config.fields.includes(mainRecord.get('reportFieldCd'))) {
+                        config['plugin'] = key;
+                        data.push(config);
+                    }
+                });
+            });
+            this.getViewModel().getStore('mainStore').loadData(data);
+            this.getView().setHidden(!data.length);
+        },
+
+        addHandler: function(grid, rowIndex, colIndex) {
+            const rec = grid.getStore().getAt(rowIndex);
+            const parameterPropertiesGrid = this.parameterPropertiesGrid;
+            const usedProp = parameterPropertiesGrid
+                .getStore()
+                .getRange()
+                .filter((record) => record.get('key') === rec.get('name') && record.get('isDeleted') === true);
+            if (usedProp.length) {
+                usedProp.forEach((item) => item.set('isDeleted', false));
+            } else {
+                parameterPropertiesGrid.getStore().add({
+                    sequenceNumber: parameterPropertiesGrid.getController().generateSequenceNumber(),
+                    key: rec.get('name'),
+                    value: rec.get('value') || '',
+                    isDeleted: false,
+                    isNew: true,
+                });
+            }
+            parameterPropertiesGrid.getController().updateProperties();
+        },
+    },
+
+    viewModel: {
+        stores: {
+            mainStore: {
+                type: 'json',
+                data: [],
+            },
+        },
+    },
+
+    bind: {
+        store: '{mainStore}',
+    },
+
+    columns: {
+        defaults: {
+            xtype: 'hintColumn',
+        },
+        items: [
+            {text: 'Плагин', dataIndex: 'plugin', flex: 1},
+            {text: 'Наименование', dataIndex: 'name', flex: 1},
+            {text: 'Описание', dataIndex: 'description', flex: 3},
+            {text: 'Тип', dataIndex: 'type', flex: 1},
+            {
+                width: 40,
+                xtype: 'actioncolumn',
+                items: [
+                    {
+                        iconCls: 'x-fa fa-plus',
+                        tooltip: 'Добавить',
+                        handler: 'addHandler',
+                    }
+                ],
+            }
+        ],
+    },
+});

package/src/report/component/settings/parameter/ReportFormParameterEditPanel.js

@@ -4,7 +4,8 @@ Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPane
     alternateClassName: 'Sigma.component.report.settings.ReportFormParameterEditPanel',
     requires: [
         'Coon.report.component.settings.ReportFieldPropertiesGrid',
-        'Coon.report.component.settings.parameter.ReportFormParametersGrid'
+        'Coon.report.component.settings.parameter.ReportFormParametersGrid',
+        'Coon.report.component.settings.ReportParametersExtraPropsGrid'
     ],
     controller: 'reportformparametereditpanelcontroller',
     frame: true,
@@ -31,17 +32,29 @@ Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPane
                     },
                 },
                 {
-                    xtype: 'ReportPropertiesGrid',
+                    xtype: 'panel',
+                    reference: 'parametersPropsPanel',
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                    },
+                    flex: 1,
+                    region: 'east',
                     width: 500,
                     scrollable: true,
                     split: true,
                     frame: false,
-                    region: 'east',
-                    reference: 'parameterProperties',
-                    bind: {
-                        enableAddProps: '{enableAddParamProps}',
-                        data: '{parametersGrid.selection.properties}',
-                    },
+                    items: [
+                        {
+                            xtype: 'ReportPropertiesGrid',
+                            flex: 2,
+                            reference: 'parameterProperties',
+                            bind: {
+                                enableAddProps: '{enableAddParamProps}',
+                                data: '{parametersGrid.selection.properties}',
+                            },
+                        }
+                    ],
                 }
             ],
         },
@@ -60,5 +73,17 @@ Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPane
             }],
         }
     ],
+
+    initComponent() {
+        this.callParent();
+        const parametersPropsPanel = this.lookup('parametersPropsPanel');
+        parametersPropsPanel.add({
+            xtype: 'ReportParametersExtraPropsGrid',
+            flex: 1,
+            title: 'extraProps',
+            parameterPropertiesGrid: this.lookup('parameterProperties'),
+            parametersGrid: this.lookup('parametersGrid'),
+        });
+    },
 });
 

package/src/report/component/settings/parameter/ReportFormParametersGrid.js

@@ -231,7 +231,7 @@ Ext.define('Coon.report.component.settings.parameter.ReportFormParametersGrid',
         ],
     },
     plugins: [
-        {ptype: 'rowediting', clicksToEdit: 1}
+        {ptype: 'rowediting', clicksToEdit: 2}
         // {ptype: 'gridexporter'}
     ],
 });

package/src/uielement/UiCPEntity.js

@@ -19,6 +19,7 @@ Ext.define('Coon.uielement.UiCPEntity', {
     constructor: function(config) {
         this.mixins.observable.constructor.call(this, config);
     },
+
     loadJSON5(str) {
         try {
             this.ui = JSON5.parse(str);

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.8.47',
+    number: '2.8.49',
 });