ru.coon 2.8.45 → 2.8.46

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 2.8.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/416e38feb604589c5505cd4b50a06ee98217451e)
+* ## Fixes
+* <span style='color:red'> Do not use class before initialization. Related to BFL-17721.</span> ([c119c8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c119c8afb6974faf2323315a8f2d975ecd27a0ad))
+* <span style='color:red'> Перешли на исправленную версию ace-diff, в которой url к sourcemap файлу ace-diff.min.css исправлен, чтобы Vite его мог загрузить. Related to BFL-17721.</span> ([d88bf0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d88bf04806947800ca39b82d71ff5381dc920838))
+* <span style='color:red'> BFL-17459 GridEditorsPlugin comboRenderer and ReportPanel convert column value</span> ([f0ec9e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f0ec9e799e4bc7382b104389adef530a4b40d005))
+
+* update: CHANGELOG.md ([578c6a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/578c6ad6a296007bc5d1bb7884ad86c50900a8d1))
+
 # Version 2.8.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/25627ac5acaac8b27d8715539f6f5d660d06e4cb)
 * ## Features
 * <span style='color:green'>feat: HT-11254: Доработана возможность прокидывать функции в свойства элементов</span> ([b55ec0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b55ec087990a4350abedbd7cff217c52e482eb1e))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.8.45",
+  "version": "2.8.46",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "ace-builds": "1.4.12",
-    "ace-diff": "^3.0.3",
+    "ace-diff": "3.0.3-patch.1",
     "decimal.js-light": "^2.5.1",
     "echarts": "5.3.3",
     "extjs_iconpack": "1.3.27",

package/src/app/Application.js

@@ -6,7 +6,9 @@ Ext.define('Coon.app.Application', {
         applicationMainView: null,
     },
 
-    appRouter: Coon.app.Router,
+    init() {
+        this.appRouter = Coon.app.Router;
+    },
 
     onLogout: function() {
         Ext.Msg.show({

package/src/report/component/ReportPanel.js

@@ -100,7 +100,7 @@ Ext.define('Coon.report.component.ReportPanel', {
                 const typeOfValue = field[fieldNS.$reportFieldTypeLookup];
 
                 // Построение конфига столбца по характеристике
-                const [cConfig, storeRecordType, convert] = this.setColumnType(typeOfValue);
+                let [cConfig, storeRecordType, convert] = this.setColumnType(typeOfValue);
 
                 const columnConfig = Ext.apply({
                     text: description && (description.indexOf('qtip=') === -1 ? description : description.slice(0, description.indexOf('qtip='))),
@@ -110,6 +110,19 @@ Ext.define('Coon.report.component.ReportPanel', {
                     filterable: true,
                 }, Coon.Function.convertAdvancedProperties(field[fieldNS.$properties]), cConfig);
 
+                if (field[fieldNS.$properties].convert) {
+                    try {
+                        if (
+                            Ext.isString(field[fieldNS.$properties].convert) &&
+                                Ext.String.startsWith(field[fieldNS.$properties].convert, 'function')
+                        ) {
+                            convert = Coon.Function.createFromString(field[fieldNS.$properties].convert);
+                        }
+                    } catch (e) {
+                        console.warn(e);
+                    }
+                }
+
                 if (columnConfig['useComboRenderer']) {
                     columnConfig.renderer = function(value, metaData, record, rowIndex, colIndex, store, view) {
                         const editor = metaData.column && metaData.column.getEditor && metaData.column.getEditor();

package/src/report/plugin/grid/GridEditorsPlugin.js

@@ -95,9 +95,16 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                     metaData.tdStyle = customStyle;
                 }
                 if (needComboRenderer) {
-                    editor.store.clearFilter();
-                    const editorRecord = editor.findRecord(editor.valueField, value);
-                    return editorRecord ? editorRecord.get(editor.displayField) : editor.valueNotFoundText;
+                    if (!editor.getStore().isLoaded() && editor.deferGridUpdate !== true) {
+                        editor.deferGridUpdate = true;
+                        editor.getStore().on('load', function() {
+                            delete editor.deferGridUpdate;
+                            this.grid.view.refresh();
+                        }, this, {single: true});
+                    } else {
+                        editor.setValue(value);
+                        return editor.getVisibleValue();
+                    }
                 }
                 if (Ext.isDate(value)) {
                     return Ext.Date.format(value, editorConfig.mask.format || columnFormat);

package/src/version.js

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