ru.coon 2.5.44 → 2.5.45

package/CHANGELOG.md

@@ -1,4 +1,15 @@
+# Version 2.5.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1e28ba95e77bbe4be40d19ea9fde58a74fbb645)
+* ## Fixes
+* <span style='color:red'> hot-fix: move EditorJs to coon from project</span> ([12daf8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12daf8abb9dbaf48910870616b0e6d52f3b2bbfd))
+
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/util.js5a11846bc2f75dd40b3c0f2239047d95f1a9371c))
+* BFL-9850 Ошибка при сохранении пункта меню ([270e31], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/270e3170b5a70b306591730dce53023dcebf6f34))
+* update: CHANGELOG.md ([8b0186], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b0186d787ec77ad2a4dfc211e85c8ffadee6559))
+
 # Version 2.5.44, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0c4d4a663ae3451dec321c0d68bf1d5c8d70ff58)
+* ## Fixes
+* <span style='color:red'> HT-7469: commit store state on doInit action. This method remove all modified records from store state</span> ([34c025], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/34c02583013b66314a74c2fbc9512f04f218d85e))
+
 * hotfix Coon.Function.executeComponentDoInit ([c9e04c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c9e04c22329f1d7822b91a47eca899c6f6e7f95e))
 * update: CHANGELOG.md ([f47bce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f47bce91314446c8f88961ba976fc132e11318d0))
 
@@ -39,6 +50,7 @@
 * <span style='color:red'>fix</span> ([5400c1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5400c17b624f78acfa1dbe8c27742e7a1f4b1cc1))
 * <span style='color:red'> Переделан механизм добавления меню в кнопку "Поиск"</span> ([0437f3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0437f3f77c410d545f65d75516091db6ba41ad80))
 
+* CRM-7853 ParameterizedReportCombo исправлена ошибка отображения параметров поиска ([702d8a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/702d8a5a99970682b0ad3ac50112553685b27e34))
 * revert to bf9339051130805e551f48ce07bd5bac3d49d140 ([80394d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80394d8e7b64a12c3e137d74661c529d6162004c))
 * update: CHANGELOG.md ([14b820], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/14b8208316d9994deafbbd54ccab2fdae4900e74))
 

package/package.json

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

package/src/chart/editor/CoonChartEditorController.js

