ru.coon 3.0.30 → 3.0.32

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Version 3.0.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/54a1adc38f21829b195830d3eced818bf79b9ae8)
+* HT-13143 feat: Доработка функционала тулбара ([143359], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/14335922547e88e2da04be44ecd90b62b10ba9bb))
+* upd ([bfda87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bfda878d1063c5c85d7e606457e925186fe99c02))
+* upd ([567480], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/567480f225764cfdfce2ffc5ab2e132d23d7c80f))
+* update: CHANGELOG.md ([aec290], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aec29006235ca1d8f82e3dc1eaa594c797f1a14c))
+
+# Version 3.0.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9665b81ba1d0a4cded52d8755f915381c0753074)
+* ## Fixes
+* <span style='color:red'>fix OCPB</span> ([d9f750], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9f7501828ec8437a029d6eb0ef7582e43bac2ba))
+
+* TR-13285 fix: BigNumColumn renderer function refactoring ([d80c93], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d80c934d5c5236708918bbaf2b66c3abd6537213))
+* update: CHANGELOG.md ([000f57], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/000f5736911e558f1cf5629700025633e9c820f7))
+
 # Version 3.0.30, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/834d4e43ba0766daf8e6fd774f052303d0be81ed)
 * ## Fixes
 * <span style='color:red'> componentContextId not found in cmp config. Related to NEVA-821.</span> ([7627d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7627d4b7d7acd918ee99f1a11bd960844676a0c0))

package/core-uls.d2

@@ -0,0 +1,12 @@
+login phase: {
+    /info
+    /revision\.json
+    /login
+    /generateCSRFToken
+}
+
+read navigation menu: {|`
+    - /ReportFormData/get -> reportId.MENU_ALLITEMS
+    - /ReportFormData/get -> reportId.MENU_PROFILE
+`|
+}

package/core-urls.json

@@ -0,0 +1,54 @@
+{
+    "loginPhase": [
+        "/info",
+        "/revision.json",
+        "/login",
+        "/generateCSRFToken"
+    ],
+    "readNavMenu": [
+        { "url": "/ReportFormData/get", "params": "reportId:MENU_ALLITEMS" },
+        { "url": "/ReportFormData/get", "params": "reportId.MENU_PROFILE" }
+    ],
+    "uiElement": [
+        "/UIElement/get",
+        "/UIElement/copy",
+        "/UIElement/delete",
+        "/UIElement/version/revision/get",
+        "/UIElement/version/get",
+        "/UIElement/save",
+        "/UIElement/import",
+        "/UIElement/editor/import",
+        "/UIElement/getNameProperties"
+    ],
+    "report": [
+        "/ReportConfiguration/get",
+        "/ReportConfiguration/delete",
+        "/ReportFormData/get",
+        "/ReportFormData/getCSVReport",
+        "/ReportFormData/getExcelFromRowsOrReport",
+        "/ReportFormData/getExcelReport",
+        "/ReportFormData/getPdfReport",
+        "/ReportFormData/getReportSqlText",
+        "/ReportField/get",
+        "/Report/version/get",
+        "/Report/version/revision/get",
+        "/ReportFormMaintenance/save"
+    ],
+    "common": [
+        "/personification/personify",
+        "/configurationProperty/get",
+        "/configurationProperty/getAllPropertiesWithDefault",
+        "/configurationProperty/save"
+    ],
+    "entities": [
+        "/externalSystem/proxy/SWE/LookUpService/getLookUpList.do",
+        "/externalSystem/proxy/SWE/AlgoritmChainBind/get.do",
+        "/externalSystem/proxy/SWE/CharacteristicList/get.do",
+        "/externalSystem/proxy/SWE/CharacteristicList/getAll.do",
+        "externalSystem/proxy/SWE/Entity/getWithAllCharacteristicsByGroups.do",
+        "/externalSystem/proxy/SWE/Entity/save.do",
+        "/externalSystem/proxy/SWE/EntityGroup/saveCharacters.do",
+        "/externalSystem/proxy/SWE/CharacteristicList/save.do",
+        "externalSystem/proxy/SWE/AlgoritmChainBind/save.do"
+    ]
+}

