ru.coon 2.7.46 → 2.7.48

package/CHANGELOG.md

@@ -1,6 +1,17 @@
+<<<<<<< HEAD
 # Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/19e7bc15c819e0dda639b962060e1993b1f29b6b)
 * upd ([b76ef9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b76ef97561c257ff2c4956cebd21a69813219c2a))
 * sync ([31dbbf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/31dbbf2431bf2bbc6aff326d50edc1fd61af841d))
+=======
+# Version 2.7.47, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83d7e98c91d4219f3d673decd3ebae65144e77a3)
+* update: CHANGELOG.md ([e32b02], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e32b025afe52cc55930d04bccba9fd19be5905b9))
+
+# Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/236b6e13be06add8fe0eeab8b079e086e1d8b524)
+* ## Features
+* <span style='color:green'>feat: extjs_iconpack version 1.3.26. Related to HT-8076.</span> ([4800c2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4800c23beff6959619ff467bbcb6c7fc30afb188))
+
+* :feat HT-8890 update extjs_iconpack to 1.3.27 ([108b17], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/108b17bbd73ed4064b884baa8633b0ceb9981048))
+>>>>>>> ee1e7e89e565e1b5514a5ee284c938b1e138e612
 * update: CHANGELOG.md ([c9af96], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c9af967e425b3f60570f9bf2198c105c7480f8e6))
 
 # Version 2.7.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6d09543c991b7ecfb2ea0f7e4369298dbfd2327f)

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.7.46",
+  "version": "2.7.48",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -27,7 +27,7 @@
     "ace-diff": "^3.0.3",
     "decimal.js-light": "^2.5.1",
     "echarts": "^5.3.3",
-    "extjs_iconpack": "1.3.25",
+    "extjs_iconpack": "1.3.27",
     "json5": "2.2.3",
     "object-hash": "^3.0.0",
     "sigma-printjs": "^1.0.1",

package/src/uielement/component/UiCustomPanelTraceWindow.js

@@ -7,36 +7,34 @@ Ext.define('Coon.uielement.component.UiCustomPanelTraceWindow', {
 
     scrollable: 'y',
 
-    width: 800,
-    height: 600,
+    width: 1200,
+    height: 800,
     modal: true,
     maximizable: true,
-    layout: 'fit',
+    layout: {
+        type: 'hbox',
+        align: 'stretch',
+    },
 
     items: [
         {
-            xtype: 'grid',
+            xtype: 'gridpanel',
+            flex: 1,
+            split: true,
+            width: 500,
             store: {
                 type: 'json',
             },
             columns: [
                 {xtype: 'datecolumn', dataIndex: 'time', text: 'время', flex: 1, format: 'h:m:s.u'},
                 {dataIndex: 'ptype', text: 'плагин', flex: 1},
-                {dataIndex: 'handlerName', text: 'название обработчика', flex: 1},
-                {
-                    dataIndex: 'args',
-                    text: 'args',
-                    flex: 1,
-                    renderer(args) {
-                        return Array.isArray(args) && args.map((arg) => Coon.util.runIfTypeIn(
-                            arg,
-                            ['boolean', 'string', 'integer'],
-                            () => arg,
-                            Coon.util.typeOf
-                        )).join('<br />') || 'empty';
-                    },
-                }
+                {dataIndex: 'handlerName', text: 'название обработчика', flex: 1}
             ],
+        },
+        {
+            xtype: 'UiAceEditor',
+            readOnly: true,
+            flex: 1,
         }
     ],
 
@@ -47,4 +45,37 @@ Ext.define('Coon.uielement.component.UiCustomPanelTraceWindow', {
             scope.isTracePluginsEnabled()
         );
     },
+
+    convertArgs(args) {
+        const dict = new WeakSet();
+        const unpack = (el) => {
+            if (Coon.util.typeOf(el) === 'array') {
+                return el.map(unpack).join('\n');
+            }
+            if (Coon.util.typeOf(el) === 'object') {
+                if (dict.has(el)) {
+                    return 'circular object';
+                }
+                dict.add(el);
+                if (el.$className) {
+                    return el.$className;
+                }
+                return Object.entries(el).map(([k, v]) => `${k}: ${unpack(v)}`).join('\n');
+            }
+            if (typeof el === 'function') {
+                return 'function';
+            }
+            return el && el.toString ? el.toString() : typeof el;
+        };
+        return unpack(args);
+    },
+
+    initComponent() {
+        this.callParent();
+        const viewer = this.down('UiAceEditor');
+        const grid = this.down('gridpanel');
+        grid.on('select', function(_, record) {
+            viewer.setValue(this.convertArgs(record.data.args));
+        }, this);
+    },
 });

package/src/uielement/component/settings/UiAceEditor.js

@@ -288,6 +288,7 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
             str = JSON5.stringify(json, {
                 space: 4,
                 quote: '\'',
+                replacer: Coon.util.getCircularReplacer(),
             });
             this.setValue(str);
         } catch (ex) {

package/src/uielement/plugin/CustomPanelPlugin.js

@@ -48,9 +48,7 @@ Ext.define('Coon.uielement.plugin.CustomPanelPlugin', {
 
     logTraceMessages(msg) {
         const scope = this.getExecuteScope();
-        if (!scope.locals.traceBuffer) {
-            return;
-        }
-        scope.locals.traceBuffer.push(msg);
+        scope.getTraceBuffer().push(msg);
+        // console.log('logTraceMessages', msg, scope.getTraceBuffer());
     },
 });

package/src/version.js

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