@@ -172,7 +172,7 @@ Ext.define('Coon.chart.editor.CoonChartEditorController', {
     },
 
     getReportFieldsData(reportId) {
-        return Coon.util.promisifyCmd('command.LoadDynamicReportCommand', {reportId: reportId});
+        return Coon.util.promisifyCmd({command: 'command.LoadDynamicReportCommand', params: {reportId: reportId}});
     },
 
     getCommandsList() {

package/src/common/component/editor/CharacteristicGridEditor.js

@@ -711,6 +711,7 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
      */
     clear: function() {
         this.store.removeAll();
+        this.store.commitChanges();
         this.typeMap.clear();
         this.dataLoaded = false;
         if (this.factory) {

package/src/common/field/EditorJs.js

@@ -0,0 +1,91 @@
+Ext.define('Coon.common.field.EditorJs', {
+    extend: 'Ext.Component',
+    xtype: 'EditorJs',
+    cls: 'EditorJs',
+    config: {
+        value: '',
+        name: '',
+    },
+    countColumns: 1,
+    twoWayBindable: ['value', 'countColumns'],
+
+    margin: '40 0 0 0',
+
+    listeners: {
+        boxready: function() {
+            this.renderEditor();
+        },
+        beforedestroy: function() {
+            if (this.editor) {
+                Ext.dom.Query.select('[data-id="' + this.getId() + '"]').forEach((elem) => {
+                    elem.remove();
+                });
+                typeof this.editor.destroy === 'function' && this.editor.destroy();
+            }
+        },
+    },
+    setCountColumns: function(value) {
+        // console.log(this.editor,value)
+        this.countColumns = value;
+    },
+    getCountColumns: function() {
+        return this.countColumns;
+    },
+    setValue: function(value) {
+        if (this.editor && typeof this.editor.render === 'function' && value) {
+            this.editor.render(JSON.parse(value));
+        }
+        this.value = value;
+    },
+
+    getValue: function() {
+        return this.editor && typeof this.editor.save === 'function' && this.editor.save();
+    },
+
+    renderEditor: function() {
+        const me = this;
+        this.editor = new Ext.xEditorJS({
+            logLevel: 'ERROR',
+            tools: {
+                table: {
+                    class: Ext.xTable,
+                    inlineToolbar: false,
+                    config: {
+                        rows: 1,
+                        cols: this.getCountColumns(),
+                        dataTarget: this.getId(),
+                    },
+                },
+            },
+            i18n: {
+                messages: {
+                    tools: {
+                        table: {
+                            'Merge Cells': 'Объеденить ячейки',
+                            'Divide Cell': 'Разъеденить ячейки',
+                            'Insert Column On Right': 'Добавить колонку справа',
+                            'Insert Row Below': 'Добавить строку ниже',
+                            'Remove Column': 'Удалить колонку',
+                            'Remove Row': 'Удалить строку',
+                            'Cell Color': 'Стили ячейки',
+                            'Header Row': 'Заголавная строка',
+                            'Header Column': 'Заглавная колонка',
+                        },
+                    },
+                },
+            },
+            holder: this.getId(),
+            onChange: (api, event) => {
+                api.saver.save().then((data) => {
+                    me.value = JSON.stringify(data);
+                });
+            },
+            onReady: () => {
+                me.setValue(me.value);
+                if (me.getEl() && me.getEl().dom) {
+                    Ext.dom.Query.select('[data-item-name="paragraph"]', me.getEl().dom).forEach((el) => el.style.display = 'none');
+                }
+            },
+        });
+    },
+});

package/src/common/field/EditorJs.scss

@@ -0,0 +1,41 @@
+.tc-table__color-palette, .tc-table__option_table {
+  z-index: 9999999 !important;
+}
+
+.codex-editor__redactor {
+  padding-bottom: 50px !important;
+}
+
+.EditorJs {
+  .ce-block {
+    max-width: 650px;
+    border: 1px solid #dddddd;
+  }
+
+  .codex-editor__redactor {
+    padding-bottom: 50px !important;
+  }
+
+  .ce-block__content {
+    margin: 5px 0 0 50px;
+  }
+
+  .ce-toolbar__content {
+    margin: 0;
+  }
+
+  .ce-toolbar__actions {
+    left: 0;
+  }
+
+  .tc-editor {
+    padding: 0 10px 10px 10px;
+  }
+
+  .tc-table__container {
+    padding: 40px 2px 16px 40px;
+  }
+  .codex-editor--narrow .ce-toolbox .ce-popover{
+    left: 0;
+  }
+}

package/src/common/field/EditorJsField.js

@@ -0,0 +1,36 @@
+Ext.define('Coon.common.field.EditorJsField', {
+    extend: 'Ext.form.FieldContainer',
+    xtype: 'EditorJsField',
+    config: {
+        value: '',
+        name: '',
+    },
+    countColumns: 1,
+    twoWayBindable: ['value', 'countColumns'],
+    layout: {
+        type: 'hbox',
+        align: 'stretch',
+    },
+
+    initComponent: function() {
+        this.editor = Ext.create('Coon.common.field.EditorJs', {overflowY: true, width: '100%'});
+        this.items = [
+            {height: 40},
+            this.editor
+        ];
+        this.callParent();
+    },
+    setCountColumns: function(value) {
+        this.editor && this.editor.setCountColumns(value);
+    },
+    getCountColumns: function() {
+        return this.countColumns;
+    },
+    setValue: function(value) {
+        this.editor && this.editor.setValue(value);
+    },
+
+    getValue: function() {
+        return this.editor && this.editor.getValue();
+    },
+});

package/src/report/component/ParameterizedReportCombo.js

@@ -98,8 +98,8 @@ Ext.define('Coon.report.component.ParameterizedReportCombo', {
             const memberFn = Ext.applyIf(this.memberFn || {}, {
                 getLastOptions: function() {
                     const data = [];
-                    const searchParamsConfig = !Ext.isEmpty(this.getSearchParams()) ?
-                        this.getSearchParams() :
+                    const searchParamsConfig = !Ext.isEmpty(this.combo.getSearchParams()) ?
+                        this.combo.getSearchParams() :
                         Coon.report.component.ParameterizedReportCombo.searchRules;
                     for (let i = 0; i < searchParamsConfig.length; i++) {
                         const obj = searchParamsConfig[i];

package/src/report/component/ReportLookupCombo.js

@@ -262,11 +262,13 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
         );
         this.disable();
         return Coon.util.promisifyCmd(
-            'command.GetDynamicReportDataCommand',
             {
-                reportId: this.reportId,
-                parameterList: this.prepareParams(parameters),
-                necessaryFields: this.useNecessaryFields && this.getReportFields(),
+                command: 'command.GetDynamicReportDataCommand',
+                params: {
+                    reportId: this.reportId,
+                    parameterList: this.prepareParams(parameters),
+                    necessaryFields: this.useNecessaryFields && this.getReportFields(),
+                },
             }
         ).then((result) => {
             if (this.destroyed) {

package/src/report/component/ReportPickerLookupCombo.js

@@ -444,7 +444,7 @@ Ext.define('Coon.report.component.ReportPickerLookupCombo', {
         if (this.reportConfig) {
             return Promise.resolve(this.reportConfig);
         }
-        return Coon.util.promisifyCmd('command.LoadDynamicReportCommand', {reportId: this.reportId})
+        return Coon.util.promisifyCmd({command: 'command.LoadDynamicReportCommand', params: {reportId: this.reportId}})
             .then((config) => {
                 this.reportConfig = config;
                 return this.reportConfig;

package/src/util.js

@@ -18,11 +18,25 @@ Ext.define('Coon.util', {
         return Ext.isObject(cmd) && cmd.isCommand;
     },
 
+    isCommandAlias(cmd) {
+        return typeof cmd === 'string' && typeof Ext.ClassManager.getByAlias(cmd) === 'function';
+    },
+
     promisifyCmd(cls, ...args) {
-        const command = Coon.util.isCommand(cls) ? cls : Ext.create(cls, {processError: true});
+        let alias = cls;
+        if (Ext.isObject(cls)) {
+            alias = cls.command;
+            cls.getParamsFromObject = true;
+        }
+        let command;
+        command = Coon.util.isCommand(alias) && alias;
+        command = Coon.util.isCommandAlias(alias) && Ext.create(alias, {processError: true})
+        if (!command) {
+            throw new Error('promisifyCmd command in invalid!')
+        }
         return new Promise((resolve, reject) => {
-            if (Ext.isObject(args[0])) {
-                command.executeWith(args[0]);
+            if (cls.getParamsFromObject) {
+                command.executeWith(cls.params);
             } else {
                 command.execute(...args);
             }

package/src/version.js

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