package/package.json

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

package/src/common/ComponentFactory.js

@@ -56,8 +56,6 @@ Ext.define('Coon.common.ComponentFactory', {
         }
         const config = route.uiElement;
         const paramsObject = this.paramsToObject(params);
-        const filterDefaults =
-          (paramsObject && Object.assign(paramsObject, {doFilter: true})) || {};
 
         if (!Ext.isObject(config)) {
             throw new Error('неверный формат элемента пункта меню');
@@ -76,6 +74,16 @@ Ext.define('Coon.common.ComponentFactory', {
                 }
             );
         }
+
+        if (Ext.isObject(paramsObject)) {
+            paramsObject.doFilter = 'doFilter' in paramsObject ? paramsObject.doFilter : true;
+        }
+
+        const filterDefaults = Object.assign(
+            paramsObject || {},
+            config.propertyData?.filterDefaults || {}
+        );
+
         Object.assign(
             config,
             {xtype: config.xtype, itemId: uiElementCd},

package/src/report/column/BigNumColumn.js

@@ -1,12 +1,10 @@
 Ext.define('Coon.report.column.BigNumColumn', {
-    extend: 'Ext.grid.Column',
+    extend: 'Ext.grid.column.Column',
     alias: 'widget.BigNumColumn',
     alternateClassName: [
         'Sigma.common.column.BigNumColumn',
         'Sigma.grid.column.BigNumColumn'
     ],
-    uses: [],
-    requires: [],
     align: 'right',
     cellSumPluginConfig: {
         valueType: 'float',
@@ -18,24 +16,17 @@ Ext.define('Coon.report.column.BigNumColumn', {
     },
 
     /**
-     * Функция м.быть вызвана из метода setupRowData Ext.grid.feature.Grouping. В этом случае cellValues - пустой объект.
-     * @param v
-     * @param {Object} cellValues
+     * @param value
+     * @param {Object} metaData
      * @returns {string|null}
      */
-    renderer: function(v, cellValues) {
-        const column = cellValues && cellValues.column;
-
-        let me;
-
-        if (column && Ext.isFunction(column.getDecSeparator)) {
-            me = column;
-        } else if (Ext.isFunction(this.getDecSeparator)) {
-            me = this;
-        }
-        const value = me ? Coon.format.bigNumFormat(v, me.getDecSeparator(), me.getGroupSeparator(), me.getPrecision()): null;
-        if (value !== null) {
-            return `<div data-qtip="${Ext.util.Format.htmlEncode(value)}">${value}</div>`;
+    renderer: function(value, metaData) {
+        const column = this.isXType('gridcolumn') ? this : metaData && metaData.column;
+        const formattedValue = column && Ext.isFunction(column.getDecSeparator) ?
+            Coon.format.bigNumFormat(value, column.getDecSeparator(), column.getGroupSeparator(), column.getPrecision()) :
+            null;
+        if (formattedValue !== null) {
+            return `<div data-qtip="${Ext.util.Format.htmlEncode(formattedValue)}">${formattedValue}</div>`;
         }
         return null;
     },

package/src/report/component/ReportPanel.js

@@ -68,6 +68,13 @@ Ext.define('Coon.report.component.ReportPanel', {
         enableChipToolbar: false,
         filtered: false,
         customButtons: false,
+        locals: {
+            /**
+             * Точка монтирования api плагинов репорта
+             */
+            api: new Map(),
+            plugins: new Map(),
+        },
     },
     defaults: {
         split: true,
@@ -77,9 +84,6 @@ Ext.define('Coon.report.component.ReportPanel', {
 
     lazyConfigLoading: Coon.setup.get('lazyConfigLoading'),
 
-    locals: {
-        plugins: new Map(),
-    },
     /**
      * @property {Coon.report.component.ReportFieldMap}
      */
@@ -353,6 +357,11 @@ Ext.define('Coon.report.component.ReportPanel', {
         return 'complete loadFakeData';
     },
 
+    constructor(config) {
+        this.callParent(arguments);
+        this.getLocals().api = new Map();
+    },
+
     initComponent: function() {
         this.gridProperties = this.gridProperties || {};
         this.centerProperties = this.centerProperties || {};
@@ -603,12 +612,23 @@ Ext.define('Coon.report.component.ReportPanel', {
         this.addPlugin(config);
     },
 
+    preprocessPluginConfig(config, xtype) {
+        return ![
+            'GridQuickSearchPlugin',
+            'GridFiltersPlugin', // Исключается, т.к. есть альтернатива - плагин по умолчанию AddFilterConditionPlugin
+            'ReportToolbarPlugin',
+            'ToolbarSeparatorPlugin' // Не совместим с ReportToolbarPlugin
+        ].includes(xtype) && config;
+    },
+
     preprocessPlugins(plugins) {
+        const isReportToolbarPlugin = plugins.find((item) => item.uiElement.xtype === 'ReportToolbarPlugin');
+        this.isReportToolbarPlugin = isReportToolbarPlugin;
+        const defaultConfig = Coon.report.plugin.form.ReportToolbarPlugin.getDefaultConfig();
+        this.addToolbarPlugin(isReportToolbarPlugin ?
+            Object.assign({}, isReportToolbarPlugin) : defaultConfig
+        );
         return plugins.reduce((acc, plugin) => {
-            if (plugin.uiElement.xtype === 'ReportToolbarPlugin') {
-                this.addToolbarPlugin(Object.assign({}, plugin));
-                plugin = false;
-            }
             if (typeof this.preprocessPluginConfig === 'function') {
                 plugin = this.preprocessPluginConfig(plugin, plugin.uiElement && plugin.uiElement.xtype);
             }
@@ -715,7 +735,10 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     clearData: function() {
-        this.grid && this.grid.clear();
+        if (this.grid) {
+            this.grid.getStore().clearFilter();
+            this.grid.clear();
+        }
         this.fireEvent('clearData');
     },
 
@@ -1138,6 +1161,7 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     loadDataByStore(parameterList, invalidateCache) {
+        const stop = Coon.perf.start(`Report.load: ${this.reportId}`);
         const store = this.grid.getStore();
         store.getProxy().abort();
         return new Promise((resolve) => {
@@ -1148,15 +1172,17 @@ Ext.define('Coon.report.component.ReportPanel', {
                     invalidateCache,
                 },
                 callback: function(records, operation, success) {
+                    Coon.log.debug(Coon.perf.getLog(stop()));
                     resolve(records);
                 },
+                scope: this,
             });
         });
     },
 
     loadDataByCommand(command, parameterList, invalidateCache) {
         const store = this.grid.getStore();
-        return new Promise((resolve) => {
+        return new Promise(function(resolve) {
             command.on('complete', function(response) {
                 if (!store.lastOptions) {
                     store.lastOptions = {};
@@ -1169,6 +1195,9 @@ Ext.define('Coon.report.component.ReportPanel', {
                 store.fireEvent('load', store);
                 resolve(response && response.list);
             }, this);
+            command.on('failure', function(exception) {
+            }, this);
+
 
             this.executeStoreDataCommand(command, {
                 reportID: this.reportID,
@@ -1200,4 +1229,22 @@ Ext.define('Coon.report.component.ReportPanel', {
         const selectedRecords = this.grid.getSelection();
         return selectedRecords && selectedRecords.length > 0 && firstSelectedOnly ? selectedRecords[0] : selectedRecords;
     },
+
+    registerApi(apiKey, api) {
+        if (this.getLocals().api.has(apiKey)) {
+            Coon.log.warn('Дублирование api ' + apiKey);
+        }
+        this.getLocals().api.set(apiKey, api);
+    },
+
+    getApi(apiKey) {
+        return this.getLocals().api.get(apiKey);
+    },
+
+    isStoreEmpty() {
+        if (!this.grid) {
+            return true;
+        }
+        return this.grid.getStore().getDataSource().getCount() === 0;
+    },
 });