ru.coon 2.5.34 → 2.5.35

package/src/common/component/editor/creators/CustomPanelEditorCreator.js

@@ -1,66 +1,66 @@
-Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
-    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.creators.CustomPanelEditorCreator'
-    ],
-    alias: 'widget.CustomPanelEditorCreator',
-    config: {
-        uiElementCd: null,
-    },
-    createField: function() {
-        this.field = Ext.create({
-            xtype: 'textfield',
-            setVisibleValue: function(visibleValue) {
-                this.visibleValue = visibleValue;
-            },
-            getVisibleValue: function() {
-                return this.visibleValue;
-            },
-            editable: false,
-        });
-        return this.field;
-    },
-    valueIsValidJson: function(str) {
-        try {
-            return JSON5.parse(str);
-        } catch (e) {
-            return false;
-        }
-    },
-    setValueInField: function(selectedRecord, opt) {
-        const value = selectedRecord.value;
-        if (!value) {
-            return false;
-        }
-        const visibleValue = selectedRecord.visibleValue || value;
-        this.field.setValue(value);
-        this.field.setVisibleValue(visibleValue);
-        opt.parentRecord.set('value', value);
-        opt.parentRecord.set('valueDescription', visibleValue);
-    },
-    showPanel: function(record, parent, uiElement) {
-        const panelCfg = this.valueIsValidJson(uiElement.propertyData);
-        if (!panelCfg) {
-            Ext.Msg.alert('Ошибка', 'Не корректный JSON объект');
-            return false;
-        }
-        panelCfg.header = false;
-        const panel = Ext.create('widget.UiCustomPanel', panelCfg);
-        panel.on('choose', this.setValueInField, this, {parentRecord: record});
-        panel.on('select', this.setValueInField, this, {parentRecord: record});
-        const win = Ext.widget('WindowWrap', {
-            maximized: true,
-            maximizable: false,
-            title: uiElement.description,
-            items: [panel],
-        });
-        win.show();
-        panel.getViewModel().set({
-            mainRecord: record.getData(),
-            parent,
-        });
-        Ext.defer(function() {
-            win.focus();
-        }, 1000, this);
-    },
-});
+Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
+    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.creators.CustomPanelEditorCreator'
+    ],
+    alias: 'widget.CustomPanelEditorCreator',
+    config: {
+        uiElementCd: null,
+    },
+    createField: function() {
+        this.field = Ext.create({
+            xtype: 'textfield',
+            setVisibleValue: function(visibleValue) {
+                this.visibleValue = visibleValue;
+            },
+            getVisibleValue: function() {
+                return this.visibleValue;
+            },
+            editable: false,
+        });
+        return this.field;
+    },
+    valueIsValidJson: function(str) {
+        try {
+            return JSON5.parse(str);
+        } catch (e) {
+            return false;
+        }
+    },
+    setValueInField: function(selectedRecord, opt) {
+        const value = selectedRecord.value;
+        if (!value) {
+            return false;
+        }
+        const visibleValue = selectedRecord.visibleValue || value;
+        this.field.setValue(value);
+        this.field.setVisibleValue(visibleValue);
+        opt.parentRecord.set('value', value);
+        opt.parentRecord.set('valueDescription', visibleValue);
+    },
+    showPanel: function(record, parent, uiElement) {
+        const panelCfg = this.valueIsValidJson(uiElement.propertyData);
+        if (!panelCfg) {
+            Ext.Msg.alert('Ошибка', 'Не корректный JSON объект');
+            return false;
+        }
+        panelCfg.header = false;
+        const panel = Ext.create('widget.UiCustomPanel', panelCfg);
+        panel.on('choose', this.setValueInField, this, {parentRecord: record});
+        panel.on('select', this.setValueInField, this, {parentRecord: record});
+        const win = Ext.widget('WindowWrap', {
+            maximized: true,
+            maximizable: false,
+            title: uiElement.description,
+            items: [panel],
+        });
+        win.show();
+        panel.getViewModel().set({
+            mainRecord: record.getData(),
+            parent,
+        });
+        Ext.defer(function() {
+            win.focus();
+        }, 1000, this);
+    },
+});

