ru.coon 2.5.48 → 2.5.50

package/CHANGELOG.md

@@ -1,4 +1,25 @@
+# Version 2.5.50, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b79597948d4412d8613b028e5e07e49cfb173eb4)
+* ## Features
+* <span style='color:green'>feat: HT-7346: rename plugin</span> ([e06f2c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e06f2cd09c83890ca955c6a11d3071a8d31a1528))
+
+* update: CHANGELOG.md ([9ca215], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9ca2159b8222b4953516c7720fc9f5dbe03e4337))
+
+# Version 2.5.49, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/322a8954fd81ce96ca3e60a23d7b46b4659f839b)
+* ## Features
+* <span style='color:green'>feat: HT-7346: select dock position (top or bottom)</span> ([45db87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/45db8784c5594ea4add6dc701cd5deb0a2e592e3))
+* <span style='color:green'>feat: HT-7346: add plugin</span> ([614610], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6146105ce74a3c4ab946da32dac3ab16aac848af))
+* <span style='color:green'>feat: HT-7346: add plugin</span> ([e27670], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e27670eb8953cde6b5825b123d0f03d553c097a4))
+
+* ## Fixes
+* <span style='color:red'>fix Coon.util.promisifyCmd
+fix ReportPanel.loadData - abort previous request</span> ([03cfbd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/03cfbdf8eabc0a6fde879fa2ce52bd5126a823ee))
+
+* update: CHANGELOG.md ([d298b4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d298b44d4f63889dc665577ca11e622bfb176422))
+
 # Version 2.5.48, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ab1fb66dd225271b18992c928a288a9d5115ff7b)
+* ## Fixes
+* <span style='color:red'>fix SimpleReportTag styles</span> ([1b1713], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1b1713313b25b5724e465c418daf5b1db3b803da))
+
 * add decimal-light - arbitrary-precision Decimal type for JavaScript
 fix Coon.format.MoneyFormat, zero always format as positive value ([09a4ad], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/09a4ad9879f025371db56475252ec93eeb52b265))
 * HT-7447 feat: возможность создавать свойства команды с описанием ([cc129c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cc129c3265992db5f859f9e32fdc95cd8a3ad88f))

package/package.json

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

package/src/report/component/ReportPanel.js

@@ -896,10 +896,11 @@ Ext.define('Coon.report.component.ReportPanel', {
                 }
             }
         }
