ru.coon 2.7.2 → 2.7.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 2.7.3, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e9a311b868bd00ad5e46a868e7f0b829122ffa06)
+* refactoring ([1385c2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1385c2bf065c0e57f6d8484cf360a1201cdbb656))
+* update: CHANGELOG.md ([10bd16], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/10bd16df0b8d6d43c2a41f2651b8610c35dcd899))
+
 # Version 2.7.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b94df2c23f76552c5c626a4bfda4a317e33abff)
 * ## Features
 * <span style='color:green'>feat: HT-8199: trim string values in request</span> ([cfc709], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cfc709daacaad1522f4dff858e04966a758bcb6a))
@@ -6,6 +10,9 @@
 * update: CHANGELOG.md ([44e78b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44e78b830a9a374db90e2fc1554188c9154ce462))
 
 # Version 2.7.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9028ecb552a8341a78e6a7e0d2f9eee91554c2d0)
+* ## Fixes
+* <span style='color:red'>fix</span> ([abf529], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/abf5294343d6597b0e45303be0bb85c77db8bb65))
+
 * upd ([901f4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/901f4c345d1025ef8861b1b649d84590c6a6a7ec))
 * update: CHANGELOG.md ([1a5ea6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1a5ea663b234831a73ec046c23b951b71797481a))
 
@@ -168,6 +175,9 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
 * <span style='color:red'> HT-8036: remove override view config</span> ([f13055], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1305573f3761f2657e995310a79a7d75887c091))
 
 * update extjs_iconpack to 1.3.19 ([adff9d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/adff9d7411fad6a04e153065c9c472b080d7e719))
+* HT-7448 рефакторинг по замечаниям. ([786627], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/786627361a1236661118c9ec6d5ae7fdd89bcfe4))
+* HT-7448 удаление неиспользуемых компонентов ([3e25a3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e25a33e765403cb1eda1d16f80fce2c4b1e4cb0))
+* HT-7448 переделка layout панели конфигурировая плагина ExecuteCommandButtonPluginConfigPanel ([b922d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b922d4d984db425fea0ac2c660ecb7b4ddc97e51))
 * update: CHANGELOG.md ([f82d7f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f82d7f36520836cc6733ac936ef98bf0589b15d2))
 
 # Version 2.6.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5695d2c215ad6469aacd802ca46a536c81845c35)
@@ -198,6 +208,9 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
 * <span style='color:green'>feat: Добавлено редактирование значений по умолчанию для плагинов. Closes TR-67200.</span> ([cd9502], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cd950235c2b0180f2b73fb87dc3b05a4f5b397ae))
 
 *  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/report/component/settings/plugin/ReportFormPluginPanelController.jsb52d37cb6c33e6a74d2f3d7cae1654f93b60a2e1))
+* HT-7448 по умолчанию скрыта кнопка загрузки свойств команды в grid ([5328e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5328e27d49b2092fe75b5fbe5c8a7dea231402a7))
+* HT-7448 исправление найденной после мержа ошибки. ([e76d4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e76d4c3ada4813a01c2b10167a92f4cc808940d6))
+* HT-7448 исправление замечаний ([862d72], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/862d7293a4fb82c872b2d11b17cfbf47550756fc))
 * update: CHANGELOG.md ([bb6944], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb6944320af0388b296ad97429195c6188908738))
 
 # Version 2.6.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b7d5d8cd09bf94320d149f9cf3aa78ef27594a8)
@@ -226,6 +239,9 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
 * Revert "feat: Добавлено предупреждение при выборе дефолтной конфигурации плагина. Closes TR-67200."
 
 This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/312854f7d59d711c9921f394c6849d398e529e10))
+* HT-7448 Рефакторинг ExecuteCommandPluginConfigPanelFormEditor ([74a393], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/74a393cb2781622d4eafc981e153bd4a5edf7cdf))
+* HT-7448 Рефакторинг ExecuteCommandPluginConfigPanelFormEditor ([18090f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/18090f5c72e1595cb54e6ae7cf9e9645b9fec0e6))
+* HT-7448 Исправлена ошибка, возникающая в AceEditor в окне редактирования свойств команды. ([5b3f57], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5b3f57d189f98ccf55f169c3ad29db778b27570c))
 * HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([ff9d88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff9d88c6e8f12d59ea7fd4f8be344696670d13af))
 * update: CHANGELOG.md ([fed09b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fed09bab2391b2ef0adde36107c4c8e9f8e9ad32))
 
