ru.coon 2.6.7 → 2.6.8

package/.eslintrc.js

@@ -16,6 +16,7 @@ module.exports = {
         'Ext': 'readonly',
         'JSON5': 'readonly',
         'Coon': 'writable',
+        'Iconpack': 'writable',
     },
     'parserOptions': {
         ecmaVersion: 8,

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+# Version 2.6.8, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/93e8208b4895493b8ad13ac0910a75fc2a2b4531)
+* update: CHANGELOG.md ([367797], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/367797afa5241e6fd9eff7af17f4a28f2e1043ce))
+
 # Version 2.6.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6802942bc71e923767f61cfc703ea6385d7f932e)
 * ## Features
 * <span style='color:green'>feat: HT-8060: if we have grid AutoSize option true and have saved grid columns config set it in false</span> ([2c6e2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2c6e2d28a88cfbd383ea963e35cd7289e8412c49))
@@ -294,6 +297,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * BFL-8607 Доработка редактора характеристики типа "Дата" ([6b2ee8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b2ee8c52c6f89799f0de52b30b78179650f518c))
 * BFL-8607 Доработка редактора характеристики типа "Дата" ([20c221], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20c2210c3c15817168bf0a3465a219fe49f7d2fe))
 * BFL-8607 Доработка редактора характеристики типа "Дата" ([0c7529], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0c752984e1e82cdf68d9aa25413375319adfe30e))
+* Merge with develop ([2f0b72], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f0b7296a4764645e248dfe2f2e4d5399f695dc4))
 * update: CHANGELOG.md ([892608], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/892608eb6ddd2ef85d205ba9e1e857aa27672320))
 
 # Version 2.5.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a6256f14a891eda0974a2af1ee2c108c8904feab)
@@ -309,6 +313,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 
 # Version 2.5.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/612fb7573419ad9857649f7211c8d7a56e52cdb4)
 * ## Features
+* <span style='color:green'>feat: Перенесен ShowReportEditorCreator из ISWE. Closes BFL-9446.</span> ([1d7ee3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1d7ee326527f9d14d332bb115bd68a15a7e9c22e))
 * <span style='color:green'>feat: BFL-9521: init dependent form params anytime</span> ([2e5aa1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2e5aa16eeace7205cff9e01295f43d0f4ce956c6))
 
 * ## Fixes
@@ -499,6 +504,7 @@ isolate lastValue from native ComboBox logic</span> ([57078e], [link](http://git
 * update: CHANGELOG.md ([473997], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4739978f7ebb8564b5b233c496ce9c98d977c1c6))
 
 # Version 2.5.21, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc202083a949169e0203fa47bf2defa312201a33)
+* CRM-7662 Управление выравниванием xtype = iconSvgColumn в ячейке ([064e19], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/064e191cd27cd45f0293bb30c9938325722b4837))
 * update: CHANGELOG.md ([e1a4d6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e1a4d65ec93284adeab64eb21ab51e737c229df7))
 
 # Version 2.5.20, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a884bf408a15fd41a3b62aa7f11301df69e99fc1)
@@ -524,6 +530,8 @@ fix ReportPropertiesPanelController</span> ([e2b928], [link](http://gitlab-dbr.s
 * <span style='color:red'> HT-6314 change icon and master widget style</span> ([ac9da8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ac9da82d4f00015e52da554cb985b4f2bdf2a1fe))
 * <span style='color:red'> HT-6314 change icon and master widget style</span> ([6b03cc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b03ccc5600c2d757b811bad43b790a85633d844))
 
+* CRM-7662 Управление выравниванием xtype = iconSvgColumn в ячейке ([8065d1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8065d124ffdbfe46177d5ea710e14183257a9494))
+* CRM-7662 Управление выравниванием xtype = iconSvgColumn в ячейке ([cfd31c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cfd31c9d0e148c37a26e8d924abeff30b8a404b2))
 * update: CHANGELOG.md ([ff88bb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff88bb739914adacf1bbfa5284b31f603e480795))
 
 # Version 2.5.18, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b13b1b683795ffae10f8d406829a96bd7850553f)

package/package.json

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

package/src/common/component/editor/EditorFactory.js

@@ -59,7 +59,7 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
             Ext.decode(mask, true) : {});
         if (type === Coon.common.component.editor.CharacteristicEditorTypes.FOREIGN ||
             type === Coon.common.component.editor.CharacteristicEditorTypes.FILE ||
-            !Ext.isEmpty(record.get(Coon.report.model.CharacteristicBeanFields.$editor))) {
+            !Ext.isEmpty(record.get(Coon.report.model.CharacteristicBeanFields.$editor).trim())) {
             return new Coon.common.component.editor.CustomTypeEditor({
                 record: record,
                 context: context,
@@ -453,7 +453,7 @@ Ext.define('Coon.common.component.editor.CustomTypeEditor', {
         const ns = Coon.report.model.CharacteristicBeanFields;
 
         let field = null;
-        const editorCode = record.get(ns.$editor);
+        const editorCode = record.get(ns.$editor).trim();
         if (!Ext.isEmpty(editorCode)) {
             if (Ext.ClassManager.getByAlias('widget.' + editorCode)) {
                 let editor = null;

package/src/common/component/editor/creators/TriggerFieldEditorCreator.js

@@ -43,7 +43,7 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
 
     showPanel: function(record, parent) {
         const ns = Coon.report.model.CharacteristicBeanFields;
-        const props = this.parseMask(record.get(ns.$mask));
+        const props = this.parseMask(record.get(ns.$mask).trim());
         this.value = record.get(ns.$value);
 
         const panel = Ext.create({
@@ -55,10 +55,13 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         const win = Ext.widget('WindowWrap', {
             items: panel,
         });
-        const parameter = {};
-        parameter[props.parameterName] = this.field.ID;
-        win.doInit(props.reportId, Object.assign(parameter, this.context), true);
-
+        if (props) {
+            const parameter = {};
+            parameter[props.parameterName] = this.field.ID;
+            win.doInit(props.reportId, Object.assign(parameter, this.context), true);
+        } else {
+            Coon.log.error('Не задана маска характеристики');
+        }
         panel.on('gridReady', function() {
             if (this.doubleClickHandler) {
                 panel.grid.on('rowdblclick', function(grid, record) {
@@ -104,7 +107,11 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
 
         win.show();
     },
-
+    /**
+     *   @example
+     *   'REPORTS:CM_REPORT_CD' -> reportId: REPORTS, valueColumn: CM_REPORT_CD
+     * @param {string} mask
+     */
     parseMask: function(mask) {
         let result;
         if (mask.match(/[\w-]*:[\w-]*/)) {

package/src/report/column/IconSvgColumn.js

@@ -6,10 +6,21 @@ Ext.define('Coon.report.column.IconSvgColumn', {
         'Sigma.grid.column.IconSvgColumn'
     ],
     uses: [],
-    requires: [],
-    renderer: function(value) {
+    requires: [
+        'Iconpack.util'
+    ],
+    config: {
+        set: 'project',
+        priority: 'project,fa',
+    },
+    renderer: function(value, meta, record, rowIndex, colIndex) {
         if (!Ext.isEmpty(value)) {
-            return '<div class="svg-in-grid-cell svg-icon svg-icon-' + value + '"></div>';
+            return Iconpack.util.getIconDiv(value, {
+                align: this.columns[colIndex].align,
+                set: this.columns[colIndex].set,
+                isGridCell: true,
+                priority: this.columns[colIndex].priority,
+            });
         }
     },
 });

package/src/version.js

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