ru.coon 2.5.67 → 2.6.0

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

@@ -54,6 +54,9 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
             throw new Ext.Error('Тип редактора не задан');
         }
         Coon.log.debug('createEditor', type);
+        const mask = record.get('mask');
+        record.set('editorConfig', (mask && typeof mask === 'string' && Ext.decode(mask, true) && Ext.isObject(Ext.decode(mask))) ?
+            Ext.decode(mask, true) : {});
         if (type === Coon.common.component.editor.CharacteristicEditorTypes.FOREIGN ||
             type === Coon.common.component.editor.CharacteristicEditorTypes.FILE ||
             !Ext.isEmpty(record.get(Coon.report.model.CharacteristicBeanFields.$editor))) {
@@ -70,10 +73,14 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
                     editor = new Coon.common.component.editor.TextTypeEditor();
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.FLOAT:
-                    editor = new Coon.common.component.editor.NumberTypeEditor();
+                    editor = new Coon.common.component.editor.NumberTypeEditor({
+                        record: record,
+                    });
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.INT:
-                    editor = new Coon.common.component.editor.IntTypeEditor();
+                    editor = new Coon.common.component.editor.IntTypeEditor({
+                        record: record,
+                    });
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.DATE:
                     editor = new Coon.common.component.editor.DateTypeEditor({
@@ -81,7 +88,9 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
                     });
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.LIST:
-                    editor = new Coon.common.component.editor.DFVTypeEditor();
+                    editor = new Coon.common.component.editor.DFVTypeEditor({
+                        record: record,
+                    });
                     break;
                 default:
                     throw new Ext.Error('Не определен тип редактора');
@@ -144,26 +153,32 @@ Ext.define('Coon.common.component.editor.TextTypeEditor', {
         const ns = Coon.report.model.CharacteristicBeanFields;
         const re = new RegExp('^\\d{10}$');
         if (record.recTyp && record.recTyp === 'passport' && re.test(value.replace(/\s/g, ''))) {
-            value = value.slice(0, 2) + ' ' + value.slice(2, 4) + ' ' + value.slice(4);
+            const passportNumber = value.replace(/\s/g, '');
+            value = passportNumber.slice(0, 2) + ' ' + passportNumber.slice(2, 4) + ' ' + passportNumber.slice(4);
         }
         record.set(ns.$valueDescription, value);
     },
 
     prepare: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
         const record = this.context.record;
-        const type = this.grid.typeMap.get(record.get(ns.$type));
+        const type = this.grid.typeMap.get(record.get('type'));
         const field = this.field;
-        if (type && type[ns.$mask] !== ' ') {
-            field.regexText = 'Некорректное заполнение поля';
-            field.regex = new RegExp(type[ns.$mask]);
-            field.maskRe = field.regex;
-            record.recTyp = type[ns.$mask] === '^\\d{2}\\s*\\d{2}\\s*\\d{6}$' ? 'passport' : undefined;
-        }
-        if (type && type[ns.$mask] === ' ') {
-            field.regexText = undefined;
-            field.regex = undefined;
-            field.maskRe = undefined;
+        if (!Ext.Object.isEmpty(record.get('editorConfig'))) {
+            Ext.apply(field, record.get('editorConfig'));
+            field.regex = record.get('editorConfig').regex ? new RegExp(record.get('editorConfig').regex) : undefined;
+            record.recTyp = field.recTyp;
+        } else {
+            if (type && type.mask !== ' ') {
+                field.regexText = 'Некорректное заполнение поля';
+                field.regex = new RegExp(type.mask);
+                field.maskRe = field.regex;
+                record.recTyp = type.mask === '^\\d{2}\\s*\\d{2}\\s*\\d{6}$' ? 'passport' : undefined;
+            }
+            if (type && type.mask === ' ') {
+                field.regexText = undefined;
+                field.regex = undefined;
+                field.maskRe = undefined;
+            }
         }
     },
 });