@@ -242,6 +258,7 @@ This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](
 * ## Features
 * <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([975be6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/975be69118652f7995b2bfd40e5a174deaa47c68))
 
+* HT-7448 Рефакторинг внешнего вида ExecuteCommandPluginConfigPanelFormEditor. Компонент для упрощения мапинга. ([3c3380], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3c33806c30b08c23a2b161543c3e11be94477902))
 * update: CHANGELOG.md ([d8027e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8027e3fe08b900d1cb6da3bfe688684b5764008))
 
 # Version 2.5.66, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4e253ae2e8836166212d3886d091d342673deaee)
@@ -269,7 +286,10 @@ This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](
 
 * remove unnecessary filterItemsOnRow property ([772f61], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/772f6190df8b958bd6ff97e5731a59971c9a11fc))
 * HT-7885 ([601a41], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/601a4199efef15290c161766431908ab8993862b))
+* HT-7448 Исправление вызова completeHandler и errorHandler в работе плагина репорта ExecuteCommandButtonPlugin ([ea4774], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ea477445f344d94c59b1116738b464ba49e79c57))
 * Update getDataFromForm function ([d79274], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d79274267b970ea0b4a31f1724d3dfc54d82d9d5))
+* HT-7448 Проверка результатов выполнения команды перед переносом данных во viewModel при работе ExecuteCommandPlugin ([c74d65], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c74d656fc1fb764b5dc24d5e96f1cf9b9f8ee27c))
+* HT-7448 исправление работы completeHandler и responseHandler в ExecuteCommandButtonPlugin ([23ee69], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/23ee69a6d1bb084cff6402e0cc4cc36c2a6c3c51))
 * HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([507490], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5074900afb170d9f11aa10de6549e05cef12f7cb))
 * Combine query in one row ([6fbb49], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6fbb496601a46bef0506b56d34d179d3d10148ca))
 * update: CHANGELOG.md ([2ec18c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2ec18ccddcb1d571ef6a1d00b9cde439355c8304))
@@ -419,6 +439,7 @@ fix ReportPanel.loadData - abort previous request</span> ([03cfbd], [link](http:
 * 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))
 * перенос чекбокса и работа с value ([c56525], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c5652553cca0934ec1549f6e0762f481161b2998))
+* HT-7448 Исправления по замечаниям код ревью ([8fbd95], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8fbd95f08c83c36817363401641fe4ae333ec02f))
 * исправление ошибок ([44fc10], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44fc1038ab848989c56bf51ad56933f5fe2f2535))
 * исправление ошибок ([fcc83e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fcc83e4aa4d85b241723c2fd1d317bafe5b44689))
 * доработка ([dbc2bf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dbc2bf69be0d31423c93275b01e320703823dbb2))
@@ -432,6 +453,7 @@ fix Coon.format.MoneyFormat, zero always format as positive value ([09a4ad], [li
 * <span style='color:red'>fix promisifyCmd
 fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler</span> ([f8c65b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f8c65b552adfb698809815fc5f2d80f3f5fdb5ee))
 
+* HT-7447 Рефакторинг CommandComboBox (компонента выбора команад). Рефакторинг настроек плагина ExecuteCommandPlugin ([636f06], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/636f06e2885d7830e2e48c8f95acf902407a8820))
 * update: CHANGELOG.md ([4d5a2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4d5a2ac3120c4aba6a672256fc7cc977014f3591))
 
 # Version 2.5.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a60918e34030d42d694153e8a86fa2c13c97e3a0)
@@ -451,6 +473,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 
 *  ([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))
+* HT-7448 доработка панели конфигурирования плагина ExecuteCommandButtonPluginConfigPanel ([69c652], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/69c652c2e69719a7ef5964a274c3be30c2980b85))
 * 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)
