ru.coon 2.6.20 → 2.6.22

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# Version 2.6.22, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a580a8a4150b16d4f73ad7a4c1689d610822ee10)
+* ## Fixes
+* <span style='color:red'> loadData on SimplestReportCombo CRM-8429</span> ([e88546], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e88546f3413c2aa5520453b04abe000f4345bfea))
+
+* update: CHANGELOG.md ([c765e5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c765e541f9875b873ba2ecffb85f2284845e217b))
+
+# Version 2.6.21, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6f24834f0ffadd1fcf91e6545544a0e6db569481)
+* ## Features
+* <span style='color:green'>feat: HT-8139: refactoring</span> ([e0404c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0404c9c462d41b8a68eefe90d4204d9f12ab92d))
+* <span style='color:green'>feat: HT-8139: validate function call after dialog on close window</span> ([8eec24], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eec24fb0dcad82d6ce2fcd3c81d1bee92261bdb))
+
+* ## Fixes
+* <span style='color:red'>Fix:HT-8128 Fix groupButton property in CopyRowsFromGridConfigPanel</span> ([7fc721], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7fc721f71b53faa54c451645c1c03f4cc5d4ec23))
+* <span style='color:red'> Added "requires". Related to TR-63848.</span> ([1d6623], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1d66232357d6fc3d3e7a0dabad7183da4aac41ad))
+
+* refactoring UnifiedButtonToolbarPlugin ([2db2e5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2db2e5926168f46feabe6bf65ea709f26c546a7e))
+* upd ([22b8d8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22b8d81d9172f57072ac04a8e28017b3ed67ec0d))
+* up extjs_iconpack version ([7fb046], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7fb04651c866be77a8165800b6625f6675188f50))
+* update: CHANGELOG.md ([50ce89], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/50ce8936ea4f63c17b4af73991a600bfb1e9f0b2))
+
 # Version 2.6.20, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1d42d4ab7a1038b842d1e06e9cc352e268f16b0f)
 * ## Features
 * <span style='color:green'>feat: HT-8139: validate function call always on save</span> ([1f2415], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1f2415782cd840069c6600c5598ce353387e1d6c))
@@ -10,6 +30,9 @@
 * <span style='color:green'>feat: HT-8044 ExportReportDataToFilePlugin add exportConfig field</span> ([0df785], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0df785630853bcaf2291476fd7007f9a29761d63))
 * <span style='color:green'>feat: HT-8145: remove and set table view empty text on load / before load</span> ([e14b0b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e14b0b784256fc854be3d042bb695575eac83269))
 
+* ## Fixes
+* <span style='color:red'> BFL-11383 editing values setting in ReportLookupCombo</span> ([25f19c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/25f19c68cf394733dd397e0445669f755c2fd045))
+
 * update extjs_iconpack ([648132], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/648132fadfa22e609d17317e40aee2e99ac289ca))
 * update: CHANGELOG.md ([7b85e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7b85e26648ab43868b4b1db32f11fb04113645dc))
 

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.6.20",
+  "version": "2.6.22",
   "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.20",
+    "extjs_iconpack": "1.3.21",
     "json5": "2.2.3",
     "object-hash": "^3.0.0",
     "sigma-printjs": "^1.0.1",

package/src/common/panel/SelectIconClassPanel.js