package/src/common/component/editor/creators/NumberEditorCreator.js

@@ -1,44 +1,44 @@
-Ext.define('Coon.common.component.editor.creators.NumberEditorCreator', {
-    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.creators.NumberEditorCreator'
-    ],
-    alias: 'widget.NumberEditorCreator',
-    decimalSeparator: ',',
-
-    normalizeRawValue(raw, separator) {
-        if (!raw) {
-            throw new Error('ERROR: normalizeRawValue, raw must be nonempty string!');
-        }
-        separator = separator || ',';
-        const [first, ...rest] = raw.split(separator);
-        return `${first},${rest.join('')}`;
-    },
-
-    createField: function(record, parent) {
-        const charNs = Coon.report.model.CharacteristicBeanFields;
-
-        return Ext.create({
-            xtype: 'numberfield',
-            allowDecimals: true,
-            isFieldHighlightOnChange: false,
-            decimalPrecision: record.get(charNs.$mask) ? record.get(charNs.$mask) : 3,
-            enableKeyEvents: true,
-            listeners: {
-                keyup: {
-                    fn: function(f, e) {
-                        const raw = f.getRawValue();
-                        const key = e.key();
-                        if (key === '.' || key === ',') {
-                            if (key === '.') {
-                                f.setRawValue(raw + ',');
-                            }
-                            f.setRawValue(this.normalizeRawValue(raw));
-                        }
-                    },
-                    scope: this,
-                },
-            },
-        });
-    },
-});
+Ext.define('Coon.common.component.editor.creators.NumberEditorCreator', {
+    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.creators.NumberEditorCreator'
+    ],
+    alias: 'widget.NumberEditorCreator',
+    decimalSeparator: ',',
+
+    normalizeRawValue(raw, separator) {
+        if (!raw) {
+            throw new Error('ERROR: normalizeRawValue, raw must be nonempty string!');
+        }
+        separator = separator || ',';
+        const [first, ...rest] = raw.split(separator);
+        return `${first},${rest.join('')}`;
+    },
+
+    createField: function(record, parent) {
+        const charNs = Coon.report.model.CharacteristicBeanFields;
+
+        return Ext.create({
+            xtype: 'numberfield',
+            allowDecimals: true,
+            isFieldHighlightOnChange: false,
+            decimalPrecision: record.get(charNs.$mask) ? record.get(charNs.$mask) : 3,
+            enableKeyEvents: true,
+            listeners: {
+                keyup: {
+                    fn: function(f, e) {
+                        const raw = f.getRawValue();
+                        const key = e.key();
+                        if (key === '.' || key === ',') {
+                            if (key === '.') {
+                                f.setRawValue(raw + ',');
+                            }
+                            f.setRawValue(this.normalizeRawValue(raw));
+                        }
+                    },
+                    scope: this,
+                },
+            },
+        });
+    },
+});

package/src/common/component/editor/creators/SimpleReportEditorCreator.js