@@ -461,6 +484,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * <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))
+* HT-7448 Исправление работы кнопки "копировать" ([9ad7a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9ad7a853bc8753f768e401f068f2a72c9cd205ae))
 * update: CHANGELOG.md ([f47bce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f47bce91314446c8f88961ba976fc132e11318d0))
 
 # Version 2.5.43, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bc0bf6f30c6fa63c8af9ccfaa0ee75431bda6029)
@@ -472,6 +496,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * BFL-8607 Доработка редактора характеристики типа "Дата" ([20c221], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20c2210c3c15817168bf0a3465a219fe49f7d2fe))
 * BFL-8607 Доработка редактора характеристики типа "Дата" ([0c7529], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0c752984e1e82cdf68d9aa25413375319adfe30e))
 * Merge with develop ([2f0b72], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f0b7296a4764645e248dfe2f2e4d5399f695dc4))
+* HT-7448 рефакторинг грида конфигурирования параметров команды ([9f9005], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9f900557a6ce4364c47ae9c7c0881e00afedc071))
 * update: CHANGELOG.md ([892608], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/892608eb6ddd2ef85d205ba9e1e857aa27672320))
 
 # Version 2.5.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a6256f14a891eda0974a2af1ee2c108c8904feab)
@@ -488,12 +513,17 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 # Version 2.5.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/612fb7573419ad9857649f7211c8d7a56e52cdb4)
 * ## Features
 * <span style='color:green'>feat: Перенесен ShowReportEditorCreator из ISWE. Closes BFL-9446.</span> ([1d7ee3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1d7ee326527f9d14d332bb115bd68a15a7e9c22e))
+* <span style='color:green'>feat: HT-7448 пример рефакторинга</span> ([44f741], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44f7414c76e59454b0635c9b7f4982003adad8d0))
 * <span style='color:green'>feat: BFL-9521: init dependent form params anytime</span> ([2e5aa1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2e5aa16eeace7205cff9e01295f43d0f4ce956c6))
 
 * ## Fixes
+* <span style='color:red'>fix ExecuteCommandButtonPlugin</span> ([a5308e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a5308eb7b674a12e0b4d8665d2c9a939c7d33b80))
 * <span style='color:red'> BFL-9515 исправления по проверке безопасности фронтенда в части взаимодействия с iswe в iframe</span> ([f34b8f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f34b8fdf31285fd53f932dfe277e961ffa275fd0))
 * <span style='color:red'> postMessage origin fix. Closes BFL-9515.</span> ([21ab56], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/21ab56a1998efe4b6cd4e4d35337c8fbc5b47729))
 
+* HT-7448 перенос complete handler и error handler в табпанель ([833aab], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/833aab66900669e885cea97fd7fd614d83d10303))
+*  ([В пике], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/В пикер списка команд добавлен тултип в виде описания из класса команды.a90290c3aa288a6201af96a155874f8b4c51459c))
+*  ([В getA], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/В getAllCommandsList добавлено описание из класса команды.44653fabe5289074830acffedfd6494c463a9193))
 *  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/uielement/component/settings/UiCustomPanelEditorController.js9987a0e79de3a1fa5fa93216f0ffd4bdb50c59fc))
 * update: CHANGELOG.md ([958f76], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/958f76b4fca9844ca6bae88260580ff2340843e5))
 

package/package.json

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

package/src/command/ASyncBaseCommand.js

@@ -192,4 +192,8 @@ Ext.define('Coon.command.ASyncBaseCommand', {
     getLastParams: function() {
         return this.lastParams;
     },
+
+    commandProperties: function() {
+        return [];
+    },
 });

package/src/common/field/combo/CommandComboBox.js

@@ -14,4 +14,24 @@ Ext.define('Coon.common.field.combo.CommandComboBox', {
         const isValid = !!this.getStore().findRecord('description', value);
         return isValid || `команда ${value} не найдена!`;
     },
+    listConfig: {
+        itemTpl: [
+            '<div data-qtip="{ruDescription}"><b>{xtype}</b> : <i style="opacity:.8;font-size: 1rem;">{description}</i> </div>'
+        ],
+    },
+    /**
+     * Получение свойств выбранной команды
+     * @returns {*|*[]}
+     */
+    getProperties: function() {
+        const commandName = this.getValue();
+        let properties = [];
+        if (commandName) {
+            const fullSource = Ext.ClassManager.aliasToName['command.' + commandName];
+            properties = fullSource && Ext.ClassManager.classes[fullSource].prototype.commandProperties &&
+                Ext.ClassManager.classes[fullSource].prototype.commandProperties();
+        }
+
+        return properties || [];
+    },
 });

