ru.coon 2.5.67 → 2.6.0

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

@@ -30,7 +30,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
             text: 'Добавить',
             disabled: !this.showEditButtons(),
             hidden: this.hideButtons,
-            iconCls: 'svg-icon svg-icon-add',
+            // iconCls: 'svg-icon svg-icon-add',
             createSelectWindow: function() {
                 return Ext.create('Coon.common.component.editor.CharacteristicForeignWindow');
             },
@@ -44,7 +44,11 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                 },
             },
         });
-
+        this.viewConfig = {
+            getRowClass: Coon.Function.markDelete(
+                'isDeleted'
+            ),
+        };
         this.plugins = Ext.clone(this.plugins) || [];
 
         if (this.enableToolBar) {
@@ -72,7 +76,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                     add: this.addTypeButton,
                     del: {
                         text: 'Удалить',
-                        iconCls: 'svg-icon svg-icon-status-refusing',
+                        // iconCls: 'svg-icon svg-icon-status-refusing',
                         disabled: true,
                         hidden: this.hideButtons,
                         handler: this.delHandler.bind(this),

package/src/common/component/editor/TypedCharacteristicEditor.scss

@@ -1,7 +1,7 @@
-.TypedCharacteristicEditor {
-    @include CharacteristicGridEditor();
-    .x-btn-icon-left > .x-btn-icon-el-default-toolbar-small,
-    .x-btn-icon-right > .x-btn-icon-el-default-toolbar-small {
-    width: 24px !important;
-    }
-}
+.TypedCharacteristicEditor {
+    @include CharacteristicGridEditor();
+    .x-btn-icon-left > .x-btn-icon-el-default-toolbar-small,
+    .x-btn-icon-right > .x-btn-icon-el-default-toolbar-small {
+    width: 24px !important;
+    }
+}

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

@@ -1,8 +1,9 @@
-Ext.define('Coon.common.component.editor.creators.ByReportEditorCreator', {
-    extend: 'Coon.common.component.editor.creators.TriggerFieldEditorCreator',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.creators.ByReportEditorCreator'
-    ],
-    alias: 'widget.ByReportEditorCreator',
-    editable: false,
-});
+Ext.define('Coon.common.component.editor.creators.ByReportEditorCreator', {
+    extend: 'Coon.common.component.editor.creators.TriggerFieldEditorCreator',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.creators.ByReportEditorCreator'
+    ],
+    alias: 'widget.ByReportEditorCreator',
+    xtype: 'ByReportEditorCreator',
+    editable: false,
+});

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

@@ -4,12 +4,13 @@ Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.CustomPanelEditorCreator'
     ],
     alias: 'widget.CustomPanelEditorCreator',
