ru.coon 3.0.5 → 3.0.6

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 3.0.6, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d51e8e77fbd516f0652723c1dde07e684d3f0da9)
+* ## Features
+* <span style='color:green'>feat: HT-12083 change ReportFilterForm logic, add xtype: 'coontabpanel</span> ([3cbf03], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3cbf03a68e6934fc10430705d1c73ac99bd834d7))
+
+* update: CHANGELOG.md ([00de7c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/00de7c83a272fdf985d3627c192c05c1be1e8953))
+
 # Version 3.0.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0c4d5ae7335ab5af50f01462f36c1de26edf311)
 * up ([57408c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/57408cd0e2e46ae1fb908ac0d93623681b4fcff4))
 * up ([65fcec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/65fcecf6226bad1b6d533e7b555f23975eb8f0c2))

package/package.json

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

package/src/TabPanel.js

@@ -0,0 +1,79 @@
+/**
+ * @class Coon.TabPanel
+ *
+ * Добавлен функционал:
+ *   - Подписка на событие 'tabchange':
+ *          - установка id активного компонента в activeComponentId и публикация 'activeComponentId' в viewModel (publishState)
+ *          - установка активного компонент в activeComponent
+ *   - Подписка на событие 'dirtychange' на все items в coontabpanel,
+ *     добавляющий/удаляющий дополнительный класс 'tabDirtyCls' у tab.
+ *
+ * Стилизация вертикальных табов осуществлена добавлением "tabStyle: 'vertical'" в конфигурацию coontabpanel.
+ */
+Ext.define('Coon.TabPanel', {
+    extend: 'Ext.tab.Panel',
+    xtype: 'coontabpanel',
+
+    config: {
+        tabStyle: undefined,
+        activeComponent: undefined,
+        activeComponentId: undefined,
+    },
+
+    tabDirtyCls: 'tab-dirty',
+
+    initComponent() {
+        this.callParent();
+
+        if (this.tabStyle === 'vertical') {
+            this.setTabPosition('left');
+            this.setTabRotation(0);
+            this.addCls('coonVerticalTabpanel');
+        }
+
+        this.setCurrentActiveTab();
+
+        this.on('tabchange', function(panel, newPanel) {
+            this.setActiveComponent(newPanel);
+        }, this);
+
+        this.getLayout().getLayoutItems().forEach((tab) => {
+            tab.on('dirtychange', this.onCardDirtyChange.bind(this));
+        });
+    },
+
+    setCurrentActiveTab() {
+        const activeTab = this.getActiveTab();
+        this.setActiveComponent(activeTab);
+    },
+
+    /**
+     * Установка активного компонента в activeComponent и его id в activeComponentId.
+     * Публикация значения activeComponentId в viewModel.
+     * @param component
+     */
+    setActiveComponent(component) {
+        if (!component) {
+            return;
+        }
+        this.activeComponent = component;
+        this.activeComponentId = component.id;
+        this.publishState('activeComponentId', this.activeComponentId);
+    },
+
+    /**
+     * Ставит/убирает CSS класс "tabDirtyCls" в зависимости от флага "isDirty" соответствующей табе
+     * @param { component: Component, isDirty: boolean }
+     */
+    onCardDirtyChange(component, isDirty) {
+        if (!component.tab) {
+            return;
+        }
+        if (isDirty) {
+            component.tab.addCls(this.tabDirtyCls);
+        } else {
+            component.tab.removeCls(this.tabDirtyCls);
+        }
+    },
+
+});

package/src/report/component/ReportFilterForm.js