package/src/report/component/settings/ReportPropertiesGrid.js

@@ -48,6 +48,20 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
                 handler: 'deleteHandler',
                 reference: 'deleteButton',
                 disabled: true,
+            },
+            {
+                text: 'Загрузить свойства',
+                ui: 'blue-text-button-border',
+                handler: 'loadPropertiesHandler',
+                reference: 'loadPropertiesButton',
+                hidden: true,
+            },
+            {
+                text: '{}',
+                tooltip: 'Открыть в редакторе',
+                ui: 'blue-text-button-border',
+                handler: 'openInEditor',
+                reference: 'editorButton',
             }
         ],
     }],
@@ -83,6 +97,11 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
                 flex: 1,
                 editor: 'textfield',
             },
+            {
+                text: 'Описание',
+                dataIndex: 'description',
+                flex: 2,
+            },
             {
                 xtype: 'actioncolumn',
                 width: 50,
@@ -120,4 +139,7 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
             },
         }
     ],
+    listeners: {
+        boxready: 'onGridReady',
+    },
 });

package/src/report/component/settings/ReportPropertiesGridController.js

@@ -13,6 +13,11 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
         view.updateProperties = this.updateProperties.bind(this);
     },
 
+    onGridReady: function() {
+        const loadPropertiesSource = this.getView().loadPropertiesSource;
+        this.lookup('loadPropertiesButton').setHidden(!loadPropertiesSource);
+    },
+
     onSelectionChange: function(view, selection) {
         const deleteButton = this.lookup('deleteButton');
         deleteButton.setDisabled(Ext.isEmpty(selection));
@@ -66,11 +71,15 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
      * @param {Object[]} data
      */
     setData: function(data) {
+        if (this.getView().loadParametersSource) {
+            this.lastSource = this.getView().loadParametersSource.field.getValue();
+        }
         const store = this.getView().getStore();
         if (Ext.isFunction(store.loadData)) {
             store.reload();
             if (Ext.isArray(data)) {
                 store.loadData(data);
+                this.addDescriptions();
             }
         }
     },
@@ -145,6 +154,56 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
         this.updateProperties();
     },
 
+    loadPropertiesHandler: function() {
+        const grid = this.getView();
+        this.lastSource = grid.loadPropertiesSource && grid.loadPropertiesSource.field.getValue();
+        if (!this.lastSource) {
+            Coon.log.warn('Не выбрана команда!');
+        }
+        const properties = Ext.ClassManager.getByAlias('command.' + this.lastSource).prototype.commandProperties();
+
+        const dataForLoad = properties.map(function(property, i) {
+            const newProperty = {
+                sequenceNumber: i,
+                key: property.name,
+                description: property.description,
+            };
+            if (property.defaultValue) {
+                newProperty.value = property.defaultValue;
+            }
+            return newProperty;
+        }, this).filter((property) => {
+            return !grid.getStore().findRecord('key', property['key']);
+        });
+
+        grid.getStore().loadData(dataForLoad, true);
+    },
+
+    /**
+     * Добавление описаний к свойствам команды
+     */
+    addDescriptions: function() {
+        const grid = this.getView();
+        const commandCombo = grid.loadPropertiesSource && grid.loadPropertiesSource.field;
+        if (!commandCombo) {
+            return;
+        }
+        const command = commandCombo.getValue();
+        if (!command) {
+            return;
+        }
+
+        const descriptions = Ext.ClassManager.getByAlias('command.' + command).prototype.commandProperties().reduce((acc, property) => {
+            acc[property['name']] = property['description'];
+            return acc;
+        }, {});
+
+        Object.entries(descriptions).forEach(function([key, value]) {
+            const rec = grid.getStore().findRecord('key', key);
+            rec && rec.set('description', value, {dirty: false});
+        });
+    },
+
     /**
      * Открытие свойств параметра в редакторе кода
      */