+    xtype: 'CustomPanelEditorCreator',
     config: {
         uiElementCd: null,
     },
     createField: function(record, grid, context) {
         this.context = context;
-        this.field = Ext.create({
+        this.field = Ext.create(Ext.apply({
             xtype: 'textfield',
             setVisibleValue: function(visibleValue) {
                 this.visibleValue = visibleValue;
@@ -18,7 +19,7 @@ Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
                 return this.visibleValue;
             },
             editable: false,
-        });
+        }, record.get('editorConfig')));
         return this.field;
     },
     valueIsValidJson: function(str) {

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

@@ -4,7 +4,7 @@ Ext.define('Coon.common.component.editor.creators.ForeignKeyEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.ForeignKeyEditorCreator'
     ],
     alias: 'widget.ForeignKeyEditorCreator',
-
+    xtype: 'ForeignKeyEditorCreator',
     disableInternalEditor: true,
 
     createField: function(record, grid, context) {

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

@@ -4,10 +4,11 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.NoteEditorCreator'
     ],
     alias: 'widget.NoteEditorCreator',
-
+    xtype: 'NoteEditorCreator',
     createField: function(record, parent) {
         const ns = Coon.report.model.CharacteristicBeanFields;
-        this.field = Ext.create('Coon.common.field.OpenDialogField', {
+        this.field = Ext.create(Ext.apply({
+            xtype: 'OpenDialogField',
             dialogForm: this.showPanel(record, parent),
             getValue: this.getValue,
             noteID: record.get(ns.$value),
@@ -18,7 +19,7 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
             getVisibleValue: function() {
                 return this.visibleValue;
             },
-        }, this);
+        }, record.get('editorConfig')));
         return this.field;
     },
 

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

@@ -1,44 +1,61 @@
-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',
+    xtype: '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) {
+        return Ext.create(Ext.apply({
+            xtype: 'numberfield',
+            allowDecimals: true,
+            isFieldHighlightOnChange: false,
+            decimalPrecision: Ext.Object.isEmpty(record.get('editorConfig')) ? (record.get('mask') || 3) : 3,
+            enableKeyEvents: true,
+            truncate: false,
+            decimalSeparator: this.decimalSeparator,
+            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,
+                },
+            },
+            fixPrecision: function(value) {
+                const me = this;
+                const nan = isNaN(value);
+                let precision = me.decimalPrecision;
+
+                if (nan || !value) {
+                    return nan ? '' : value;
+                } else if (!me.allowDecimals || precision <= 0) {
+                    precision = 0;
+                }
+
+                return parseFloat(this.truncate ?
+                    Ext.Number.truncateToPrecision(parseFloat(value), precision) :
+                    Ext.Number.toFixed(parseFloat(value), precision)
+                );
+            },
+        }, record.get('editorConfig')));
+    },
+});

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

@@ -1,4 +1,5 @@
 Ext.define('Coon.common.component.editor.creators.PercentEditorCreator', {
     extend: 'Coon.common.component.editor.creators.NumberEditorCreator',
     alias: 'widget.PercentEditorCreator',
+    xtype: 'PercentEditorCreator',
 });

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

@@ -11,10 +11,8 @@ Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.SimpleReportEditorCreator'
     ],
     alias: 'widget.SimpleReportEditorCreator',
-
+    xtype: 'SimpleReportEditorCreator',
     createField: function(record, parent, context) {
-        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 = {};
@@ -24,14 +22,14 @@ Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
         if (entityTypeID) {
             params['ENTITY'] = entityTypeID;
         }
-        return Ext.create({
+        return Ext.create(Ext.apply({
             xtype: 'SimplestReportCombo',
-            reportId: reportId,
+            reportId: record.get('mask'),
             defaultParameters: Object.assign(params, context),
             valueField: 'VALUE',
             displayField: 'DESCRIPTION',
             searchBySubstring: true,
-        });
+        }, record.get('editorConfig')));
     },
 
 });

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

@@ -1,14 +1,12 @@
 Ext.define('Coon.common.component.editor.creators.TimeEditorCreator', {
     extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
     alias: 'widget.TimeEditorCreator',
-
+    xtype: 'TimeEditorCreator',
     createField: function(record, parent) {
-        const charNs = Coon.report.model.CharacteristicBeanFields;
-
-        return Ext.create({
+        return Ext.create(Ext.apply({
             xtype: 'DeliveryTimeField',
-            format: record.get(charNs.$mask).trim() || 'H:i',
+            format: Ext.Object.isEmpty(record.get('editorConfig')) ? record.get('mask').trim() || 'H:i' : 'H:i',
             increment: 60,
-        });
+        }, record.get('editorConfig')));
     },
 });

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

@@ -4,6 +4,7 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.TriggerFieldEditorCreator'
     ],
     alias: 'widget.TriggerFieldEditorCreator',
+    xtype: 'TriggerFieldEditorCreator',
     assignDoubleClick: true,
     updateOnClose: false,
     editable: true,

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'}
+        ];
+    },
+});

package/src/common/component/settings/modules/settingClosePageConfirmation.js