@@ -1,37 +1,37 @@
-/**
- * Редактор характеристик на основе отчёта.
- * Идентификатор отчёта задаётся в поле "маска" таблицы настройки характеристики.
- * Отчёт должен возвращать поля VALUE и DESCRIPTION.
- * Отчёт может принимать параметр ID, значение которого равно идентификатору редактируемой сущности,
- * и параметр ENTITY, который обозначает тип (subentity) редактируемой сущности.
- */
-Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
-    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.creators.SimpleReportEditorCreator'
-    ],
-    alias: 'widget.SimpleReportEditorCreator',
-
-    createField: function(record, parent) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        const reportId = record.get(ns.$mask);
-        const entityID = parent && parent.model && parent.model.ID;
-        const entityTypeID = parent && parent.model && parent.model.subentityId;
-        const params = {};
-        if (entityID) {
-            params['ID'] = entityID;
-        }
-        if (entityTypeID) {
-            params['ENTITY'] = entityTypeID;
-        }
-        return Ext.create({
-            xtype: 'SimplestReportCombo',
-            reportId: reportId,
-            defaultParameters: params,
-            valueField: 'VALUE',
-            displayField: 'DESCRIPTION',
-            searchBySubstring: true,
-        });
-    },
-
-});
+/**
+ * Редактор характеристик на основе отчёта.
+ * Идентификатор отчёта задаётся в поле "маска" таблицы настройки характеристики.
+ * Отчёт должен возвращать поля VALUE и DESCRIPTION.
+ * Отчёт может принимать параметр ID, значение которого равно идентификатору редактируемой сущности,
+ * и параметр ENTITY, который обозначает тип (subentity) редактируемой сущности.
+ */
+Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
+    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.creators.SimpleReportEditorCreator'
+    ],
+    alias: 'widget.SimpleReportEditorCreator',
+
+    createField: function(record, parent) {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        const reportId = record.get(ns.$mask);
+        const entityID = parent && parent.model && parent.model.ID;
+        const entityTypeID = parent && parent.model && parent.model.subentityId;
+        const params = {};
+        if (entityID) {
+            params['ID'] = entityID;
+        }
+        if (entityTypeID) {
+            params['ENTITY'] = entityTypeID;
+        }
+        return Ext.create({
+            xtype: 'SimplestReportCombo',
+            reportId: reportId,
+            defaultParameters: params,
+            valueField: 'VALUE',
+            displayField: 'DESCRIPTION',
+            searchBySubstring: true,
+        });
+    },
+
+});

package/src/common/component/editor/creators/TriggerFieldEditorCreator.js