@@ -1,5 +1,33 @@
 /**
- * Форма динамического отчета
+ * Компонент фильтров репорта для разделения ReportPanel на отдельные табы с предустановленными filterDefaults.
+ * Начитывает репорт с полученными из фильтр панели параметрами в репорте с id = remoteReportPanelId, учитывая их filterDefaults.
+ *
+ * Пример использования с xtype = 'coontabpanel':
+ *  {
+ *      xtype: 'ReportFilterForm',
+ *      reportID: 'REPORT_DOC_REG_CREDIT',
+ *      bind: {
+ *          remoteReportPanelId: '{remoteReportPanelId}',
+ *      },
+ *  },
+ *  {
+ *      xtype: 'coontabpanel',
+ *      bind: {
+ *          activeComponentId: '{remoteReportPanelId}',
+ *      },
+ *      items: [
+ *          {
+ *              xtype: 'ReportPanel',
+ *              reportId: 'REPORT_DOC_REG_CREDIT',
+ *              filterDefaults: {
+ *                  REG_TYPE: 'HEAT',
+ *              },
+ *              ...
+ *          }
+ *      ]
+ *  }
+ *
+ *  Пример кастомной панели с данным функционалом DAA_REPORT_DOC_REG_CREDIT_PANEL
  **/
 Ext.define('Coon.report.component.ReportFilterForm', {
     extend: 'Ext.panel.Panel',
@@ -47,6 +75,7 @@ Ext.define('Coon.report.component.ReportFilterForm', {
         enableHighlightingRequiredFields: false,
         enableChipToolbar: false,
         filtered: false,
+        remoteReportPanelId: undefined,
     },
     defaults: {
         split: true,
@@ -56,52 +85,39 @@ Ext.define('Coon.report.component.ReportFilterForm', {
     items: [],
     locals: {
         plugins: new Map(),
+        reportCurrentParams: new Map(),
     },
 
-
-    getValue() {
-        return this.value;
-    },
-    setValue(values) {
-        this.value = values;
-        this.updateFilterDefaults(this.value);
-    },
-
-    updateReportId() {
-        if (!Ext.isEmpty(this.reportId)) {
-            this.configureReport();
+    setRemoteReportPanelId(remoteReportPanelId) {
+        this.remoteReportPanelId = remoteReportPanelId;
+        if (this.filtered) {
+            this.filterHandler();
         } else {
-            this.clear();
+            this.clearData();
         }
     },
 
-    applyFilterDefaults: function(filterDefaults) {
-        return Ext.apply({}, filterDefaults || {}, this.getFilterDefaults());
-    },
-
-    updateFilterDefaults: function(filterDefaults) {
-        this.applyFilter(filterDefaults);
-    },
-
-    getWikiContext: function() {
-        return this.reportId;
-    },
-
-    beforeDoInitCommand: function() {
-        let command = undefined;
-        if (!Ext.isEmpty(this['GET_DATA_COMMAND'])) {
-            command = Ext.create('command.' + this['GET_DATA_COMMAND']);
-        }
-        return command;
-    },
-
-    beforeApplyFilterCommand: function() {
-        return undefined;
-    },
-
-
     initComponent: function() {
-        this.centerProperties = this.centerProperties || {};
+        this.reportCurrentParams = new Map();
+
+        Coon.util.bindMethods([
+            'beforeApplyFilterCommand',
+            'beforeDoInitCommand',
+            'getWikiContext',
+            'updateFilterDefaults',
+            'applyFilterDefaults',
+            'updateReportId',
+            'doInit',
+            'beforeCommandExecuter',
+            'init',
+            'inputParameters',
+            'clearFilter',
+            'reset',
+            'configureNorthPanel',
+            'getPluginConfigByType',
+            'filter',
+            'applyFilter'
+        ], Ext.create('Coon.report.component.ReportPanel'), this, this);
 
         this.setFilterDefaults(this.getFilterDefaults() || {});
         this.northPanel = Ext.widget('NorthPanel', {
@@ -150,51 +166,6 @@ Ext.define('Coon.report.component.ReportFilterForm', {
         this.on('invalidateCache', this.filterHandler.bind(this, true));
     },
 
-
-    /**
-     * Инициализация
-     * @param reportId - ID отчета
-     * @param params - дефолтные параметры фильтра поиска в формате {ИМЯ: ЗНАЧЕНИЕ}
-     * @param autoFilter do Filter immediately after report are configured
-     */
-    doInit: function(reportId, params, autoFilter) {
-        this.beforeCommandExecuter(this.beforeDoInitCommand(this), [reportId || this.reportId, params, autoFilter], function() {
-            this.init(reportId, params, autoFilter);
-        });
-    },
-
-    beforeCommandExecuter: function(beforeCommand, beforeCommandParameters, callback) {
-        if (beforeCommand && beforeCommand instanceof Coon.command.BaseCommand) {
-            beforeCommand.on('complete', callback, this);
-            beforeCommand.execute.apply(beforeCommand, beforeCommandParameters);
-        } else {
-            callback.call(this);
-        }
-    },
-
-    init: function(reportId, params, autoFilter) {
-        this.setAutoFilter(Ext.isDefined(autoFilter) ? autoFilter : this.autoFilter);
-        if (reportId) {
-            this.reportId = reportId;
-            this.configureReport();
-        }
-        this.updateFilterDefaults(Ext.apply({}, params, this.getFilterDefaults()));
-
-        // hack
-        if (this.ownerCt && this.ownerCt.isXType && this.ownerCt.isXType('tabpanel')) {
-            this.updateLayout();
-        }
-    },
-
-    inputParameters: function() {
-        return [
-            {name: 'reportId'},
-            {name: 'params'},
-            {name: 'autoFilter'}
-        ];
-    },
-
-
     preprocessPlugins(plugins) {
         return plugins.reduce((acc, plugin) => {
             if (typeof this.preprocessPluginConfig === 'function') {
@@ -217,34 +188,20 @@ Ext.define('Coon.report.component.ReportFilterForm', {
         command.execute(this.reportId);
     },
 
-
     clear: function() {
         this.northPanel.clear();
         this.fireEvent('clear');
     },
 
-
     clearForm: function() {
         this.setFilterDefaults({});
         this.clearFilter();
     },
 
-    clearFilter: function() {
-        this.northPanel.clearFilter();
-        this.fireEvent('clearFilter');
-    },
-
-
-    reset: function() {
-        this.clearForm();
-    },
-
-
     fillFilter: function(useURIParameters, params) {
         this.northPanel.fillFilter(useURIParameters, params, this.getFilterDefaults());
     },
 
-
     build: function(reportFormBean) {
         const ns = Coon.report.model.ReportBeanFields;
 
@@ -264,6 +221,7 @@ Ext.define('Coon.report.component.ReportFilterForm', {
         this.configurePluginsByAcceptedPTypes(reportFormBean);
         this.applyFilter();
     },
+
     configurePluginsByAcceptedPTypes(reportFormBean) {
         const ns = Coon.report.model.ReportPluginBeanFields;
         const types = this.getAcceptedPTypes();
@@ -288,81 +246,53 @@ Ext.define('Coon.report.component.ReportFilterForm', {
             });
         }
     },
-    configureNorthPanel: function(reportFormBean) {
-        this.northPanel.filterPlugins = this.getPluginConfigByType('FILTER_PLUGIN', 'p');
-        this.northPanel.configureFilterPanel(reportFormBean);
-    },
 
-    getPluginConfigByType: function(type, prefix, pluginList) {
-        if (!this.locals.plugins.has(type)) {
-            return [];
+    getRemoteReportPanel(remoteReportPanelId) {
+        const id = remoteReportPanelId || this.getRemoteReportPanelId();
+        const reportPanel = id && this.up('UiCustomPanel').down(`#${id}`);
+        if (!reportPanel || reportPanel.xtype !== 'ReportPanel') {
+            return;
         }
-        const ns = Coon.report.model.ReportPluginBeanFields;
-        return this.locals.plugins.get(type).map((plugin) => {
-            const config = {pluginId: plugin[ns.$uiElement] && plugin[ns.$uiElement].id};
-            if (plugin[ns.$uiElement].propertyData) {
-                Ext.apply(config, Coon.Function.convertAdvancedProperties(Ext.decode(plugin[ns.$uiElement].propertyData)));
-            } else {
-                Ext.apply(config, Coon.Function.convertAdvancedProperties(plugin[ns.$uiElement].properties || plugin[ns.$properties]));
-            }
-            config[prefix + 'type'] = plugin[ns.$uiElement].xtype || plugin[ns.$xtype];
-            config[ns.$sortSequence] = plugin[ns.$sortSequence] || null;
-            return config;
-        });
+        return reportPanel;
     },
 
-    applyFilter: function(params) {
-        if (!this.items.length) {
+    filterHandler: function() {
+        const remoteReportPanelId = this.getRemoteReportPanelId();
+        const reportPanel = this.getRemoteReportPanel(remoteReportPanelId);
+        if (!reportPanel || !this.northPanel.isValid()) {
             return;
         }
-        params = params || {};
-        const parameters = Ext.apply({}, params, this.getFilterDefaults());
-        const filterPanel = this.down('FilterPanel');
-        if (filterPanel) {
-            filterPanel.markFilterFields(this.getFilterDefaults() || {});
-        }
 
-        this.fillFilter(!params.__doNotDecode, parameters);
-        // Если задано - фильтрация без ожидания ввода параметров
-        const doFilter = (parameters ? parameters.doFilter : undefined) ||
-            (Coon.MessageResources.getURIParameter('reportID', false) === this.reportID ?
-                (Coon.MessageResources.getURIParameter('doFilter', false)) : undefined);
-        if (this.getAutoFilter() || doFilter === 'true' || doFilter === true) {
-            this.filterHandler();
-        }
+        const currentParams = Object.fromEntries(this.northPanel.getFields().reduce((acc, field) => {
+            if (!field.hidden) {
+                acc.push([field.name, field.value || '']);
+            }
+            return acc;
+        }, []));
+        const reportParams = this.reportCurrentParams.get(remoteReportPanelId);
 
-        const hideFilterPanel = (parameters ? parameters.hideFilterPanel : undefined) ||
-            (Coon.MessageResources.getURIParameter('reportID', false) === this.reportID ?
-                Coon.MessageResources.getURIParameter('hideFilterPanel', false) : undefined);
-        if (hideFilterPanel === 'true') {
-            this.hideFilterPanel = true;
-        }
-        if (this.hideFilterPanel === false) {
-            this.northPanel.show();
-        } else if (this.hideFilterPanel === true || this.hideFilterPanel === 'hide') {
-            const visibleFields = this.query('[validate][isReportFilterField][hidden=false]');
-            visibleFields.forEach((field) => {
-                this._visibleFieldsMap.set(field, field.hidden);
-                field.setHidden(true);
-            });
-            this.northPanel.hide();
-        } else if (this.hideFilterPanel === 'collapse') {
-            this.northPanel.collapse(false);
+        const currentParamsHash = Coon.util.generateHashFromObj(currentParams);
+        const reportParamsHash = Coon.util.generateHashFromObj(reportParams);
+        if (Ext.isObject(reportParams) && (currentParamsHash === reportParamsHash)) {
+            return;
         }
-    },
 
-    filter: function() {
-        this.filterHandler();
+        this.reportCurrentParams.set(remoteReportPanelId, currentParams);
+        this.filtered = true;
+
+        reportPanel.northPanel.fillFilter(false, currentParams, reportPanel.getFilterDefaults());
+        reportPanel.filterHandler();
     },
 
-    filterHandler: function() {
-        if (this.northPanel.isValid()) {
-            this.currentParamList = this.northPanel.collectParams();
-            this.filtered = true;
-            this.northPanel.fireEvent('filterhandlerevent', this.currentParamList);
-            this.setValue(this.currentParamList);
-            this.publishState('value', this.value);
+    clearData() {
+        this.filtered = false;
+        const remoteReportPanelId = this.getRemoteReportPanelId();
+        const reportPanel = this.getRemoteReportPanel(remoteReportPanelId);
+        if (!reportPanel || !reportPanel.grid) {
+            return;
         }
+        reportPanel.grid.clear();
+        this.reportCurrentParams.set(remoteReportPanelId, {});
     },
 
 });

package/src/version.js

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

package/src/overrides/panel/TabPanel.js

@@ -1,36 +0,0 @@
-/**
- * Override класса 'Ext.tab.Panel'.
- * Добавлен функционал:
- *   - Подписка на событие 'dirtychange' на все items в tabpanel,
- *   добавляющий/удаляющий дополнительный класс tabDirtyCls у tab.
- *
- * Стилизация вертикальных табов осуществлена добавлением "cls: 'coonVerticalTabpanel'" в конфигурацию tabpanel.
- */
-Ext.define('Coon.overrides.panel.TabPanelOverride', {
-    override: 'Ext.tab.Panel',
-
-    tabDirtyCls: 'tab-dirty',
-
-    initComponent() {
-        this.callParent();
-        this.getLayout().getLayoutItems().forEach((tab) => {
-            tab.on('dirtychange', this.onCardDirtyChange.bind(this));
-        });
-    },
-
-    /**
-    * @param { component: Component, isDirty: boolean }
-    * Ставит/убирает CSS класс "tabDirtyCls" в зависимости от флага "isDirty" соответствующей табе
-    */
-    onCardDirtyChange(component, isDirty) {
-        if (!component.tab) {
-            return;
-        }
-        if (isDirty) {
-            component.tab.addCls(this.tabDirtyCls);
-        } else {
-            component.tab.removeCls(this.tabDirtyCls);
-        }
-    },
-});
-