ru.coon 2.8.54 → 2.8.56

package/.eslintrc.js

@@ -19,7 +19,7 @@ module.exports = {
         'Iconpack': 'writable',
     },
     'parserOptions': {
-        ecmaVersion: 2020,
+        ecmaVersion: 8,
     },
     'rules': {
         'max-len': [

package/CHANGELOG.md

@@ -1,24 +1,21 @@
-# Version 2.8.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/04227601d5626e8dfe0e503202c0abe889af794c)
-* deactivate ReportPropertiesGridFields ([d48f79], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d48f79cc33c1bdb8565dddf47025a2cda341589c))
-* update: CHANGELOG.md ([c15697], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c15697ca7b353c5521c832f5fc574fca5c5f8b94))
+# Version 2.8.56, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ee71037ec8ad697db9c2dab51a68edb7779e39c)
+* update: CHANGELOG.md ([2dbb53], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2dbb5364cf0654824ff535b7ee34c39d8a236bbb))
 
-# Version 2.8.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bcfb669a9fd715244f642af2782f77713ec4d9c5)
-# Version 2.8.52, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f09d0df73622befab3f7f6d08aaea3ad696e036d)
+# Version 2.8.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/64f911d4d6fb3907fa76bd53d21e5d260ebeb655)
+# Version 2.8.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/57cf1e02a88adae16228d487145fd5b1fa012078)
 * ## Features
-* <span style='color:green'>feat: сделан рефакторинг XtypeComboBox, reportPanel, общая логика контроллеров задачи вынесена в отдельный файл</span> ([36bf87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/36bf8795641e73a576301067a330c32cefcbc78a))
+* <span style='color:green'>feat: AddDoInitSupportPlugin predefine input parameters in viewModel, UiCPWrapper add inheritViewModel property</span> ([cf7bf1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cf7bf17cf68a551b8746f750158964df33c22788))
 
-* UiCustomPanel - force init empty parameters as 'null' (AddDoInitSupportPlugin) ([aed95f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aed95f7586a370fbee59166203d0482bc0a7ee42))
-* update: CHANGELOG.md ([345f39], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/345f398c6996e0245157c6e35afb3b98ef6e188a))
+* ## Fixes
+* <span style='color:red'> BFL-19473 preventSearchByValueField on ReportLookupCombo</span> ([99d306], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/99d306b414f0a0a43c94a5064b569922938cc5ff))
+* <span style='color:red'> BFL-19473 preventSearchByValueField on ReportLookupCombo</span> ([188f53], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/188f53d7f99c448342b74061f4b9c77d025d7021))
 
-# Version 2.8.52, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/be9ffc268dd4c1848ee20989256eee92b54df85e)
-* ## Features
-* <span style='color:green'>feat: была сделана синхронизация комбобокса со стором, добавлена валидация и исрпавлены баги</span> ([c327ce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c327cea395389df37417379a06f22c946e8fe297))
-* <span style='color:green'>feat: выведен XType колонок в св-ва репорта</span> ([771dd8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/771dd83b367a61faabc1d11a527ca10bfa1e23f2))
+* update: CHANGELOG.md ([c15697], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c15697ca7b353c5521c832f5fc574fca5c5f8b94))
 
-* partial refactoring ([0ca420], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ca42005599f8c73f3e725d30beb978341593027))
-* добавлена фильтрация в xtypecombobox ([1848a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1848a8f96c9f05d8953b2c4231b714152e41e496))
+# Version 2.8.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bcfb669a9fd715244f642af2782f77713ec4d9c5)
+# Version 2.8.52, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f09d0df73622befab3f7f6d08aaea3ad696e036d)
+* UiCustomPanel - force init empty parameters as 'null' (AddDoInitSupportPlugin) ([aed95f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aed95f7586a370fbee59166203d0482bc0a7ee42))
 * TR-70438 fix: Исправление ошибки при копировании репорта ([2daff2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2daff251cb9092c8058fee091cba3f2766e954bc))
-* добавлена валидация и изменены св-ва в параметрах ([52f184], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/52f184eb2a1d82384566eba0f61091fd3ecc3bb6))
 * upd ([b25431], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2543126f38df56102e68899166567d348a32828))
 * update: CHANGELOG.md ([a34646], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a3464679903d68a5018f930b30ad2ead401a893d))
 