@@ -1,127 +1,127 @@
-Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
-    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.creators.TriggerFieldEditorCreator'
-    ],
-    alias: 'widget.TriggerFieldEditorCreator',
-    assignDoubleClick: true,
-    updateOnClose: false,
-    editable: true,
-    doubleClickHandler: true,
-    useCallBackFn: false,
-
-    createField: function() {
-        this.field = Ext.create({
-            xtype: 'textfield',
-            setVisibleValue: function(visibleValue) {
-                this.visibleValue = visibleValue;
-            },
-            getVisibleValue: function() {
-                return this.visibleValue;
-            },
-            valueToRaw: function(data) {
-                if (Ext.isObject(data)) {
-                    this.value = data.fieldValue;
-                    this.visibleValue = data.visibleValue;
-                }
-                return this.visibleValue;
-            },
-            rawToValue: function() {
-                return (Ext.isObject(this.value) && this.value.fieldValue) || this.value;
-            },
-            editable: this.editable,
-            doInit: function(ID) {
-                this.ID = ID;
-            },
-            requiredInitField: function() {
-                return [
-                    {name: 'ID', description: 'ID', required: false}
-                ];
-            },
-        });
-        return this.field;
-    },
-
-    showPanel: function(record, parent) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        const props = this.parseMask(record.get(ns.$mask));
-        this.value = record.get(ns.$value);
-
-        const panel = Ext.create({
-            xtype: 'ReportPanel',
-            autoFilter: true,
-            header: false,
-        });
-
-        const win = Ext.widget('WindowWrap', {
-            items: panel,
-        });
-        const parameter = {};
-        parameter[props.parameterName] = this.field.ID;
-        win.doInit(props.reportId, parameter, true);
-
-        panel.on('gridReady', function() {
-            if (this.doubleClickHandler) {
-                panel.grid.on('rowdblclick', function(grid, record) {
-                    if (panel.selectOnlyLeaf && !record.get('leaf')) {
-                        return;
-                    }
-                    const data = grid.getSelection()[0];
-                    record.set(ns.$value, data.get([props.valueColumn]));
-                    record.set(ns.$valueDescription, data.get([props.descriptionColumn]));
-                    record.set(ns.$value, data.get([props.valueColumn]));
-                    record.set(ns.$valueDescription, data.get([props.descriptionColumn]));
-                    this.field.setVisibleValue(data.get([props.descriptionColumn]));
-                    this.field.setValue({
-                        fieldValue: data.get([props.valueColumn]),
-                        visibleValue: data.get([props.descriptionColumn]),
-                    });
-                    const context = {
-                        value: data.get([props.valueColumn]),
-                        record: record,
-                    };
-                    parent.fireEvent('edit', null, context);
-                    win.close();
-                }, this);
-            }
-            if (this.useCallBackFn) {
-                if (this.processCallBackDataFn && Ext.isFunction(this.processCallBackDataFn)) {
-                    panel.grid['processCallBackDataFn'] = this.processCallBackDataFn.bind(this, [parent, record, props], true);
-                } else {
-                    Coon.log.debug('выбран режим callBackFn но в редакторе не реализована функция processCallBackDataFn!');
-                }
-            }
-        }, this);
-
-        if (this.updateOnClose) {
-            win.on('hide', function() {
-                parent.fireEvent('reload');
-            }, this);
-        }
-
-        win.on('close', function() {
-            this.field.fireEvent('change');
-        }, this);
-
-        win.show();
-    },
-
-    parseMask: function(mask) {
-        let result;
-        if (mask.match(/[\w-]*:[\w-]*/)) {
-            const arr = mask.split(/[:|]/);
-            let ind = 0;
-            result = {
-                parameterNames: this.useCallBackFn ? arr[ind++] : undefined,
-                reportId: arr[ind++],
-                parameterName: arr[ind++],
-            };
-
-            result.valueColumn = arr.length > ind ? arr[ind++] : result.parameterName;
-            result.descriptionColumn = arr.length > ind ? arr[ind++] : result.valueColumn;
-        } else {
-            Coon.log.error('Неверно задана маска характеристики');
-        }
-        return result;
-    },
-});
+Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
+    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.creators.TriggerFieldEditorCreator'
+    ],
+    alias: 'widget.TriggerFieldEditorCreator',
+    assignDoubleClick: true,
+    updateOnClose: false,
+    editable: true,
+    doubleClickHandler: true,
+    useCallBackFn: false,
+
+    createField: function() {
+        this.field = Ext.create({
+            xtype: 'textfield',
+            setVisibleValue: function(visibleValue) {
+                this.visibleValue = visibleValue;
+            },
+            getVisibleValue: function() {
+                return this.visibleValue;
+            },
+            valueToRaw: function(data) {
+                if (Ext.isObject(data)) {
+                    this.value = data.fieldValue;
+                    this.visibleValue = data.visibleValue;
+                }
+                return this.visibleValue;
+            },
+            rawToValue: function() {
+                return (Ext.isObject(this.value) && this.value.fieldValue) || this.value;
+            },
+            editable: this.editable,
+            doInit: function(ID) {
+                this.ID = ID;
+            },
+            requiredInitField: function() {
+                return [
+                    {name: 'ID', description: 'ID', required: false}
+                ];
+            },
+        });
+        return this.field;
+    },
+
+    showPanel: function(record, parent) {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        const props = this.parseMask(record.get(ns.$mask));
+        this.value = record.get(ns.$value);
+
+        const panel = Ext.create({
+            xtype: 'ReportPanel',
+            autoFilter: true,
+            header: false,
+        });
+
+        const win = Ext.widget('WindowWrap', {
+            items: panel,
+        });
+        const parameter = {};
+        parameter[props.parameterName] = this.field.ID;
+        win.doInit(props.reportId, parameter, true);
+
+        panel.on('gridReady', function() {
+            if (this.doubleClickHandler) {
+                panel.grid.on('rowdblclick', function(grid, record) {
+                    if (panel.selectOnlyLeaf && !record.get('leaf')) {
+                        return;
+                    }
+                    const data = grid.getSelection()[0];
+                    record.set(ns.$value, data.get([props.valueColumn]));
+                    record.set(ns.$valueDescription, data.get([props.descriptionColumn]));
+                    record.set(ns.$value, data.get([props.valueColumn]));
+                    record.set(ns.$valueDescription, data.get([props.descriptionColumn]));
+                    this.field.setVisibleValue(data.get([props.descriptionColumn]));
+                    this.field.setValue({
+                        fieldValue: data.get([props.valueColumn]),
+                        visibleValue: data.get([props.descriptionColumn]),
+                    });
+                    const context = {
+                        value: data.get([props.valueColumn]),
+                        record: record,
+                    };
+                    parent.fireEvent('edit', null, context);
+                    win.close();
+                }, this);
+            }
+            if (this.useCallBackFn) {
+                if (this.processCallBackDataFn && Ext.isFunction(this.processCallBackDataFn)) {
+                    panel.grid['processCallBackDataFn'] = this.processCallBackDataFn.bind(this, [parent, record, props], true);
+                } else {
+                    Coon.log.debug('выбран режим callBackFn но в редакторе не реализована функция processCallBackDataFn!');
+                }
+            }
+        }, this);
+
+        if (this.updateOnClose) {
+            win.on('hide', function() {
+                parent.fireEvent('reload');
+            }, this);
+        }
+
+        win.on('close', function() {
+            this.field.fireEvent('change');
+        }, this);
+
+        win.show();
+    },
+
+    parseMask: function(mask) {
+        let result;
+        if (mask.match(/[\w-]*:[\w-]*/)) {
+            const arr = mask.split(/[:|]/);
+            let ind = 0;
+            result = {
+                parameterNames: this.useCallBackFn ? arr[ind++] : undefined,
+                reportId: arr[ind++],
+                parameterName: arr[ind++],
+            };
+
+            result.valueColumn = arr.length > ind ? arr[ind++] : result.parameterName;
+            result.descriptionColumn = arr.length > ind ? arr[ind++] : result.valueColumn;
+        } else {
+            Coon.log.error('Неверно задана маска характеристики');
+        }
+        return result;
+    },
+});