@@ -1,27 +1,27 @@
-Ext.define('Coon.common.component.settings.modules.settingClosePageConfirmation', {
-    alias: 'usersetting.closePageConfirmation',
-    defaultValue: false,
-    getFieldComponent: (get, set) => {
-        return {
-            xtype: 'checkbox',
-            fieldLabel: 'Предупреждать при закрытии страницы',
-            labelAlign: 'left',
-            value: get(),
-            labelWidth: 300,
-            listeners: {
-                change: function(_, value) {
-                    set(value);
-                },
-            },
-        };
-    },
-    init(get) {
-        window.onbeforeunload = function(event) {
-            const state = get();
-            if (state) {
-                event.preventDefault();
-                return event.returnValue = 'Вы подтверждаете что хотите закрыть текущую вкладку?';
-            };
-        };
-    },
-});
+Ext.define('Coon.common.component.settings.modules.settingClosePageConfirmation', {
+    alias: 'usersetting.closePageConfirmation',
+    defaultValue: false,
+    getFieldComponent: (get, set) => {
+        return {
+            xtype: 'checkbox',
+            fieldLabel: 'Предупреждать при закрытии страницы',
+            labelAlign: 'left',
+            value: get(),
+            labelWidth: 300,
+            listeners: {
+                change: function(_, value) {
+                    set(value);
+                },
+            },
+        };
+    },
+    init(get) {
+        window.onbeforeunload = function(event) {
+            const state = get();
+            if (state) {
+                event.preventDefault();
+                return event.returnValue = 'Вы подтверждаете что хотите закрыть текущую вкладку?';
+            };
+        };
+    },
+});

package/src/common/component/settings/modules/settingShowNeedReloadMessage.js

