ru.coon 2.7.44 → 2.7.46

package/src/uielement/component/UiCustomPanelTraceWindow.js

@@ -0,0 +1,50 @@
+Ext.define('Coon.uielement.component.UiCustomPanelTraceWindow', {
+    extend: 'Ext.window.Window',
+
+    xtype: 'UiCustomPanelTraceWindow',
+
+    title: 'трассировка выполнения плагинов',
+
+    scrollable: 'y',
+
+    width: 800,
+    height: 600,
+    modal: true,
+    maximizable: true,
+    layout: 'fit',
+
+    items: [
+        {
+            xtype: 'grid',
+            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';
+                    },
+                }
+            ],
+        }
+    ],
+
+    isTraceEnabled(scope) {
+        return Boolean(
+            scope &&
+            typeof scope.isTracePluginsEnabled === 'function' ||
+            scope.isTracePluginsEnabled()
+        );
+    },
+});

package/src/uielement/component/formchips/FilterConditionToolbar.scss

@@ -1,74 +1,74 @@
-.x-menu-body .x-box-target, .FilterConditionToolbar {
-
-    .closable-chip, .unusable-chip, .chip, .service-chip {
-        display: inline-block;
-        cursor: default;
-        padding: 0 15px;
-        height: 26px;
-        line-height: 26px;
-        border-radius: 13px;
-        .chip-value {
-            font-size: 13px;
-        }
-        .closebtn {
-            padding-left: 10px;
-            color: #888;
-            font-weight: bold;
-            float: right;
-            font-size: 15px;
-            cursor: pointer;
-        }
-        .closebtn:hover {
-            color: #000;
-        }
-    }
-    .remote-search-chip {
-        background-color: #f5f5f5;
-        .chip-value {
-            font-size: 12px;
-            color: rgba(17,17,17,0.8);
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .local-search-chip {
-        background-color: #dffad3;
-    }
-
-    /* Неиспользованное для поиска поле и сервисное поле */
-    .unusable-chip {
-        .chip-value {
-            font-size: 12px;
-            font-style: italic;
-            color: #111111;
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .service-chip {
-        .chip-value {
-            font-size: 12px;
-            color: rgba(17,17,17,0.8);
-            font-weight: 400;
-            line-height: 16px;
-        }
-    }
-
-    .chip, .service-chip, .unusable-chip {
-        .closebtn {
-            display: none;
-        }
-    }
-
-    .closable-chip {
-        .closebtn {
-            display: block;
-        }
-    }
-
-    .tool-eye-horus {
-        color: #002453;
-    }
-}
+.x-menu-body .x-box-target, .FilterConditionToolbar {
+
+    .closable-chip, .unusable-chip, .chip, .service-chip {
+        display: inline-block;
+        cursor: default;
+        padding: 0 15px;
+        height: 26px;
+        line-height: 26px;
+        border-radius: 13px;
+        .chip-value {
+            font-size: 13px;
+        }
+        .closebtn {
+            padding-left: 10px;
+            color: #888;
+            font-weight: bold;
+            float: right;
+            font-size: 15px;
+            cursor: pointer;
+        }
+        .closebtn:hover {
+            color: #000;
+        }
+    }
+    .remote-search-chip {
+        background-color: #f5f5f5;
+        .chip-value {
+            font-size: 12px;
+            color: rgba(17,17,17,0.8);
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .local-search-chip {
+        background-color: #dffad3;
+    }
+
+    /* Неиспользованное для поиска поле и сервисное поле */
+    .unusable-chip {
+        .chip-value {
+            font-size: 12px;
+            font-style: italic;
+            color: #111111;
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .service-chip {
+        .chip-value {
+            font-size: 12px;
+            color: rgba(17,17,17,0.8);
+            font-weight: 400;
+            line-height: 16px;
+        }
+    }
+
+    .chip, .service-chip, .unusable-chip {
+        .closebtn {
+            display: none;
+        }
+    }
+
+    .closable-chip {
+        .closebtn {
+            display: block;
+        }
+    }
+
+    .tool-eye-horus {
+        color: #002453;
+    }
+}

package/src/uielement/component/settings/UiCustomPanelEditor.scss

@@ -1,10 +1,10 @@
-.UiCustomPanelEditor {
-    .good-hash {
-        color: #64AA2B;
-        font-size: 19px;
-    }
-    .bad-hash {
-        color: red;
-        font-size: 19px;
-    }
+.UiCustomPanelEditor {
+    .good-hash {
+        color: #64AA2B;
+        font-size: 19px;
+    }
+    .bad-hash {
+        color: red;
+        font-size: 19px;
+    }
 }

package/src/uielement/component/settings/config/UiCPConfigPanelController.scss

@@ -1,24 +1,24 @@
-.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
-	color: red !important;
-}
-
-.errorsCountBtn, .warningsCountBtn {
-	font-size: 15px !important;
-	background-color: white !important;
-}
-
-.warningsCountBtn span[data-ref="btnInnerEl"] {
-	color: #b9b92d !important;
-}
-
-.errorsCountMsg {
-	margin-top: 12px !important;
-}
-
-.x-warningsCountBtn-focus {
-	background-color: white !important;
-}
-
-.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
-	background-color: #d0d0d0 !important;
-}
+.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
+	color: red !important;
+}
+
+.errorsCountBtn, .warningsCountBtn {
+	font-size: 15px !important;
+	background-color: white !important;
+}
+
+.warningsCountBtn span[data-ref="btnInnerEl"] {
+	color: #b9b92d !important;
+}
+
+.errorsCountMsg {
+	margin-top: 12px !important;
+}
+
+.x-warningsCountBtn-focus {
+	background-color: white !important;
+}
+
+.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
+	background-color: #d0d0d0 !important;
+}

package/src/uielement/component/settings/plugin/UiCustomPanelPluginGrid.scss

@@ -1,11 +1,11 @@
-.UiCustomPanelPluginGrid {
-    .x-title-icon {
-        color: gray!important;
-    }
-    .deletedRecord {
-        text-decoration: line-through;
-    }
-    .newRecord {
-        font-style:italic;
-    }
-}
+.UiCustomPanelPluginGrid {
+    .x-title-icon {
+        color: gray!important;
+    }
+    .deletedRecord {
+        text-decoration: line-through;
+    }
+    .newRecord {
+        font-style:italic;
+    }
+}

package/src/uielement/component/settings/plugin/UiCustomPanelPluginPanel.scss

@@ -1,30 +1,30 @@
-.UiCustomPanelPluginPanel {
-    .pluginInfo .x-form-display-field{
-        text-align: left;
-        font-size: 1em;
-        font-weight: bold;
-        padding: 8px;
-    }
-    .x-docked.x-panel-header-collapsed {
-        padding: 8px 4px!important;
-    }
-
-    .deletedRecord {
-        color: darkred;
-        text-decoration: line-through;
-    }
-    .readOnlyRecord {
-        .x-grid-td {
-            background-color: #f5f5f5;
-            color: #555;
-        }
-    }
-
-    .readOnlyDeletedRecord {
-        .x-grid-td {
-            color: darkred;
-            text-decoration: line-through;
-            background-color: #f5f5f5;
-        }
-    }
-}
+.UiCustomPanelPluginPanel {
+    .pluginInfo .x-form-display-field{
+        text-align: left;
+        font-size: 1em;
+        font-weight: bold;
+        padding: 8px;
+    }
+    .x-docked.x-panel-header-collapsed {
+        padding: 8px 4px!important;
+    }
+
+    .deletedRecord {
+        color: darkred;
+        text-decoration: line-through;
+    }
+    .readOnlyRecord {
+        .x-grid-td {
+            background-color: #f5f5f5;
+            color: #555;
+        }
+    }
+
+    .readOnlyDeletedRecord {
+        .x-grid-td {
+            color: darkred;
+            text-decoration: line-through;
+            background-color: #f5f5f5;
+        }
+    }
+}

package/src/uielement/component/settings/version/UiCPVersionPanel.scss

@@ -1,15 +1,15 @@
-.headerAceDiffContainerLeftSection{
-  width: 50%;
-  height: 20px;
-  float: left;
-  text-align: center;
-}
-.headerAceDiffContainerRightSection{
-  width: 50%;
-  height: 20px;
-  float: right;
-  text-align: center;
-}
-.x-btn-icon-el-default-toolbar-small{
-  height: 24px;
-}
+.headerAceDiffContainerLeftSection{
+  width: 50%;
+  height: 20px;
+  float: left;
+  text-align: center;
+}
+.headerAceDiffContainerRightSection{
+  width: 50%;
+  height: 20px;
+  float: right;
+  text-align: center;
+}
+.x-btn-icon-el-default-toolbar-small{
+  height: 24px;
+}

package/src/uielement/plugin/AddBindingsPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.AddBindingsPlugin', {
-    extend: 'Ext.plugin.Abstract',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.AddBindingsPlugin',
     uses: [],
     configurePanelWizardForFormEditor: 'AddBindingsPluginConfigPanelFormEditor',
@@ -11,6 +11,9 @@ Ext.define('Coon.uielement.plugin.AddBindingsPlugin', {
 
     init: function(view) {
         const controller = view.getController();
+        if (this.isTraceEnabled()) {
+            this.tracePlugin(this.bindings);
+        }
         if (controller) {
             controller.setBindings(this.bindings);
         }

package/src/uielement/plugin/AddDoInitSupportPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
-    extend: 'Ext.plugin.Abstract',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.AddDoInitSupportPlugin',
     uses: [],
     configurePanelWizardForFormEditor: 'AddDoInitSupportPluginConfigPanel',
@@ -49,6 +49,9 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
         });
     },
     handler: function(...parameters) { // Инициализируем во ViewModel входные параметры
+        if (this.isTraceEnabled()) {
+            this.tracePlugin(...parameters);
+        }
         const dataMapping = this.getInputParams();
         parameters.forEach((el, index) => {
             if (el !== undefined && el !== null && this.validatePath(dataMapping[index].valuePath)) {

package/src/uielement/plugin/CustomPanelPlugin.js

@@ -1,18 +1,56 @@
 Ext.define('Coon.uielement.plugin.CustomPanelPlugin', {
     extend: 'Ext.AbstractPlugin',
 
-    bindHandler() {
+    locals: {},
+
+    getExecuteScope() {
+        if (this.locals.executeScope) {
+            return this.locals.executeScope;
+        }
         let scope;
         if (this.getScope && this.getScope() === 'view') {
             scope = this.getCmp();
         } else {
             scope = this.getCmp().getController() || this.getCmp();
         }
+        this.locals.executeScope = scope;
+        return scope;
+    },
+
+    bindHandler(names) {
+        const executeScope = this.getExecuteScope();
         if (!this.handlerName) {
             throw new Error(`${this.$className}: handlerName cant be empty!`);
         }
 
-        Coon.util.bindMethods(this.handlerName, scope, this.getCmp(), scope);
-        return scope;
+        Coon.util.bindMethods(names || this.handlerName, executeScope, this.getCmp(), executeScope);
+        return executeScope;
+    },
+
+    isTraceEnabled() {
+        return typeof this.getExecuteScope().isTracePluginsEnabled === 'function' &&
+            this.getExecuteScope().isTracePluginsEnabled();
+    },
+
+    getPtype() {
+        const alias = Array.isArray(this.alias) && this.alias[0] || this.alias;
+        this.locals.ptype = alias ? alias.split('plugin.').pop() : this.$className.split('.').pop();
+        return this.locals.ptype;
+    },
+
+    tracePlugin(...args) {
+        this.logTraceMessages({
+            ptype: this.getPtype(),
+            handlerName: this.handlerName && this.handlerName.toString() || '-/-',
+            args,
+        });
+    },
+
+    logTraceMessages(msg) {
+        const scope = this.getExecuteScope();
+        if (!scope.locals.traceBuffer) {
+            return;
+        }
+        scope.locals.traceBuffer.push(msg);
     },
 });

package/src/uielement/plugin/ExecuteCommandPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.ExecuteCommandPlugin', {
-    extend: 'Ext.AbstractPlugin',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.ExecuteCommandPlugin',
     requires: [
         'Coon.log',
@@ -72,6 +72,9 @@ Ext.define('Coon.uielement.plugin.ExecuteCommandPlugin', {
 
     handler: function() {
         const parameters = Ext.decode(Ext.encode(this.parameters));
+        if (this.isTraceEnabled()) {
+            this.tracePlugin(parameters);
+        }
         return new Promise((resolve, reject) => {
             this.setDisabled(true);
             if (this.ctype) {

package/src/uielement/plugin/ExecuteFunctionPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.ExecuteFunctionPlugin', {
-    extend: 'Ext.AbstractPlugin',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.ExecuteFunctionPlugin',
     uses: [],
     configurePanelWizardForFormEditor: 'ExecuteFunctionPluginConfigPanelFormEditor',
@@ -20,7 +20,14 @@ Ext.define('Coon.uielement.plugin.ExecuteFunctionPlugin', {
         console.error("Error in " + '${this.handlerName}' + ' : ', e.stack);
         throw e;
     }`;
-        this.fn = new Function(this.getFnParameters() || '', wrappedBody || '');
-        this.executeScope[this.getHandlerName()] = Ext.bind(this.fn, this.executeScope);
+        const me = this;
+        const fn = (new Function(this.getFnParameters() || '', wrappedBody || '')).bind(this.executeScope);
+        this.executeScope[this.handlerName] =
+            function(...args) {
+                if (me.isTraceEnabled()) {
+                    me.tracePlugin(...args);
+                }
+                return fn(...args);
+            };
     },
 });

package/src/uielement/plugin/FireEventPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.FireEventPlugin', {
-    extend: 'Ext.AbstractPlugin',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.FireEventPlugin',
     uses: [],
     configurePanelWizardForFormEditor: 'FireEventPluginConfigPanelFormEditor',
@@ -18,6 +18,9 @@ Ext.define('Coon.uielement.plugin.FireEventPlugin', {
     },
 
     handler: function() {
+        if (this.isTraceEnabled()) {
+            this.tracePlugin(this.eventName);
+        }
         const eventArguments = [this.eventName];
         for (let i = 0; i < this.parameters.length; i++) {
             let paramValue = this.parameters[i];

package/src/uielement/plugin/MethodChainPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.MethodChainPlugin', {
-    extend: 'Ext.plugin.Abstract',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.MethodChainPlugin',
     uses: [],
     configurePanelWizardForFormEditor: 'MethodChainPluginConfigPanelFormEditor',
@@ -28,6 +28,9 @@ Ext.define('Coon.uielement.plugin.MethodChainPlugin', {
             this.controller[this.errorHandlers[methodName]].bind(this.controller);
     },
     async handler() {
+        if (this.isTraceEnabled()) {
+            this.tracePlugin();
+        }
         for (const methodName of this.methodNames) {
             let result;
             if (typeof this.controller[methodName] === 'function') {

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
-    extend: 'Ext.AbstractPlugin',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.OpenPanelPlugin',
     uses: [],
     mixins: [
@@ -36,6 +36,9 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
     },
 
     handler: function() {
+        if (this.isTraceEnabled()) {
+            this.tracePlugin(this.config.uiElementCd);
+        }
         this.uiElementCd = this.config.uiElementCd;
         if (this.uiElementCd) {
             this.uiElementCd = this.getFromModel(this.uiElementCd);

package/src/uielement/plugin/PrintPdfPlugin.js

@@ -1,5 +1,5 @@
 Ext.define('Coon.uielement.plugin.PrintPdfPlugin', {
-    extend: 'Ext.AbstractPlugin',
+    extend: 'Coon.uielement.plugin.CustomPanelPlugin',
     alias: 'plugin.PrintPdfPlugin',
     uses: [],
     configurePanelWizardForFormEditor: 'PrintPdfPluginConfigPanelFormEditor',
@@ -69,6 +69,9 @@ Ext.define('Coon.uielement.plugin.PrintPdfPlugin', {
     },
 
     handler: function() {
+        if (this.isTraceEnabled()) {
+            this.tracePlugin();
+        }
         return new Promise((resolve, reject) => {
             this.setDisabled(true);
             if (this.ctype) {

package/src/uielement/plugin/configPanel/AddBindingsPluginConfigPanelFormEditor.scss

@@ -1,29 +1,29 @@
-.ace-editor-content .x-grid-cell-inner {
-  overflow: auto;
-  white-space: pre-wrap;
-}
-
-.middle-align-elem{
-  vertical-align: middle;
-}
-
-.is-used-action{
-  background-color: #ddfdd2;
-  color: #111 !important;
-}
-
-.not-in-list-action{
-  cursor: pointer;
-  color: rgba(243, 173, 22, 0.89);
-  float:right;
-  width:18px;
-  height: 20px;
-}
-
-.already-exists-in-list-action{
-  cursor: pointer;
-  color: rgba(231, 70, 70, 0.91);
-  float:right;
-  width:18px;
-  height: 20px;
-}
+.ace-editor-content .x-grid-cell-inner {
+  overflow: auto;
+  white-space: pre-wrap;
+}
+
+.middle-align-elem{
+  vertical-align: middle;
+}
+
+.is-used-action{
+  background-color: #ddfdd2;
+  color: #111 !important;
+}
+
+.not-in-list-action{
+  cursor: pointer;
+  color: rgba(243, 173, 22, 0.89);
+  float:right;
+  width:18px;
+  height: 20px;
+}
+
+.already-exists-in-list-action{
+  cursor: pointer;
+  color: rgba(231, 70, 70, 0.91);
+  float:right;
+  width:18px;
+  height: 20px;
+}