@@ -192,16 +207,13 @@ Ext.define('Coon.common.component.editor.NumberTypeEditor', {
         const record = this.context.record;
         const type = this.grid.typeMap.get(record.get(ns.$type));
         const field = this.field;
-        if (type && type.mask && type.mask.startsWith('minValue')) {
+        field.minValue = Number.NEGATIVE_INFINITY;
+        if (!Ext.Object.isEmpty(record.get('editorConfig'))) {
+            Ext.apply(field, record.get('editorConfig'));
+        } else if (type && type.mask && type.mask.startsWith('minValue')) {
             const range = type[ns.$mask].split(';');
             field.minValue = range[0].slice(9);
-            if (range.length === 2) {
-                field.maxValue = range[1].slice(10);
-            } else {
-                field.maxValue = Number.POSITIVE_INFINITY;
-            }
-        } else {
-            field.minValue = Number.NEGATIVE_INFINITY;
+            field.maxValue = range.length === 2 ? range[1].slice(10) : Number.POSITIVE_INFINITY;
         }
     },
 
@@ -247,25 +259,23 @@ Ext.define('Coon.common.component.editor.DateTypeEditor', {
     ],
 
     createField: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        this.mask = this.parseMask(this.record.get(ns.$mask));
-        const plugins = this.mask['periodPicker'] ? 'PeriodPickerPlugin' : [];
-        return new Ext.form.field.Date({
+        const mask = Ext.Object.isEmpty(this.record.get('editorConfig')) ? this.parseMask(this.record.get('mask')) : {};
+        return Ext.create(Ext.apply({
+            xtype: 'datefield',
             allowBlank: true,
-            plugins: plugins,
-            format: this.mask['valueFormat'] || 'd.m.Y',
-        });
+            plugins: mask['periodPicker'] ? 'PeriodPickerPlugin' : [],
+            format: mask['valueFormat'] || 'd.m.Y',
+        }, this.record.get('editorConfig')));
     },
 
     setData: function(value, record) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        this.mask = this.parseMask(record.get(ns.$mask));
-        if (this.mask['valueFormat']) {
-            record.set(ns.$value,
-                Ext.util.Format.dateRenderer(this.mask['valueFormat'])(value));
+        const mask = Ext.Object.isEmpty(this.record.get('editorConfig')) ? this.parseMask(this.record.get('mask')) : {};
+        const valueFormat = mask['valueFormat'] || (record.get('editorConfig') && record.get('editorConfig').format);
+        if (valueFormat) {
+            record.set('value', Ext.util.Format.dateRenderer(valueFormat)(value));
         }
-        record.set(ns.$valueDescription,
-            Ext.util.Format.dateRenderer(this.mask['displayFormat'] || 'd.m.Y')(value));
+        const displayFormat = mask['displayFormat'] || (record.get('editorConfig') && record.get('editorConfig').displayFormat) || 'd.m.Y';
+        record.set('valueDescription', Ext.util.Format.dateRenderer(displayFormat)(value));
     },
 
     /**
@@ -303,19 +313,19 @@ Ext.define('Coon.common.component.editor.DFVTypeEditor', {
     ],
     alias: 'widget.DFVTypeEditor',
 
-    config: {
-        field: {
+    setData: function(value, record) {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        record.set(ns.$valueDescription, this.field.getVisibleValue());
+    },
+
+    createField: function() {
+        return Ext.create(Ext.apply({
             xtype: 'DFVCharacteristicField',
             characteristicType: '',
             listWidth: 350,
             allowBlank: true,
             loadOnRender: false,
-        },
-    },
-
-    setData: function(value, record) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        record.set(ns.$valueDescription, this.field.getVisibleValue());
+        }, this.record.get('editorConfig')));
     },
 
     prepare: function() {

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

@@ -1,240 +1,240 @@
-/**
- * Редактор характеристик с функциональностью редактирования по типам
- */
-Ext.define('Coon.common.component.editor.HistoryTypedCharacteristicEditor', {
-    extend: 'Coon.common.component.editor.TypedCharacteristicEditor',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.HistoryTypedCharacteristicEditor'
-    ],
-    alias: 'widget.HistoryTypedCharacteristicEditor',
-    config: {
-        enableHistoryPanel: true,
-        calenderHidden: false,
-        dateWidth: 90,
-        calendarFormat: 'F Y',
-        useHistoryPanelWithDeletedChars: false,
-        showDateColumn: true,
-    },
-
-    initComponent: function() {
-        this.historyButton = new Ext.Button({
-            text: this.useHistoryPanelWithDeletedChars ? 'История' : 'Вся история',
-            iconCls: 'x-ccb-btn-hist',
-            handler: function() {
-                this.openHistory();
-            }.bind(this),
-            hidden: !this.enableHistoryPanel,
-        });
-
-        this.historyCharButton = new Ext.Button({
-            text: 'История',
-            iconCls: 'x-ccb-btn-hist',
-            handler: function() {
-                this.openCharHistory();
-            }.bind(this),
-            hidden: !this.enableHistoryPanel || this.useHistoryPanelWithDeletedChars,
-            disabled: true,
-        });
-
-        this.historyAuditButton = new Ext.Button({
-            text: 'Аудит',
-            iconCls: 'x-ccb-btn-hist',
-            handler: function() {
-                this.openHistoryUserAudit();
-            }.bind(this),
-            hidden: !this.enableHistoryPanel || !this.useHistoryPanelWithDeletedChars,
-        });
-
-        this.calendar = Ext.create({
-            xtype: 'datefield',
-            allowBlank: false,
-            margin: 10,
-            hidden: this.calenderHidden,
-            format: this.calendarFormat,
-        });
-
-        this.calendar.on('validate', this.validateDateHandler, this);
-        this.calendar.on('select', this.changeCalendarHandler, this);
-
-        this.tbarItems = [
-            this.calendar,
-            this.historyButton,
-            this.historyCharButton,
-            this.historyAuditButton
-        ];
-
-        this.callParent();
-    },
-
-    createColumns: function() {
-        const columns = this.callParent();
-
-        const actions = !this.readOnly && columns.items.pop();
-
-        if (this.showDateColumn) {
-            columns.items.push(this.createCMEffectiveDate());
-        }
-
-        if (!this.readOnly) {
-            columns.items.push(actions);
-        }
-        return columns;
-    },
-
-    createCMEffectiveDate: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-
-        return {
-            xtype: 'hintDateColumn',
-            header: 'Дата начала',
-            tdCls: 'effective-at-column',
-            width: this.dateWidth,
-            dataIndex: ns.$effectiveDate,
-            sortable: true,
-        };
-    },
-
-    setDate: function(date) {
-        this.callParent();
-        this.calendar.setValue(date);
-    },
-
-    changeDate: function(date) {
-        if (!date) {
-            date = new Date().getFirstDateOfMonth();
-        }
-
-        this.setDate(date);
-        this.changeCalendarHandler();
-    },
-
-    changeCalendarHandler: function() {
-        const date = this.calendar.getValue();
-        if (date) {
-            this.effectiveDate = Ext.util.Format.date(date, Coon.format.dateInternal);
-            this.fireEvent('changeDate', this, date);
-        }
-    },
-
-    validateDateHandler: function(calendar, date) {
-        if ((this.minDate && this.minDate > date) || (this.maxDate && this.maxDate < date)) {
-            return false;
-        }
-    },
-
-    setDateRestrictions: function(minDate, maxDate) {
-        if (minDate && !(minDate instanceof Date)) {
-            minDate = new Date(minDate);
-        }
-        if (maxDate && !(maxDate instanceof Date)) {
-            maxDate = new Date(maxDate);
-        }
-        this.minDate = minDate;
-        this.maxDate = maxDate;
-        this.calendar.setMinValue(this.minDate);
-        this.calendar.setMaxValue(this.maxDate);
-    },
-
-    getHistoryWindow: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanel');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'Вся история',
-            maximized: true,
-            maximizable: false,
-        });
-
-        return this.historyWindow;
-    },
-
-    getHistoryWindowWithDeletedChars: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelWithDeletedChars');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'Вся история',
-            maximized: true,
-            maximizable: false,
-        });
-
-        return this.historyWindow;
-    },
-
-    getHistoryAuditWindow: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelAudit');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'История характеристик',
-            maximized: true,
-        });
-
-        return this.historyWindow;
-    },
-
-    getUserAuditWindow: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryUserAudit');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'Аудит',
-            maximized: true,
-        });
-
-        return this.historyWindow;
-    },
-
-    openHistory: function() {
-        const date = this.calendar.getValue();
-        if (date) {
-            if (this.useHistoryPanelWithDeletedChars) {
-                const ns = Coon.report.model.CharacteristicBeanFields;
-                const charTypeCd = this.getSelected() && this.getSelected().get(ns.$type);
-                const win = this.getHistoryWindowWithDeletedChars();
-                win.show();
-                win.content.doInit(
-                    this.model.ID,
-                    this.model.subentityId,
-                    this.model.characteristicEntity,
-                    charTypeCd,
-                    date
-                );
-            } else {
-                const win = this.getHistoryWindow();
-                win.show();
-                win.content.doInit(
-                    this.model.ID,
-                    this.model.subentityId,
-                    this.model.characteristicEntity,
-                    date
-                );
-            }
-        }
-    },
-
-    openCharHistory: function() {
-        const date = this.calendar.getValue();
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        const charTypeCd = this.getSelected().get(ns.$type);
-        if (date && charTypeCd) {
-            const win = this.getHistoryAuditWindow();
-            win.show();
-            win.content.doInit(
-                this.model.ID,
-                this.model.subentityId,
-                this.model.characteristicEntity,
-                charTypeCd,
-                date
-            );
-        }
-    },
-
-    openHistoryUserAudit: function() {
-        if (this.useHistoryPanelWithDeletedChars) {
-            const win = this.getUserAuditWindow();
-            win.show();
-            win.content.doInit(
-                this.model.ID,
-                this.model.subentityId,
-                this.model.characteristicEntity
-            );
-        }
-    },
-});
+/**
+ * Редактор характеристик с функциональностью редактирования по типам
+ */
+Ext.define('Coon.common.component.editor.HistoryTypedCharacteristicEditor', {
+    extend: 'Coon.common.component.editor.TypedCharacteristicEditor',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.HistoryTypedCharacteristicEditor'
+    ],
+    alias: 'widget.HistoryTypedCharacteristicEditor',
+    config: {
+        enableHistoryPanel: true,
+        calenderHidden: false,
+        dateWidth: 90,
+        calendarFormat: 'F Y',
+        useHistoryPanelWithDeletedChars: false,
+        showDateColumn: true,
+    },
+
+    initComponent: function() {
+        this.historyButton = new Ext.Button({
+            text: this.useHistoryPanelWithDeletedChars ? 'История' : 'Вся история',
+            iconCls: 'x-ccb-btn-hist',
+            handler: function() {
+                this.openHistory();
+            }.bind(this),
+            hidden: !this.enableHistoryPanel,
+        });
+
+        this.historyCharButton = new Ext.Button({
+            text: 'История',
+            iconCls: 'x-ccb-btn-hist',
+            handler: function() {
+                this.openCharHistory();
+            }.bind(this),
+            hidden: !this.enableHistoryPanel || this.useHistoryPanelWithDeletedChars,
+            disabled: true,
+        });
+
+        this.historyAuditButton = new Ext.Button({
+            text: 'Аудит',
+            iconCls: 'x-ccb-btn-hist',
+            handler: function() {
+                this.openHistoryUserAudit();
+            }.bind(this),
+            hidden: !this.enableHistoryPanel || !this.useHistoryPanelWithDeletedChars,
+        });
+
+        this.calendar = Ext.create({
+            xtype: 'datefield',
+            allowBlank: false,
+            margin: 10,
+            hidden: this.calenderHidden,
+            format: this.calendarFormat,
+        });
+
+        this.calendar.on('validate', this.validateDateHandler, this);
+        this.calendar.on('select', this.changeCalendarHandler, this);
+
+        this.tbarItems = [
+            this.calendar,
+            this.historyButton,
+            this.historyCharButton,
+            this.historyAuditButton
+        ];
+
+        this.callParent();
+    },
+
+    createColumns: function() {
+        const columns = this.callParent();
+
+        const actions = !this.readOnly && columns.items.pop();
+
+        if (this.showDateColumn) {
+            columns.items.push(this.createCMEffectiveDate());
+        }
+
+        if (!this.readOnly) {
+            columns.items.push(actions);
+        }
+        return columns;
+    },
+
+    createCMEffectiveDate: function() {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+
+        return {
+            xtype: 'hintDateColumn',
+            header: 'Дата начала',
+            tdCls: 'effective-at-column',
+            width: this.dateWidth,
+            dataIndex: ns.$effectiveDate,
+            sortable: true,
+        };
+    },
+
+    setDate: function(date) {
+        this.callParent();
+        this.calendar.setValue(date);
+    },
+
+    changeDate: function(date) {
+        if (!date) {
+            date = new Date().getFirstDateOfMonth();
+        }
+
+        this.setDate(date);
+        this.changeCalendarHandler();
+    },
+
+    changeCalendarHandler: function() {
+        const date = this.calendar.getValue();
+        if (date) {
+            this.effectiveDate = Ext.util.Format.date(date, Coon.format.dateInternal);
+            this.fireEvent('changeDate', this, date);
+        }
+    },
+
+    validateDateHandler: function(calendar, date) {
+        if ((this.minDate && this.minDate > date) || (this.maxDate && this.maxDate < date)) {
+            return false;
+        }
+    },
+
+    setDateRestrictions: function(minDate, maxDate) {
+        if (minDate && !(minDate instanceof Date)) {
+            minDate = new Date(minDate);
+        }
+        if (maxDate && !(maxDate instanceof Date)) {
+            maxDate = new Date(maxDate);
+        }
+        this.minDate = minDate;
+        this.maxDate = maxDate;
+        this.calendar.setMinValue(this.minDate);
+        this.calendar.setMaxValue(this.maxDate);
+    },
+
+    getHistoryWindow: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanel');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'Вся история',
+            maximized: true,
+            maximizable: false,
+        });
+
+        return this.historyWindow;
+    },
+
+    getHistoryWindowWithDeletedChars: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelWithDeletedChars');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'Вся история',
+            maximized: true,
+            maximizable: false,
+        });
+
+        return this.historyWindow;
+    },
+
+    getHistoryAuditWindow: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelAudit');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'История характеристик',
+            maximized: true,
+        });
+
+        return this.historyWindow;
+    },
+
+    getUserAuditWindow: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryUserAudit');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'Аудит',
+            maximized: true,
+        });
+
+        return this.historyWindow;
+    },
+
+    openHistory: function() {
+        const date = this.calendar.getValue();
+        if (date) {
+            if (this.useHistoryPanelWithDeletedChars) {
+                const ns = Coon.report.model.CharacteristicBeanFields;
+                const charTypeCd = this.getSelected() && this.getSelected().get(ns.$type);
+                const win = this.getHistoryWindowWithDeletedChars();
+                win.show();
+                win.content.doInit(
+                    this.model.ID,
+                    this.model.subentityId,
+                    this.model.characteristicEntity,
+                    charTypeCd,
+                    date
+                );
+            } else {
+                const win = this.getHistoryWindow();
+                win.show();
+                win.content.doInit(
+                    this.model.ID,
+                    this.model.subentityId,
+                    this.model.characteristicEntity,
+                    date
+                );
+            }
+        }
+    },
+
+    openCharHistory: function() {
+        const date = this.calendar.getValue();
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        const charTypeCd = this.getSelected().get(ns.$type);
+        if (date && charTypeCd) {
+            const win = this.getHistoryAuditWindow();
+            win.show();
+            win.content.doInit(
+                this.model.ID,
+                this.model.subentityId,
+                this.model.characteristicEntity,
+                charTypeCd,
+                date
+            );
+        }
+    },
+
+    openHistoryUserAudit: function() {
+        if (this.useHistoryPanelWithDeletedChars) {
+            const win = this.getUserAuditWindow();
+            win.show();
+            win.content.doInit(
+                this.model.ID,
+                this.model.subentityId,
+                this.model.characteristicEntity
+            );
+        }
+    },
+});