@@ -1,75 +1,75 @@
-Ext.define('Coon.common.component.settings.modules.settingShowNeedReloadMessage', {
-    alias: 'usersetting.showNeedReloadMessage',
-    defaultValue: true,
-    getFieldComponent: (get, set) => {
-        return {
-            xtype: 'checkbox',
-            fieldLabel: 'Выводить сообщение о необходимости перезагрузить старницу после обновления приложения',
-            labelAlign: 'left',
-            value: get(),
-            labelWidth: 300,
-            listeners: {
-                change: function(_, value) {
-                    set(value);
-                },
-            },
-        };
-    },
-    init(get) {
-        this.lastRevision = undefined;
-        const state = get();
-        Coon.util.promisifyCmd(
-            'command.LoadReportConfig',
-            'GET_CURRENT_REVISION',
-            true
-        ).then((result) => {
-            if (!result) {
-                Coon.log.debug('No report for detecting cfgRevision update');
-                return;
-            }
-            if (result.reportId && state) {
-                this.timerId = setInterval(this.getCfgRevisionCommand, 300000);
-            }
-        });
-    },
-
-    getCfgRevisionCommand() {
-        const me =this;
-        return Coon.util.promisifyCmd(
-            'command.GetDynamicReportDataCommand',
-            'GET_CURRENT_REVISION'
-        ).then((result) => {
-            if (!result.list || !result.list.length) {
-                me.clearTimerId();
-                return;
-            }
-            const forceEnableNotify = result.list[0].GLOBAL_REVISION_NOTIFICATION_SW;
-            const currentRevision = result.list[0].CURRENT_REVISION;
-            if (forceEnableNotify !== 'Y') {
-                Coon.userSettings.set('showNeedReloadMessage', false);
-                me.clearTimerId();
-                return;
-            }
-            if (!currentRevision) {
-                Coon.log.error('No cfgRevision value');
-                return;
-            }
-            this.lastRevision = this.lastRevision || currentRevision;
-            if (this.lastRevision !== currentRevision) {
-                me.clearTimerId();
-                Ext.Msg.confirm('Сообщение системы', 'Доступна новая версия. Обновить?',
-                    function(choice) {
-                        if (choice === 'yes') {
-                            window.location.reload();
-                        }
-                    }
-                );
-            }
-        });
-    },
-
-    clearTimerId() {
-        this.timerId && clearInterval(this.timerId);
-    },
-
-});
+Ext.define('Coon.common.component.settings.modules.settingShowNeedReloadMessage', {
+    alias: 'usersetting.showNeedReloadMessage',
+    defaultValue: true,
+    getFieldComponent: (get, set) => {
+        return {
+            xtype: 'checkbox',
+            fieldLabel: 'Выводить сообщение о необходимости перезагрузить старницу после обновления приложения',
+            labelAlign: 'left',
+            value: get(),
+            labelWidth: 300,
+            listeners: {
+                change: function(_, value) {
+                    set(value);
+                },
+            },
+        };
+    },
+    init(get) {
+        this.lastRevision = undefined;
+        const state = get();
+        Coon.util.promisifyCmd(
+            'command.LoadReportConfig',
+            'GET_CURRENT_REVISION',
+            true
+        ).then((result) => {
+            if (!result) {
+                Coon.log.debug('No report for detecting cfgRevision update');
+                return;
+            }
+            if (result.reportId && state) {
+                this.timerId = setInterval(this.getCfgRevisionCommand, 300000);
+            }
+        });
+    },
+
+    getCfgRevisionCommand() {
+        const me =this;
+        return Coon.util.promisifyCmd(
+            'command.GetDynamicReportDataCommand',
+            'GET_CURRENT_REVISION'
+        ).then((result) => {
+            if (!result.list || !result.list.length) {
+                me.clearTimerId();
+                return;
+            }
+            const forceEnableNotify = result.list[0].GLOBAL_REVISION_NOTIFICATION_SW;
+            const currentRevision = result.list[0].CURRENT_REVISION;
+            if (forceEnableNotify !== 'Y') {
+                Coon.userSettings.set('showNeedReloadMessage', false);
+                me.clearTimerId();
+                return;
+            }
+            if (!currentRevision) {
+                Coon.log.error('No cfgRevision value');
+                return;
+            }
+            this.lastRevision = this.lastRevision || currentRevision;
+            if (this.lastRevision !== currentRevision) {
+                me.clearTimerId();
+                Ext.Msg.confirm('Сообщение системы', 'Доступна новая версия. Обновить?',
+                    function(choice) {
+                        if (choice === 'yes') {
+                            window.location.reload();
+                        }
+                    }
+                );
+            }
+        });
+    },
+
+    clearTimerId() {
+        this.timerId && clearInterval(this.timerId);
+    },
+
+});

package/src/common/component/settings/modules/settingwindowHolder.js

@@ -1,21 +1,21 @@
-Ext.define('Coon.common.component.settings.modules.settingwindowHolder', {
-    alias: 'usersetting.windowHolder',
-    defaultValue: false,
-    getFieldComponent: (get, set) => {
-        return {
-            xtype: 'checkbox',
-            fieldLabel: 'сворачивать окно добавления/редактирования',
-            labelAlign: 'left',
-            value: get(),
-            labelWidth: 300,
-            listeners: {
-                change: function(_, value) {
-                    set(value);
-                },
-            },
-        };
-    },
-    init(get) {
-        Coon.setup.set('windowHolderMode', get());
-    },
-});
+Ext.define('Coon.common.component.settings.modules.settingwindowHolder', {
+    alias: 'usersetting.windowHolder',
+    defaultValue: false,
+    getFieldComponent: (get, set) => {
+        return {
+            xtype: 'checkbox',
+            fieldLabel: 'сворачивать окно добавления/редактирования',
+            labelAlign: 'left',
+            value: get(),
+            labelWidth: 300,
+            listeners: {
+                change: function(_, value) {
+                    set(value);
+                },
+            },
+        };
+    },
+    init(get) {
+        Coon.setup.set('windowHolderMode', get());
+    },
+});