package/src/common/component/settings/commands/getUserSettingsCommand.js

@@ -1,6 +1,6 @@
-Ext.define('Coon.common.component.settings.commands.getUserSettingsCommand', {
-    extend: 'Coon.command.ASyncBaseCommand',
-    alias: 'command.getUserSettingsCommand',
-
-    url: 'person/uiProperty/getAll',
-});
+Ext.define('Coon.common.component.settings.commands.getUserSettingsCommand', {
+    extend: 'Coon.command.ASyncBaseCommand',
+    alias: 'command.getUserSettingsCommand',
+
+    url: 'person/uiProperty/getAll',
+});

package/src/common/component/settings/commands/setUserPropValueCommand.js

@@ -1,23 +1,23 @@
-Ext.define('Coon.common.component.settings.commands.setUserPropValueCommand', {
-    extend: 'Coon.command.ASyncBaseCommand',
-    alias: 'command.setUserPropValueCommand',
-
-    url: 'person/uiProperty/saveOne',
-
-    execute: function(uiPropertyId, value) {
-        const data = {
-            uiPropertyId,
-            value,
-        };
-        this.callParent([undefined, data]);
-    },
-
-    description: 'сохранение пользовательской настройки',
-
-    inputParameters: function() {
-        return [
-            {name: 'uiPropertyId'},
-            {name: 'value'}
-        ];
-    },
-});
+Ext.define('Coon.common.component.settings.commands.setUserPropValueCommand', {
+    extend: 'Coon.command.ASyncBaseCommand',
+    alias: 'command.setUserPropValueCommand',
+
+    url: 'person/uiProperty/saveOne',
+
+    execute: function(uiPropertyId, value) {
+        const data = {
+            uiPropertyId,
+            value,
+        };
+        this.callParent([undefined, data]);
+    },
+
+    description: 'сохранение пользовательской настройки',
+
+    inputParameters: function() {
+        return [
+            {name: 'uiPropertyId'},
+            {name: 'value'}
+        ];
+    },
+});