@@ -157,7 +216,7 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
 
     /**
      * Загрузка изменений, внесенных в редакторе кода, в store.
-     * @param {Object} changes
+     * @param {Object} data
      */
     loadChangesFromEditor: function(data) {
         const store = this.getView().getStore();

package/src/report/component/settings/context/ReportFormContextParametersGrid.js

@@ -6,10 +6,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         'Coon.report.model.ReportNavigationContextBeanFields',
         'Coon.report.model.ComboValueWrapperFields',
         'Coon.report.model.ComboValueWrapper',
-        'Coon.report.model.ReportParameterMaintenanceBeanFields',
-        'Coon.report.model.ReportFieldMaintenanceBeanFields',
         'Coon.report.model.ReportNavigationContextBean',
-        'Coon.report.store.ReportNavigationContextStore',
         'Coon.report.plugin.grid.GridStoreDependency',
         'Coon.report.store.RefStore'
     ],
@@ -79,7 +76,9 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             }];
         }
 
-        this.store = Ext.create('Coon.report.store.ReportNavigationContextStore');
+        this.store = new Ext.data.Store({
+            fields: Coon.report.model.ReportNavigationContextBeanFields,
+        });
 
         const numEditor = Ext.create('Ext.form.field.Number', {
             allowDecimals: false,
@@ -99,8 +98,8 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
 
         this.valueEditor = Ext.create('Coon.common.field.combo.BaseComboBox', {
             loadOnRender: false,
-            displayField: Coon.report.model.ComboValueWrapperFields.$description,
-            valueField: Coon.report.model.ComboValueWrapperFields.$value,
+            displayField: 'description',
+            valueField: 'value',
             store: Ext.create('Coon.report.store.RefStore'),
             allowBlank: false,
         });
@@ -109,14 +108,13 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             allowBlank: false,
         });
 