@@ -5,6 +5,7 @@
 Ext.define('Coon.common.panel.SelectIconClassPanel', {
     extend: 'Ext.tab.Panel',
     xtype: 'SelectIconClassPanel',
+    requires: ['Iconpack.modal.Icons'],
     cls: 'SelectIconClassPanel',
     title: 'Выберите подходящий значок',
     width: 1080,

package/src/report/component/ReportLookupCombo.js

@@ -98,9 +98,9 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
         this.setValue = function(value) {
             this._setValue(value);
             if (!this._inited && value) {
-                this._inited = true;
                 this.loadReportData(value);
             }
+            this._inited = true;
         };
         if (Ext.isObject(this.defaultParameters)) {
             this.setFilterDefaults(this.defaultParameters);

package/src/report/component/SimpleReportTag.js

@@ -239,7 +239,7 @@ Ext.define('Coon.report.component.SimpleReportTag', {
                 return typeof item === 'string' ? {name: item} : item;
             });
         this.store.getModel().addFields(newFields);
-        this.store.loadData(data, true);
+        this.store.loadData(data);
         this.store.fireEvent('load', this.store, this.store.getRange(), true);
         this.fireEvent('load', this, this.store);
         if (this.value) {

package/src/report/plugin/configPanel/CopyRowsFromGridConfigPanel.js

@@ -95,6 +95,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
         ];
     },
     setContext: function(context) {
+        this.callParent(arguments);
         const visibleFields = context && context.fields ? context.fields.filter((field) => field.visibleSwitch === true) : [];
         if (visibleFields && visibleFields.length) {
             Ext.ComponentQuery.query('[xtype="EditorJsField"]', this).forEach((cmp) => {
@@ -262,7 +263,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
                 ['xlsx', 'xlsx']
             ],
             fieldLabel: 'Отобразить редактор',
-            name: 'position',
+            local: true,
             allowBlank: true,
             listeners: {
                 change: this.onChangeFormat.bind(this),

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -3,11 +3,37 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
     alias: 'plugin.UnifiedButtonToolbarPlugin',
     uses: [],
     controller: null,
-    windowClose: false,
+    isWindowClose: false,
     compareCash: false,
     configurePanelWizardForFormEditor: 'UnifiedButtonToolbarPluginConfigPanelFormEditor',
     suspendBeforeCloseEvent: false,
 
+    callMethod(method, defValue) {
+        if (typeof method === 'string') {
+            method = this.getMethod(method);
+        }
+        if (!method) {
+            return defValue;
+        }
+        try {
+            const res = method.call(this.controller);
+            if (res instanceof Promise) {
+                return res;
+            } else {
+                return Promise.resolve(res);
+            }
+        } catch (e) {
+            return Promise.reject(e);
+        }
+    },
+
+    getMethod(methodName) {
+        return methodName &&
+            this.controller[methodName] &&
+            typeof this.controller[methodName] === 'function' &&
+            this.controller[methodName];
+    },
+
     init: function(view) {
         this.controller = view && view.getController();
         this.controller.on('generateHash', this.generateHash, this);
@@ -23,6 +49,13 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
             dock: this.dock,
             items: [
                 '->',
+                {
+                    xtype: 'button',
+                    reference: 'standardSaveButton',
+                    text: 'Сохранить',
+                    ui: 'orange-button',
+                    handler: this.save.bind(this, false),
+                },
                 {
                     xtype: 'button',
                     reference: 'standardCancelButton',
@@ -34,17 +67,12 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
                             window.close();
                         }
                     },
-                },
-                {
-                    xtype: 'button',
-                    reference: 'standardSaveButton',
-                    text: 'Сохранить',
-                    handler: this.save.bind(this, false),
                 }
             ],
         });
         view.addDocked(this.controller.unifiedButtonToolbar, this.dock === 'bottom' ? null : 0);
     },
+
     onBeforeCloseWindow(win) {
         const cp = win.down('UiCustomPanel');
         if (cp) {
@@ -57,6 +85,7 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
         this.save(true);
         return false;
     },
+
     callDialog() {
         Ext.Msg.show({
             title: 'Сохранить изменения?',
@@ -68,98 +97,86 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
                 cancel: 'Вернуться',
             },
             icon: Ext.Msg.QUESTION,
-            fn: function(btn) {
-                if (btn === 'yes') {
-                    this.callSaveHandler(true);
-                } else if (btn === 'no') {
-                    this.suspendBeforeCloseEvent = true;
-                    this.closeWindow();
-                }
-            },
+            fn: this.confirmHandler,
             scope: this,
         });
     },
+
+    confirmHandler(btn) {
+        if (btn === 'yes') {
+            return this.callValidate()
+                .then((valid) => valid && this.callSaveHandler(true));
+        }
+        if (btn === 'no') {
+            this.suspendBeforeCloseEvent = true;
+            this.closeWindow();
+        }
+    },
+
     closeWindow() {
         this.controller.getView().up('WindowWrap').close();
     },
-    save(windowClose) {
-        this.windowClose = windowClose;
-        this.callPrepareBeanHandler();
+
+    save(isWindowClose) {
+        this.isWindowClose = isWindowClose;
+        this.compareCash = true;
+        this.callMethod(this.prepareBeanHandlerName);
+    },
+
+    callValidate() {
+        return this.callMethod(
+            this.validateBeanHandlerName,
+            Promise.resolve(true)
+        ).catch((error) => {
+            Coon.log.error(error);
+            Ext.Msg.alert('ошибка функции валидации');
+            throw error;
+        });
     },
+
     async generateHash(params) {
-        if (params && Ext.isObject(params)) {
-            if (this.compareCash === true) {
-                this.compareCash = false;
+        if (!Ext.isObject(params)) {
+            if (this.isWindowClose) {
+                this.suspendBeforeCloseEvent = true;
+                this.closeWindow();
+            }
+            return;
+        }
+        if (this.compareCash !== true) {
+            this.controller.savedDataHash = Coon.util.generateHashFromObj(params);
+            return;
+        }
 
-                if (
-                    this.validateBeanHandlerName &&
-                    this.controller[this.validateBeanHandlerName] &&
-                    typeof this.controller[this.validateBeanHandlerName] === 'function'
-                ) {
-                    const result = this.controller[this.validateBeanHandlerName].call(this.controller);
-                    if (result instanceof Promise) {
-                        const isError = await result.catch(() => 'error');
-                        if (isError === 'error') {
-                            return false;
-                        }
-                    } else {
-                        if (result !== true) {
-                            return false;
-                        }
-                    }
-                }
-                const currentHash = Coon.util.generateHashFromObj(params);
-                if (this.controller.savedDataHash !== currentHash) {
-                    if (this.windowClose) {
-                        this.callDialog();
-                    } else {
-                        this.callSaveHandler();
-                    }
-                } else if (this.windowClose) {
-                    this.suspendBeforeCloseEvent = true;
-                    this.closeWindow();
-                }
+        this.compareCash = false;
+        if (!this.isWindowClose) {
+            const valid = await this.callValidate();
+            if (!valid) {
+                return;
+            }
+        }
+        const currentHash = Coon.util.generateHashFromObj(params);
+        if (this.controller.savedDataHash !== currentHash) {
+            if (this.isWindowClose) {
+                this.callDialog();
             } else {
-                this.controller.savedDataHash = Coon.util.generateHashFromObj(params);
+                this.callSaveHandler();
             }
-        } else if (this.windowClose) {
+        } else if (this.isWindowClose) {
             this.suspendBeforeCloseEvent = true;
             this.closeWindow();
         }
     },
-    callPrepareBeanHandler(compareCash = true) {
-        if (this.prepareBeanHandlerName &&
-            this.controller[this.prepareBeanHandlerName] &&
-            typeof this.controller[this.prepareBeanHandlerName] === 'function') {
-            this.compareCash = compareCash;
-            this.controller[this.prepareBeanHandlerName].call();
-        }
-    },
-    async callSaveHandler(closeAfterSave) {
-        if (
-            this.saveHandlerName &&
-            this.controller[this.saveHandlerName] &&
-            typeof this.controller[this.saveHandlerName] === 'function'
-        ) {
-            const result = this.controller[this.saveHandlerName].call(this.controller);
-            if (result instanceof Promise) {
-                result.then(() => {
-                    this.controller[this.prepareBeanHandlerName].call(this.controller);
-                });
-                const isError = await result.catch(() => 'error');
-                if (isError === 'error') {
-                    closeAfterSave = false;
-                }
-            } else {
-                if (result !== true) {
-                    closeAfterSave = false;
+
+
+    callSaveHandler(closeAfterSave) {
+        return this.callMethod(this.saveHandlerName)
+            .then(() => {
+                if (closeAfterSave) {
+                    this.suspendBeforeCloseEvent = true;
+                    this.closeWindow();
                 } else {
-                    this.controller[this.prepareBeanHandlerName].call(this.controller);
+                    this.callMethod(this.prepareBeanHandlerName);
                 }
-            }
-            if (closeAfterSave) {
-                this.closeWindow();
-            }
-        }
+            });
     },
 });

package/src/version.js

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

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)