package/package.json

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

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

@@ -6,13 +6,23 @@ Ext.define('Coon.common.field.combo.XTypeComboBox', {
     searchBySubstring: true,
     xtypeBound: undefined,
     getData: function() {
-        const xtypeList = Object.keys(Ext.ClassManager.classes);
+        let xtypeList;
+        if (Ext.isArray(this.xtypeBound)) {
+            xtypeList = Object.keys(Ext.ClassManager.classes)
+                .filter((clsName) => this.xtypeBound.find((bound) => clsName.includes(bound)));
+        } else if (Ext.isFunction(this.xtypeBound)) {
+            xtypeList = Object.keys(Ext.ClassManager.classes)
+                .filter((clsName) => this.xtypeBound(Ext.ClassManager.get(clsName)));
+        } else if (this.xtypeBound) {
+            xtypeList = Object.keys(Ext.ClassManager.classes)
+                .filter((clsName) => clsName.includes(this.xtypeBound));
+        } else {
+            xtypeList = Object.keys(Ext.ClassManager.classes);
+        }
         const data = [];
-        const pairsObject = {};
         xtypeList.forEach((clsName) => {
             const cls = Ext.ClassManager.get(clsName);
-            const xtypeClsName = clsName.split('.').pop();
-            if (cls && cls.prototype && cls.prototype.xtype) {
+            if (cls && cls.prototype) {
                 let type = cls.prototype.xtype;
                 if (!type) {
                     if (Ext.isArray(cls.prototype.alias)) {
@@ -25,13 +35,9 @@ Ext.define('Coon.common.field.combo.XTypeComboBox', {
                         type = type.replace(tmpl, '');
                     }
                 }
-                type && data.push([type, xtypeClsName]);
+                type && data.push([type, clsName]);
             }
         });
-        data.forEach((item) => {
-            const pairKey = JSON.stringify(item);
-            pairsObject[pairKey] = item;
-        });
-        return Object.values(pairsObject);
+        return data;
     },
 });

package/src/report/component/ReportLookupCombo.js

@@ -41,6 +41,8 @@
  *   <поле в записи>: <путь во ViewModel>,
  * })
  * @param {boolean} isReportFilterField. По умолчанию false. true - значит компонент является полем фильтрпанели ReportPanel
+ * @param {boolean} preventSearchByValueField позволяет предотвратить повторный вызов репорта после выбора записи в WindowWrap
+ * (если ReportLookupCombo используется для вызова окна доп.параметров команды и его не нужно инициализировать c value)
  */
 Ext.define('Coon.report.component.ReportLookupCombo', {
     extend: 'Ext.form.field.ComboBox',
@@ -57,6 +59,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
     xtype: 'ReportLookupCombo',
 
     searchField: undefined,
+    preventSearchByValueField: undefined,
     config: {
         autoLoadData: true,
         resettable: false,
@@ -85,7 +88,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
 
     initComponent() {
         this._cachedValue = Boolean(false);
-        this._inited = Boolean(false);
+        this._inited = Boolean(this.preventSearchByValueField);
 
         if (!this.getDisplayField()) {
             Coon.log.error('displayField is empty!');
@@ -106,7 +109,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
                 this._inited = true;// don't touch this
                 if (value) {
                     this.loadReportData(value);
-                };
+                }
             }
         };
         if (Ext.isObject(this.defaultParameters)) {

package/src/report/component/ReportPanel.js

@@ -20,7 +20,6 @@ Ext.define('Coon.report.component.ReportPanel', {
         'Coon.report.column.HintColumn',
         'Coon.report.component.reportpanel.ReportGrid',
         'Coon.report.component.reportpanel.FilterPanel',
-        'Coon.report.component.reportpanel.ReportGridDataType',
         'Coon.report.model.*',
         'Coon.report.model.CharacteristicBeanFields',
         'Coon.report.plugin.form.EnterConfirmFormPlugin',
@@ -190,8 +189,93 @@ Ext.define('Coon.report.component.ReportPanel', {
         },
 
         setColumnType: function(typeOfValue) {
-            const columnType = Coon.report.component.reportpanel.ReportGridDataType.getTypeConfig(typeOfValue);
-            return columnType;
+            const convertFloatFn = Coon.format.parseFloat;
+            const convertDateTime = function(value) {
+                return Ext.Date.parse(value, Coon.format.dateTimeInternal);
+            };
+            const convertDate = function(value) {
+                if (!Ext.Date.parse(value, Coon.format.dateInternal)) {
+                    value = Ext.Date.format(convertDateTime(value), Coon.format.dateInternal);
+                }
+                return Ext.Date.parse(value, Coon.format.dateInternal);
+            };
+            const cConfig = {
+                xtype: 'hintColumn',
+                filter: {type: 'string'},
+            }; // по-умолчанию
+            let storeRecordType = 'string';
+            let convert = undefined;
+
+            switch (typeOfValue) {
+            case 'DATETIME':
+                cConfig.xtype = 'hintDateColumn';
+                cConfig.format = Coon.format.timeDate;
+                storeRecordType = 'date';
+                convert = convertDateTime;
+                break;
+            case 'TIME':
+                cConfig.xtype = 'hintDateColumn';
+                cConfig.format = Coon.format.time;
+                storeRecordType = 'date';
+                convert = convertDateTime;
+                break;
+            case 'DATE':
+                cConfig.xtype = 'hintDateColumn';
+                cConfig.format = Coon.format.date;
+                cConfig.filter = {type: 'date'};
+                cConfig.align = 'right';
+                storeRecordType = 'date';
+                convert = convertDate;
+                break;
+
+            case 'MONEY':
+                cConfig.xtype = 'MoneyColumn';
+                cConfig.filter = {type: 'numeric'};
+                storeRecordType = 'float';
+                convert = convertFloatFn;
+                break;
+
+            case 'DECIMAL':
+                cConfig.xtype = 'BigNumColumn';
+                cConfig.filter = {type: 'numeric'};
+                storeRecordType = 'float';
+                convert = convertFloatFn;
+                break;
+
+            case 'INTEGER':
+                cConfig.xtype = 'BigNumColumn';
+                cConfig.filter = {type: 'numeric'};
+                cConfig.precision = 0;
+                storeRecordType = 'float';
+                convert = convertFloatFn;
+                break;
+
+            case 'BOOLEAN':
+                cConfig.xtype = 'checkcolumn';
+                cConfig.stopSelection = false;
+                cConfig.allowSelect = false;
+                cConfig.filterType = 'boolean';
+                cConfig.listeners = {
+                    beforecheckchange: function() {
+                        const panel = this.findParentByType('ReportPanel');
+                        if (panel && panel.readOnly) {
+                            return false;
+                        }
+                        return this.allowSelect || this.stopSelection;
+                    },
+                };
+                cConfig.precision = 0;
+                cConfig.filter = {type: 'boolean'};
+                storeRecordType = 'boolean';
+                convert = function(value) {
+                    return Ext.isBoolean(value) ? value : ('Y' === value) || ('true' === value);
+                };
+                break;
+
+            default:
+                break;
+            }
+            return [cConfig, storeRecordType, convert];
         },
     },
 

package/src/report/component/SimplestReportCombo.js

@@ -260,6 +260,9 @@ Ext.define('Coon.report.component.SimplestReportCombo', {
     },
 
     onComplete: function(map) {
+        if (this.destroyed) {
+            return;
+        };
         this.setBusy(false);
         if (this.DANGEROUS_AMOUNT_OF_DATA && map.length > this.DANGEROUS_AMOUNT_OF_DATA) {
             if (this.getCutDangerousAmount()) {

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

@@ -97,11 +97,6 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
             editor: {
                 xtype: 'textfield',
                 allowBlank: false,
-                // validateOnChange: true,
-                // regex: /^[^xtype]+$/,
-                // listeners: {
-                //     change: 'checkValidation',
-                // },
             },
         },
         {

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

@@ -383,47 +383,4 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
         win.down('UiAceEditor').setValue(value);
         win.down('UiAceEditor').editor.focus();
     },
-
-    // checkValidation: function(field) {
-    //     const value = field.getValue().toLowerCase();
-    //     if (value === 'xtype') {
-    //         Ext.Msg.alert('Ошибка', 'Запрещен ручной ввод "xtype"');
-    //     }
-    // },
-
-    setXtypeColumn: function(_, record) {
-        const xtypeColumn = record.getData().xtype;
-        const viewModel = this.getViewModel();
-        const properties = viewModel.get('fieldsGrid.selection.properties') || viewModel.get('parametersGrid.selection.properties');
-        const description = Ext.ComponentQuery.query(xtypeColumn)[0]?.$metaConfig?.description;
-        const index = properties.find((el) => el.key === 'xtype');
-
-        if (index) {
-            properties.forEach((item) => {
-                item.key === 'xtype' ? item.value = xtypeColumn : null;
-            });
-        } else {
-            properties.push({
-                isDeleted: false,
-                isNew: true,
-                key: 'xtype',
-                value: xtypeColumn,
-                sequenceNumber: properties.length + 1,
-            });
-        }
-
-        this.setDescriptionColumn(description);
-
-        this.setData(properties);
-    },
-
-    setDescriptionColumn: function(description) {
-        const viewModel = this.getViewModel();
-
-        if (description) {
-            viewModel.set('descriptionColumn', description);
-        } else {
-            viewModel.set('descriptionColumn', 'Нет описания');
-        }
-    },
 });

package/src/report/component/settings/field/ReportFormFieldEditPanel.js

@@ -4,6 +4,7 @@ Ext.define('Coon.report.component.settings.field.ReportFormFieldEditPanel', {
     controller: 'reportformfieldeditpanelcontroller',
     uses: [],
     requires: [
+        'Coon.report.component.settings.ReportPropertiesGrid',
         'Coon.report.component.settings.field.ReportFormFieldsGrid'
     ],
     alternateClassName: [

package/src/report/component/settings/field/ReportFormFieldsGrid.js

@@ -174,6 +174,5 @@ Ext.define('Coon.report.component.settings.field.ReportFormFieldsGrid', {
     listeners: {
         drop: 'onDrop',
         rowcontextmenu: 'showContextMenu',
-        selectionchange: 'saveSelectedTypeColumn',
     },
 });

package/src/report/component/settings/field/ReportFormFieldsGridController.js

@@ -298,10 +298,4 @@ Ext.define('Coon.report.component.settings.ReportFormFieldsGridController', {
         const view = this.getView();
         view.publishState('data', view.getData(true));
     },
-
-    saveSelectedTypeColumn: function(_, selected) {
-        const viewModel = this.getViewModel();
-        const selectedType = selected[0]?.getData().reportFieldTypeLookup ?? selected[0]?.getData().reportParameterTypeLookup;
-        Coon.report.component.settings.ReportFormConfigProperties.getSelectedTypeColumn(selected, viewModel, selectedType);
-    },
 });

package/src/report/component/settings/parameter/ReportFormParametersGrid.js

@@ -234,8 +234,4 @@ Ext.define('Coon.report.component.settings.parameter.ReportFormParametersGrid',
         {ptype: 'rowediting', clicksToEdit: 2}
         // {ptype: 'gridexporter'}
     ],
-
-    listeners: {
-        selectionchange: 'saveSelectedTypeColumn',
-    },
 });

package/src/report/component/settings/parameter/ReportFormParametersGridController.js

@@ -94,10 +94,4 @@ Ext.define('Coon.report.component.settings.ReportFormParametersGridController',
             Ext.Msg.alert('Сообщение системы', 'Отчет не имеет параметров');
         }
     },
-
-    saveSelectedTypeColumn: function(_, selected) {
-        const viewModel = this.getViewModel();
-        const selectedType = selected[0]?.getData().reportFieldTypeLookup ?? selected[0]?.getData().reportParameterTypeLookup;
-        Coon.report.component.settings.ReportFormConfigProperties.getSelectedTypeColumn(selected, viewModel, selectedType);
-    },
 });

package/src/uielement/component/UiCPWrapper.js

@@ -63,6 +63,11 @@ Ext.define('Coon.uielement.component.UiCPWrapper', {
 
     renderPanel: function(panelConfig) {
         const config = Object.assign({}, panelConfig, this.initConfig);
+        config.inheritViewModel = this.inheritViewModel;
+        if (this.inheritViewModel) {
+            const parentViewModel = this.findParentByType('UiCustomPanel').getViewModel();
+            config.viewModel = parentViewModel;
+        }
         const panel = Ext.create('widget.UiCustomPanel', config);
         this.uiPanel = panel;
         panel.on('afterrender', function() {

package/src/uielement/component/UiCustomPanel.js

@@ -57,4 +57,26 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
 
     copyLink: false,
 
+    initComponent() {
+        if (!this.inheritViewModel) {
+            this.viewModel = this.viewModel || {type: 'UiCustomPanelViewModel'};
+            this.viewModel.data = this.viewModel.data || {};
+            this.viewModel = {
+                data: Ext.applyIf(this.viewModel.data, this.getViewModelData()),
+            };
+        }
+        this.callParent();
+    },
+
+    getViewModelData() {
+        const data = {};
+        const addDoInitSupportPlugin = this.plugins && this.plugins.find((plugin) => plugin.ptype === 'AddDoInitSupportPlugin');
+        if (addDoInitSupportPlugin) {
+            addDoInitSupportPlugin.parametersToModel.forEach((param) => {
+                data[param.value] = undefined;
+            });
+        }
+        return data;
+    },
+
 });

package/src/uielement/plugin/AddDoInitSupportPlugin.js

@@ -59,10 +59,9 @@ Ext.define('Coon.uielement.plugin.AddDoInitSupportPlugin', {
         }
         const dataMapping = this.getInputParams();
         parameters.forEach((el, index) => {
-            if (!this.validatePath(dataMapping[index].valuePath)) {
-                return;
+            if (this.validatePath(dataMapping[index].valuePath) && (el !== null)) {
+                this.vm.set(dataMapping[index].valuePath, el);
             }
-            this.vm.set(dataMapping[index].valuePath, el || null);
         });
     },
 

package/src/version.js

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

package/src/report/component/reportpanel/ReportGridColumnMap.js

@@ -1,98 +0,0 @@
-Ext.define('Coon.report.component.reportpanel.ReportGridDataType', {
-    statics: {
-        convertFloatFn: Coon.format.parseFloat,
-        convertDateTime(value) {
-            return Ext.Date.parse(value, Coon.format.dateTimeInternal);
-        },
-        convertDate(value) {
-            if (!Ext.Date.parse(value, Coon.format.dateInternal)) {
-                value = Ext.Date.format(
-                    Coon.report.component.reportpanel.ReportGridColumnMap.convertDateTime(value),
-                    Coon.format.dateInternal
-                );
-            }
-            return Ext.Date.parse(value, Coon.format.dateInternal);
-        },
-
-        getTypeConfig(typeOfValue) {
-            const cConfig = {
-                xtype: 'HintColumn',
-                filter: {type: 'string'},
-            }; // по-умолчанию
-
-            let storeRecordType = 'string';
-            let convert = undefined;
-
-            switch (typeOfValue) {
-            case 'DATETIME':
-                cConfig.xtype = 'HintDateColumn';
-                cConfig.format = Coon.format.timeDate;
-                storeRecordType = 'date';
-                convert = this.convertDateTime;
-                break;
-            case 'TIME':
-                cConfig.xtype = 'HintDateColumn';
-                cConfig.format = Coon.format.time;
-                storeRecordType = 'date';
-                convert = this.convertDateTime;
-                break;
-            case 'DATE':
-                cConfig.xtype = 'HintDateColumn';
-                cConfig.format = Coon.format.date;
-                cConfig.filter = {type: 'date'};
-                cConfig.align = 'right';
-                storeRecordType = 'date';
-                convert = this.convertDate;
-                break;
-
-            case 'MONEY':
-                cConfig.xtype = 'MoneyColumn';
-                cConfig.filter = {type: 'numeric'};
-                storeRecordType = 'float';
-                convert = this.convertFloatFn;
-                break;
-
-            case 'DECIMAL':
-                cConfig.xtype = 'BigNumColumn';
-                cConfig.filter = {type: 'numeric'};
-                storeRecordType = 'float';
-                convert = this.convertFloatFn;
-                break;
-
-            case 'INTEGER':
-                cConfig.xtype = 'BigNumColumn';
-                cConfig.filter = {type: 'numeric'};
-                cConfig.precision = 0;
-                storeRecordType = 'float';
-                convert = this.convertFloatFn;
-                break;
-
-            case 'BOOLEAN':
-                cConfig.xtype = 'checkcolumn';
-                cConfig.stopSelection = false;
-                cConfig.allowSelect = false;
-                cConfig.filterType = 'boolean';
-                cConfig.listeners = {
-                    beforecheckchange: function() {
-                        const panel = this.findParentByType('ReportPanel');
-                        if (panel && panel.readOnly) {
-                            return false;
-                        }
-                        return this.allowSelect || this.stopSelection;
-                    },
-                };
-                cConfig.precision = 0;
-                cConfig.filter = {type: 'boolean'};
-                storeRecordType = 'boolean';
-                convert = function(value) {
-                    return Ext.isBoolean(value) ? value : ('Y' === value) || ('true' === value);
-                };
-                break;
-
-            default:
-                break;
-            }
-            return [cConfig, storeRecordType, convert];
-        },
-    },
-});

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

@@ -1,36 +0,0 @@
-Ext.define('Coon.report.component.settings.ReportFormConfigProperties', {
-    statics: {
-        getSelectedTypeColumn: function(selected, viewModel, selectedType) {
-            const [cConfig] = Coon.report.component.reportpanel.ReportGridDataType.getTypeConfig(selectedType);
-            let description = null;
-            let xtypeInProperties = null;
-
-            selected[0]?.getData().properties.forEach((item) => {
-                if (item.key === 'xtype') {
-                    xtypeInProperties = item.value;
-                }
-            });
-
-            if (xtypeInProperties) {
-                viewModel.set('typeColumn', xtypeInProperties);
-                description = Ext.ComponentQuery.query(xtypeInProperties)[0].$metaConfig?.description;
-                this.setDescriptionColumn(description);
-                return;
-            }
-
-            description = Ext.ComponentQuery.query(cConfig.xtype)[0].$metaConfig?.description;
-
-            this.setDescriptionColumn(description, viewModel);
-
-            viewModel.set('typeColumn', cConfig.xtype);
-        },
-
-        setDescriptionColumn: function(description, viewModel) {
-            if (description) {
-                viewModel.set('descriptionColumn', description);
-            } else {
-                viewModel.set('descriptionColumn', 'Нет описания');
-            }
-        },
-    },
-});

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

@@ -1,64 +0,0 @@
-Ext.define('Coon.report.component.settings.ReportPropertiesGridFields', {
-    extend: 'Coon.report.component.settings.ReportPropertiesGrid',
-    alias: 'widget.ReportPropertiesGridFields',
-
-    initComponent: function() {
-        this.callParent();
-
-        this.addDocked({
-            xtype: 'toolbar',
-            dataIndex: 'reportParameterTypeLookup',
-            dock: 'top',
-            itemId: 'bottomToolbar',
-            layout: 'vbox',
-            items: [
-                {
-                    xtype: 'container',
-                    layout: 'hbox',
-                    margin: '10 0 0 10',
-                    items: [
-                        {
-                            xtype: 'label',
-                            text: 'xtype:',
-                            margin: '10 30 0 0',
-                        },
-                        {
-                            xtype: 'XTypeComboBox',
-                            name: 'reportParameterTypeLookup',
-                            width: '40vw',
-                            flex: 1,
-                            fieldStyle: 'text-align: center;',
-                            bind: '{typeColumn}',
-                            listeners: {
-                                select: 'setXtypeColumn',
-                            },
-                            validator(value) {
-                                const isValid = this.getStore()
-                                    .findBy((record) => record.get('description') === value || record.get('xtype') === value) !== -1;
-                                return isValid || `xtype ${value} не найден!`;
-                            },
-                        }
-                    ],
-                }, {
-                    xtype: 'container',
-                    layout: 'hbox',
-                    margin: '10 0 0 0',
-                    items: [
-                        {
-                            xtype: 'label',
-                            text: 'Описание:',
-                            margin: '10 10 0 0',
-                        },
-                        {
-                            xtype: 'textarea',
-                            readOnly: true,
-                            width: '39vw',
-                            bind: '{descriptionColumn}',
-                            fieldStyle: 'border: 1px solid #3d6780; border-radius: 4px; padding: 5px; text-align: center;',
-                        }
-                    ],
-                }
-            ],
-        });
-    },
-});