+        const store = this.grid.getStore();
+        store.getProxy().abort();
         const command = typeof this.getStoreDataCommand === 'function' && this.getStoreDataCommand({});
         if (command) {
             command.on('complete', function(response) {
-                const store = this.grid.getStore();
                 if (!store.lastOptions) {
                     store.lastOptions = {};
                 }
@@ -917,8 +918,8 @@ Ext.define('Coon.report.component.ReportPanel', {
                 invalidateCache,
             });
         } else {
-            if (this.grid.getStore() != null) {
-                this.grid.getStore().load({
+            if (store != null) {
+                store.load({
                     params: {
                         parameterList: Ext.encode(parameterList),
                         reportId: this.reportId,

package/src/report/component/SimpleReportTag.scss

@@ -5,7 +5,7 @@
     overflow-x: hidden;
   }
   .x-tagfield-item{
-    margin: 0 6px 6px 0;
+    margin: 4px 6px 2px 0;
     &.mark-to-remove{
       background-color: #ef5350;
     }
@@ -15,4 +15,8 @@
       padding-bottom: 3px;
     }
   }
+
+  .x-placeholder-label {
+    display: none;
+  }
 }

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -0,0 +1,99 @@
+Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPluginn', {
+    extend: 'Ext.AbstractPlugin',
+    alias: 'plugin.UnifiedButtonToolbarPluginn',
+    uses: [],
+    controller: null,
+    windowClose: false,
+    compareCash: false,
+    configurePanelWizardForFormEditor: 'UnifiedButtonToolbarPluginnConfigPanelFormEditor',
+
+    init: function(view) {
+        this.controller = view && view.getController();
+        this.controller.on('generateHash', this.generateHash, this);
+        this.controller.callDialog = this.callDialog.bind(this);
+        const window = view.up('WindowWrap');
+        if (window) {
+            window.on('beforeclose', this.onBeforeCloseWindow, this);
+        }
+        this.controller.standardToolbar = Ext.create('Ext.toolbar.Toolbar', {
+            dock: this.dock,
+            items: [
+                '->',
+                {
+                    xtype: 'button',
+                    reference: 'standardSaveButton',
+                    text: 'Сохранить',
+                    handler: this.save.bind(this, false),
+                }
+            ],
+        });
+        if (this.dock === 'bottom') {
+            view.dockedItems.add(this.controller.standardToolbar);
+        } else {
+            view.dockedItems.insert(0, this.controller.standardToolbar);
+        }
+    },
+    onBeforeCloseWindow() {
+        this.save(true);
+    },
+    callDialog() {
+        Ext.Msg.show({
+            title: 'Сохранить изменения?',
+            message: 'Были обнаружены изменения, сохранить их?',
+            buttons: Ext.Msg.YESNOCANCEL,
+            icon: Ext.Msg.QUESTION,
+            fn: function(btn) {
+                if (btn === 'yes') {
+                    this.callSaveHandler(true);
+                } else if (btn === 'no') {
+                    this.closeWindow();
+                }
+            },
+        });
+    },
+    closeWindow() {
+        this.controller.getView().up('WindowWrap').close();
+    },
+    save(windowClose) {
+        this.windowClose = windowClose;
+        if (this.prepareBeanHandlerName &&
+            this.controller[this.prepareBeanHandlerName] &&
+            typeof this.controller[this.prepareBeanHandlerName] === 'function') {
+            this.compareCash = true;
+            this.controller[this.prepareBeanHandlerName].call();
+        }
+    },
+    generateHash(params) {
+        if (params && Ext.isObject(params)) {
+            if (this.compareCash === true) {
+                this.compareCash = false;
+                const currentHash = Coon.util.generateHashFromObj(params);
+                if (this.controller.savedDataHash !== currentHash) {
+                    if (this.windowClose) {
+                        this.callDialog();
+                    } else {
+                        this.callSaveHandler();
+                    }
+                }
+            } else {
+                this.controller.savedDataHash = Coon.util.generateHashFromObj(params);
+            }
+        }
+    },
+    async callSaveHandler(closeAfterSave) {
+        if (
+            this.saveHandlerName &&
+            this.controller[this.saveHandlerName] &&
+            typeof this.controller[this.saveHandlerName] === 'function'
+        ) {
+            if (this.controller[this.saveHandlerName] instanceof Promise) {
+                await this.controller[this.saveHandlerName].call(this.controller);
+            } else {
+                this.controller[this.saveHandlerName].call(this.controller);
+            }
+            if (closeAfterSave) {
+                this.closeWindow();
+            }
+        }
+    },
+});

package/src/uielement/plugin/configPanel/UnifiedButtonToolbarPluginConfigPanelFormEditor.js

@@ -0,0 +1,100 @@
+Ext.define('Coon.uielement.plugin.configPanel.UnifiedButtonToolbarPluginConfigPanelFormEditor', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.UnifiedButtonToolbarPluginConfigPanelFormEditor',
+    description: 'Добавляет стандартный тулбар',
+    viewModel: {
+        data: {
+            saveHandlerName: '',
+            prepareBeanHandlerName: '',
+            dock: 'bottom',
+        },
+    },
+    layout: {
+        type: 'vbox',
+        align: 'stretch',
+    },
+    items: [
+        {
+            xtype: 'pluginDescriptionLabel',
+            bind: {
+                value: '{description}',
+            },
+        },
+        {
+            xtype: 'comboBtnWrapper',
+            combobox: {
+                xtype: 'BaseComboBox',
+                fieldLabel: 'Функция сохранения данных',
+                labelWidth: 60,
+                flex: 1,
+                loadOnRender: false,
+                hideMode: 'offsets',
+                allowBlank: false,
+                store: 'codeHandlers',
+                bind: {
+                    value: '{saveHandlerName}',
+                },
+                valueField: 'id',
+                displayField: 'id',
+            },
+        },
+        {
+            xtype: 'comboBtnWrapper',
+            combobox: {
+                xtype: 'BaseComboBox',
+                fieldLabel: 'Функция подготовки данных для сохранения',
+                labelWidth: 60,
+                flex: 1,
+                loadOnRender: false,
+                hideMode: 'offsets',
+                allowBlank: false,
+                store: 'codeHandlers',
+                bind: {
+                    value: '{prepareBeanHandlerName}',
+                },
+                valueField: 'id',
+                displayField: 'id',
+            },
+        },
+        {
+            xtype: 'segmentedbutton',
+            allowMultiple: false,
+            reference: 'segmentDock',
+            bind: {
+                value: '{dock}',
+            },
+            items: [{
+                text: 'Отобразить внизу',
+                value: 'bottom',
+            }, {
+                text: 'Отобразить вверху',
+                value: 'top',
+            }],
+        }
+    ],
+    getData: function() {
+        return this.getConfiguration();
+    },
+    setData: function(data) {
+        data && this.doInit(data);
+    },
+    doInit: function(config) {
+        this.getViewModel().set('description', this.description);
+        for (const parameterName in config) {
+            if (!config.hasOwnProperty(parameterName) || parameterName === 'ptype') {
+                continue;
+            }
+            this.getViewModel().set(parameterName, config[parameterName]);
+        }
+    },
+    getConfiguration: function() {
+        const result = {};
+        const vm = this.getViewModel();
+        ['saveHandlerName', 'prepareBeanHandlerName', 'dock'].forEach((el) => {
+            if (vm.get(el)) {
+                result[el] = vm.get(el);
+            }
+        });
+        return result;
+    },
+});

package/src/util.js

@@ -37,10 +37,10 @@ Ext.define('Coon.util', {
             if (Ext.isObject(cmd) && (this.isCommandAlias(cmd.command) || this.isCommandClass(cmd.command))) {
                 args = cmd.params;
                 cmd.getParamsFromObject = true;
-                return Ext.create(cmd.command, {process: typeof cmd.process === 'boolean' ? cmd.process : true});
+                return Ext.create(cmd.command, {processError: typeof cmd.processError === 'boolean' ? cmd.processError : true});
             }
             if (this.isCommandAlias(cmd) || this.isCommandClass(cmd)) {
-                return Ext.create(cmd, {process: true});
+                return Ext.create(cmd, {processError: true});
             }
             throw new Error(`promisifyCmd error: this command is neither an alias nor a class`);
         };

package/src/version.js

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