-        const ns = Coon.report.model.ReportNavigationContextBeanFields;
         this.columns = {
             items: [
-                {required: true, text: '№ п/п', dataIndex: ns.$sortSequence, xtype: 'BigNumColumn', editor: numEditor, flex: .3},
+                {required: true, text: '№ п/п', dataIndex: 'sortSequence', xtype: 'BigNumColumn', editor: numEditor, flex: .3},
                 {
                     required: true,
                     text: 'Параметр',
-                    dataIndex: ns.$reportParameter,
+                    dataIndex: 'reportParameter',
                     xtype: 'hintColumn',
                     editor: paramEditor,
                 },
@@ -124,7 +122,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                     required: true,
                     text: 'Тип',
                     minWidth: 150,
-                    dataIndex: ns.$reportNavigationOptionContextSource,
+                    dataIndex: 'reportNavigationOptionContextSource',
                     xtype: 'hintColumn',
                     editor: this.typeEditor,
                     renderer: Coon.format.comboRenderer(this.typeEditor),
@@ -132,44 +130,49 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                 },
                 {
                     text: 'Значение',
-                    tooltip: 'название поля таблицы отчета',
-                    dataIndex: ns.$reportNavigationOptionContextSourceValue,
+                    tooltip: 'название поля таблицы отчета/название параметра отчета',
+                    dataIndex: 'reportNavigationOptionContextSourceValue',
                     xtype: 'hintColumn',
                     width: 130,
                     editor: this.valueEditor,
                     renderer: Ext.bind(function(value, meta, record) {
-                        const type = record.get(ns.$reportNavigationOptionContextSource);
+                        const type = record.get('reportNavigationOptionContextSource');
                         let visibleValue;
-                        const fieldsNS = Coon.report.model.ComboValueWrapperFields;
-                        let pos;
+
+                        let found;
                         if (type === 'FLD') {
-                            pos = this.fieldsStore.findExact(fieldsNS.$value, value);
-                            if (pos !== -1) {
-                                visibleValue = this.fieldsStore.getAt(pos).get(fieldsNS.$description);
-                            }
+                            found = this.fieldsStore.findRecord('value', value);
+                            visibleValue = found && found.get('description');
                         } else if (type === 'PRM') {
-                            pos = this.paramsStore.findExact(fieldsNS.$value, value);
-                            if (pos !== -1) {
-                                visibleValue = this.paramsStore.getAt(pos).get(fieldsNS.$description);
-                            }
+                            found = this.paramsStore.findRecord('value', value);
+                            visibleValue = found && found.get('description');
                         } else if (type === 'SELR' || type === 'ALLR' || type === 'RCRD' || type === 'MDFD' || type === 'CHCK') {
-                            for (let i = 0; i < this.storeForSELR.length; i++) {
-                                if (this.storeForSELR[i].value === value) {
-                                    visibleValue = this.storeForSELR[i].description;
-                                }
-                            }
+                            found = this.storeForSELR.find((obj) => obj.value === value);
+                            visibleValue = found && found.description;
                         }
                         return Coon.format.withHint(visibleValue);
                     }, this),
                 },
                 {
                     text: 'Значение по умолчанию',
-                    dataIndex: ns.$defaultValue,
+                    dataIndex: 'defaultValue',
                     xtype: 'hintColumn',
                     editor: valueDefaultEditor,
                     flex: .7,
                 },
-                {text: 'Обязательно', dataIndex: ns.$editable, xtype: 'checkcolumn', editable: true, flex: .35}
+                {
+                    text: 'Обязательно',
+                    dataIndex: 'editable',
+                    xtype: 'checkcolumn',
+                    editable: true,
+                    flex: .35,
+                },
+                {
+                    text: 'Описание',
+                    tooltip: 'Описание параметра отчета',
+                    dataIndex: 'description',
+                    xtype: 'hintColumn',
+                }
             ],
             defaults: {
                 sortable: true,
@@ -196,12 +199,12 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             });
         } else {
             this.on('beforeedit', function(plugin, context) {
-                if (context.field === ns.$sortSequence) {
+                if (context.field === 'sortSequence') {
                     return context.record.get('isNew');
                 }
 
-                if (context.field === ns.$reportNavigationOptionContextSourceValue) {
-                    const type = context.record.get(ns.$reportNavigationOptionContextSource);
+                if (context.field === 'reportNavigationOptionContextSourceValue') {
+                    const type = context.record.get('reportNavigationOptionContextSource');
                     if (type === 'DFLT') {
                         return false;
                     } else {
@@ -212,9 +215,9 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             }, this);
 
             this.on('edit', function(plugin, context) {
-                if (context.field === ns.$reportNavigationOptionContextSource) {
-                    context.record.set(ns.$reportNavigationOptionContextSourceValue, null);
-                    context.record.set(ns.$defaultValue, null);
+                if (context.field === 'reportNavigationOptionContextSource') {
+                    context.record.set('reportNavigationOptionContextSourceValue', null);
+                    context.record.set('defaultValue', null);
                 }
                 return true;
             }, this);
@@ -223,15 +226,13 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
 
         this.fieldsStore = Ext.create('Coon.report.store.RefStore');
         this.paramsStore = Ext.create('Coon.report.store.ReportParameterStore');
-        this.typeEditor.getStore().on('load', function() {
-            if (!this.additionalContext || !Ext.isArray(this.additionalContext)) {
-                return;
-            }
-            for (let i = 0; i < this.additionalContext.length; i++) {
-                const record = this.additionalContext[i];
-                if (this.typeEditor.getStore().find('value', record.get('value')) === -1) {
-                    this.typeEditor.getStore().add(record);
-                }
+        this.typeEditor.getStore().on('load', function(store, records) {
+            if (Ext.isArray(this.additionalContext) && records.length) {
+                this.additionalContext.forEach((record) => {
+                    if (record && record.isModel && record.get('value') && store.find('VALUE', record.get('value')) === -1) {
+                        store.add(record);
+                    }
+                });
             }
         }, this);
     },
@@ -302,13 +303,12 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
     },
 
     getData: function() {
-        const records = this.getStore().getRange();
         const recordsToSave = [];
-        for (let i = 0; i < records.length; i++) {
-            if (!records[i].get('isDeleted')) {
-                recordsToSave.push(records[i]);
+        this.store.each((record) => {
+            if (!record.get('isDeleted')) {
+                recordsToSave.push(record);
             }
-        }
+        });
         return Coon.Function.serializeRecords(recordsToSave);
     },
 
@@ -345,32 +345,18 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
     },
 
     changeFieldsList: function(fields) {
-        const ns = Coon.report.model.ComboValueWrapperFields;
-        const cvList = [];
-
-        const fieldNs = Coon.report.model.ReportFieldMaintenanceBeanFields;
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            const obj = {};
-            obj[ns.$value] = field[fieldNs.$reportField];
-            obj[ns.$description] = field[fieldNs.$description];
-            cvList.push(obj);
-        }
+        const cvList = fields.map((field) => ({
+            value: field['reportFieldCd'],
+            description: field['description'],
+        }));
         this.fieldsStore.loadData(cvList);
     },
 
     changeParametersList: function(parameters) {
-        const ns = Coon.report.model.ComboValueWrapperFields;
-        const cvList = [];
-
-        const paramNs = Coon.report.model.ReportParameterMaintenanceBeanFields;
-        for (let i = 0; i < parameters.length; i++) {
-            const param = parameters[i];
-            const obj = {};
-            obj[ns.$value] = param[paramNs.$reportParameter];
-            obj[ns.$description] = param[paramNs.$description];
-            cvList.push(obj);
-        }
+        const cvList = parameters.map((param) => ({
+            value: param['reportParameterCd'],
+            description: param['description'],
+        }));
         this.paramsStore.loadData(cvList);
     },
 
@@ -401,12 +387,10 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             return;
         }
 
-        const record = Ext.create('Coon.report.model.ReportNavigationContextBean', {
+        this.getStore().insert(0, {
             isNew: true,
             reportNavigationOptionContextSource: 'DFLT',
         });
-        // record.markDirty();
-        this.getStore().insert(0, record);
 
         const editor = this.findPlugin('cellediting');
         editor.startEditByPosition({row: 0, column: 0});
@@ -463,6 +447,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                 default:
                     break;
                 }
+
                 this.loadData(parameters);
             }
         }
@@ -472,37 +457,37 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         parameters = parameters || [];
         nameField = nameField || 'name';
         isRequiredField = isRequiredField || 'required';
-        const dataForLoad = [];
+
+        let dataForLoad = [];
         if (this.loadParametersSource.field.getValue() !== this.lastSource) {
             this.lastSource = this.loadParametersSource.field.getValue();
-            for (let i = 0; i < parameters.length; i++) {
-                dataForLoad.push(this.getDataForRecord(i, parameters[i][nameField], parameters[i][isRequiredField]));
-            }
+            dataForLoad = parameters.map(function(parameter, i) {
+                return this.getDataForRecord(i, parameter[nameField], parameter[isRequiredField], parameter['description']);
+            }, this);
             this.load(dataForLoad);
         } else {
-            for (let i = 0; i < parameters.length; i++) {
-                if (this.getStore().findExact('reportParameter', parameters[i][nameField]) === -1) {
-                    const record = Ext.create('Coon.report.model.ReportNavigationContextBean',
-                        this.getDataForRecord(i, parameters[i][nameField], parameters[i][isRequiredField]));
-                    dataForLoad.push(record);
+            parameters.forEach(function(parameter, i) {
+                if (!this.getStore().findRecord('reportParameter', parameter[nameField])) {
+                    dataForLoad.push(this.getDataForRecord(i, parameter[nameField], parameter[isRequiredField], parameter['description']));
                 }
-            }
+            }, this);
             if (dataForLoad.length > 0) {
-                this.getStore().insert(this.getStore().getCount(), dataForLoad);
+                this.getStore().add(dataForLoad);
             }
         }
     },
 
-    getDataForRecord: function(i, value, editable) {
+    getDataForRecord: function(i, value, editable, description) {
         return {
             sortSequence: i,
             reportParameter: value,
             isNew: true,
             editable: editable || false,
+            description: description,
         };
     },
     deleteHandler: function() {
-        const record = this.getSelectionModel().getSelection()[0];
+        const record = this.getSelection()[0];
         if (record) {
             this.deleteAction(record);
         }