ru.coon 2.7.45 → 2.7.46

package/CHANGELOG.md

@@ -1,4 +1,12 @@
+# 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))
+* 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)
+* ## Fixes
+* <span style='color:red'> Added required deps. Related to TR-68743, TR-63848.</span> ([27be06], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/27be06f608741d363f0c7e8521e94aefb2e9ba81))
+
 * HT-9325 Контрагент - добавление подсказки для полей, имеющих определенное количество символов ([3b8085], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b8085665232b2b937129dde2173bbbc3734ce36))
 * HT-9325 Контрагент - добавление подсказки для полей, имеющих определенное количество символов ([2491d0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2491d05dca04c86a97b5d9da3c1720fd5fe55d78))
 * update: CHANGELOG.md ([882183], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/882183d4ad048bfc623600f3235a14081a2c6629))

package/package.json

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

package/src/common/panel/MainUploadPanel.js

@@ -28,7 +28,11 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
     alias: 'widget.MainUploadPanel',
     uses: [],
     requires: [
-        'Coon.Function'
+        'Coon.Function',
+        'Coon.log',
+        'Coon.MessageResources',
+        'Coon.common.panel.ExtFileUploadField',
+        'Coon.common.component.Auth'
     ],
     alternateClassName: 'Sigma.common.panels.MainUploadPanel',
     bodyStyle: 'padding:5px',

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

@@ -434,7 +434,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
         try {
             fileName = new Ext.XTemplate(fileName, {strict: true}).apply({
-                parameters: this.component.up('ReportPanel').currentParamList,
+                parameters: this.component.up('ReportPanel').currentParamList || {},
             });
         } catch (err) {
             Coon.log.warn(err);

package/src/ringBuffer.js

@@ -0,0 +1,36 @@
+Ext.define('Coon.ringBuffer', {
+    statics: {
+        maxLength: 2000,
+    },
+
+    constructor(cfg) {
+        const buffer = [];
+        let cursor = 0;
+        this.getLength = () => (cfg.length || this.self.maxLength) - 1;
+        this.getBuffer = () => buffer;
+        this.getCursor = () => cursor;
+        this.advanceCursor = () => {
+            if (cursor < this.getLength()) {
+                cursor += 1;
+            } else {
+                cursor = 0;
+            }
+            return cursor;
+        };
+        Ext.apply(this, cfg);
+    },
+
+    push(el) {
+        this.getBuffer()[this.getCursor()] = {el, idx: Date.now()};
+        this.advanceCursor();
+        return this;
+    },
+
+    get() {
+        return this.getBuffer().sort((a, b) => a.idx - b.idx);
+    },
+
+    getElements() {
+        return this.get().map(({el, idx}) => Object.assign(el, {time: new Date(idx)}));
+    },
+});

package/src/uielement/component/UiCustomController.js

@@ -3,7 +3,12 @@ Ext.define('Coon.uielement.component.UiCustomController', {
     alias: 'controller.UiCustomController',
     requires: ['Coon.security.Manager'],
 
+    locals: {},
+
     init: function(view) {
+        if (this.isTracePluginsEnabled()) {
+            this.getTraceBuffer();
+        }
         const config = view.propertyData || view.initialConfig;
         if (!view || typeof view.on !== 'function') {
             Coon.log.debug(` [Error]UiCustomController.init - view not found or view.on is not a function`);
@@ -16,7 +21,6 @@ Ext.define('Coon.uielement.component.UiCustomController', {
                 return;
             }
             const viewButtons = view.query('button');
-            // console.time('UiCustomController.buttons');
             const allowedMap = new Set(accessDecision.allowedItems);
             if (Ext.isObject(securePoints.buttons) && Object.keys(securePoints.buttons).length) {
                 Coon.log.debug(`used securePoints, allowed: ${accessDecision.allowedItems}, secureButtons: ${Object.keys(securePoints.buttons)}`);
@@ -45,7 +49,6 @@ Ext.define('Coon.uielement.component.UiCustomController', {
                         }
                     });
             }
-            // console.timeEnd('UiCustomController.buttons');
         }, this);
     },
 
@@ -94,6 +97,7 @@ Ext.define('Coon.uielement.component.UiCustomController', {
         Coon.util.copyToClipboard(url);
         Ext.toast('Ссылка скопирована в буфер обмена!');
     },
+
     applyRestrictions(map) {
         Coon.security.Manager.sync({map, component: this.getView()});
     },
@@ -107,4 +111,18 @@ Ext.define('Coon.uielement.component.UiCustomController', {
         const map = ctx.toJSON().map;
         return {buttons: map && map.buttons};
     },
+
+    getTraceBuffer() {
+        if (!this.locals.traceBuffer) {
+            this.locals.traceBuffer = Ext.create('Coon.ringBuffer', {length: 1000});
+        }
+        return this.locals.traceBuffer;
+    },
+
+    isTracePluginsEnabled() {
+        return Boolean(
+            Coon.setup.get('trace.cpPlugins')
+        );
+    },
+
 });

package/src/uielement/component/UiCustomPanel.js

@@ -4,12 +4,30 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
     xtype: 'UiCustomPanel',
     uses: [],
     requires: [
-        'Coon.uielement.component.UiCustomController'
+        'Coon.uielement.component.UiCustomController',
+        'Coon.uielement.plugin.CustomPanelPlugin',
+        'Coon.uielement.component.UiCustomPanelTraceWindow'
     ],
     controller: {type: 'UiCustomController'},
     viewModel: {type: 'UiCustomPanelViewModel'},
 
     keyMap: {
+        'Ctrl+Shift+Alt+F8': {
+            handler(_, view) {
+                const scope = view.getController();
+                if (!scope) {
+                    return;
+                }
+                const win = Ext.create({xtype: 'UiCustomPanelTraceWindow'});
+                if (win.isTraceEnabled(scope)) {
+                    const traceBuffer = scope.getTraceBuffer();
+                    win.down('grid')
+                        .getStore()
+                        .loadData(traceBuffer.getElements());
+                    win.show();
+                }
+            },
+        },
         'Ctrl+Alt+U': {
             handler: function(_, scope) {
                 const inputParameters = scope.getController().inputParameters().map((el) => el.name);

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/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/util.js

@@ -534,7 +534,21 @@ Ext.define('Coon.util', {
 
     isTypeIn(data, types) {
         return Array.isArray(types) &&
-            types.included(Coon.util.typeOf(data));
+            types.includes(Coon.util.typeOf(data));
+    },
+
+    runIfTypeIn(data, types, trueFn, falseFn) {
+        if (Coon.util.isTypeIn(data, types)) {
+            if (typeof trueFn === 'function') {
+                return trueFn(data);
+            } else {
+                return data;
+            }
+        } else {
+            if (typeof falseFn === 'function') {
+                return falseFn(data);
+            }
+        }
     },
 
     typeEqual(src, dst) {
@@ -629,14 +643,21 @@ Ext.define('Coon.util', {
      * @param {*} scope context
      * @returns
      */
-    bindMethods(methods, from, to, scope) {
+    bindMethods(methods, from, to, scope, force) {
+        if (typeof methods === 'string') {
+            methods = [methods];
+        }
         if (!Array.isArray(methods) || !Ext.isObject(from) || !Ext.isObject(to)) {
             return;
         }
         methods.forEach((name) => {
             const method = from[name];
             if (typeof method === 'function') {
-                to[name] = method.bind(scope || from);
+                if (force) {
+                    to[name] = method.bind(scope || from);
+                } else if (!to[name]) {
+                    to[name] = method.bind(scope || from);
+                }
             }
         });
     },

package/src/version.js

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

package/src/common/field/checkbox/RoundCheckbox.js

@@ -1,5 +0,0 @@
-Ext.define('Coon.common.field.checkbox.RoundCheckbox', {
-    extend: 'Ext.form.field.Checkbox',
-    cls: 'RoundCheckbox',
-    xtype: ['roundcheckbox', 'RoundCheckbox'],
-});

package/src/common/field/checkbox/RoundCheckbox.scss

@@ -1,48 +0,0 @@
-.x-form-fieldCheckbox {
-  .x-form-field {
-    position: relative;
-  }
-  
-  .x-form-field label {
-    background-color: #fff;
-    border: 1px solid #ccc;
-    border-radius: 50%;
-    cursor: pointer;
-    height: 28px;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 28px;
-  }
-  
-  .x-form-field label:after {
-    border: 2px solid #fff;
-    border-top: none;
-    border-right: none;
-    content: "";
-    height: 6px;
-    left: 7px;
-    opacity: 0;
-    position: absolute;
-    top: 8px;
-    transform: rotate(-45deg);
-    width: 12px;
-  }
-  
-  .x-form-field input[type="checkbox"] {
-    visibility: hidden;
-  }
-  
-  .x-form-field input[type="checkbox"]:checked + label {
-    background-color: #66bb6a;
-    border-color: #66bb6a;
-  }
-  
-  .x-form-field input[type="checkbox"]:checked + label:after {
-    opacity: 1;
-  }
-  
-  .x-form-item-body, .x-form-cb-wrap-inner {
-    margin: 0 auto;
-  }
-}

package/src/nav/MenuLoader.js

@@ -1,23 +0,0 @@
-Ext.define('Coon.nav.MenuLoader', {
-    singleton: true,
-
-    isLoaded: false,
-
-    load() {
-        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
-            .then((data) => {
-                if (Array.isArray(data.list)) {
-                    this.uiElementMap = data.list.reduce();
-                }
-                this.isLoaded = true;
-            });
-    },
-
-    get() {
-
-    },
-
-    isValidMenuItem(uiEmentId) {
-        return this.uiElementMap.has(uiEmentId);
-    },
-});

package/src/report/plugin/grid/ExportReportDataToFilePlugin.md

@@ -1,7 +0,0 @@
-**спецификация:**
-
-входные параметры:
-
-- exportFileFormat [xls/pdf]
-- allowUserSelectColumnsToUpload
-- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)