ru.coon 2.7.4 → 2.7.6

package/src/common/component/formeditor/UiCustomFormEditor.scss

@@ -1,13 +1,13 @@
-.UiCustomFormEditor{
-  .selectedField{
-    border-radius: 2px;
-    border: 1px solid #c7eef5;
-  }
-  .UiCFContainer{
-    border-radius: 2px;
-    border: 1px solid #c7f5c8;
-  }
-  .cutCell{
-    border: 1px dashed red;
-  }
-}
+.UiCustomFormEditor{
+  .selectedField{
+    border-radius: 2px;
+    border: 1px solid #c7eef5;
+  }
+  .UiCFContainer{
+    border-radius: 2px;
+    border: 1px solid #c7f5c8;
+  }
+  .cutCell{
+    border: 1px dashed red;
+  }
+}

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

package/src/common/component/settings/stores/userSettingsStoreService.js

@@ -1,37 +1,37 @@
-Ext.define('Coon.common.component.settings.stores.userSettingsStoreService', {
-    requires: [
-        'Coon.common.component.settings.commands.getUserSettingsCommand',
-        'Coon.common.component.settings.commands.setUserPropValueCommand'
-    ],
-
-    getAll() {
-        return Coon.util.promisifyCmd('command.getUserSettingsCommand')
-            .then((data) => {
-                if (Array.isArray(data)) {
-                    return data.reduce((acc, el) => {
-                        if (el.uiPropertyId) {
-                            try {
-                                el.value = JSON.parse(el.value);
-                            } catch (ex) {
-                                Coon.log.error(`broken value for user setting "${el.uiPropertyId}"`, ex);
-                                el.value = {value: el.value};
-                            }
-                            acc[el.uiPropertyId] = el.value && el.value.value;
-                        }
-                        return acc;
-                    }, {});
-                }
-            });
-    },
-
-    set(prop, value) {
-        return Coon.util.promisifyCmd(
-            'command.setUserPropValueCommand',
-            prop,
-            JSON.stringify({
-                typeof: Coon.util.typeOf(value),
-                value,
-            })
-        );
-    },
-});
+Ext.define('Coon.common.component.settings.stores.userSettingsStoreService', {
+    requires: [
+        'Coon.common.component.settings.commands.getUserSettingsCommand',
+        'Coon.common.component.settings.commands.setUserPropValueCommand'
+    ],
+
+    getAll() {
+        return Coon.util.promisifyCmd('command.getUserSettingsCommand')
+            .then((data) => {
+                if (Array.isArray(data)) {
+                    return data.reduce((acc, el) => {
+                        if (el.uiPropertyId) {
+                            try {
+                                el.value = JSON.parse(el.value);
+                            } catch (ex) {
+                                Coon.log.error(`broken value for user setting "${el.uiPropertyId}"`, ex);
+                                el.value = {value: el.value};
+                            }
+                            acc[el.uiPropertyId] = el.value && el.value.value;
+                        }
+                        return acc;
+                    }, {});
+                }
+            });
+    },
+
+    set(prop, value) {
+        return Coon.util.promisifyCmd(
+            'command.setUserPropValueCommand',
+            prop,
+            JSON.stringify({
+                typeof: Coon.util.typeOf(value),
+                value,
+            })
+        );
+    },
+});

package/src/common/component/visualeditor/UiCPVisualEditor.scss

@@ -1,108 +1,108 @@
-.UiCPVisualEditor {
-  .x-grid-cell-inner .x-btn {
-    padding: 0;
-  }
-
-  .widget-box {
-    border: 2px solid #e0e0e0;
-    margin: 10px 20px;
-    padding: 7px;
-    border-radius: 10px;
-  }
-
-  /*-------------*/
-  .borders {
-    margin: 0 3px 15px 3px !important;
-    box-shadow: 0 1px 6px 0 rgba(86, 112, 163, 0.2);
-  }
-
-  .borders > .x-panel-bodyWrap > .x-panel-body {
-    border: 1px solid #e0e0e0 !important;
-    border-radius: 0 0 5px 5px;
-    margin-top: -1px;
-  }
-
-  .no-header-panel .x-panel-bodyWrap > .x-panel-body {
-    border: 1px solid #e0e0e0 !important;
-    border-radius: 5px;
-    margin-top: 0;
-  }
-
-  .borders .x-panel-header {
-    border-radius: 5px 5px 0 0;
-    height: auto;
-  }
-
-  .draggable-element {
-    width: 100px;
-    height: 100px;
-    background-color: #e0e0e0;
-  }
-
-
-  .btn i {
-    color: #FFF;
-    font-style: normal;
-  }
-
-
-  .icon {
-    font-size: 18px;
-    display: block;
-    text-align: center;
-    margin-top: 6px;
-  }
-
-
-  .btn {
-    &:hover {
-      background-color: rgba(61, 103, 128, 1) !important;
-    }
-
-    width: 30px;
-    height: 30px;
-    background-color: rgba(61, 103, 128, 0.7);
-    border-radius: 18px;
-    cursor: pointer;
-    z-index: 999;
-  }
-
-  .center-btn {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin: -12px 0 0 -11px;
-  }
-
-  .right-top-btn {
-    position: absolute;
-    right: 0;
-    top: 0;
-    margin: 1px 0 0 0;
-  }
-
-  .hidden-btn {
-    display: none !important;
-  }
-
-  .borders-default {
-    border: 1px solid black;
-  }
-
-  .hover-item {
-    border: 1px solid red;
-  }
-
-  .tree-container .x-panel-body{
-    background-color: #f0f0f0;
-  }
-}
-
-.menu-tip .x-tool-close {
-  background-color: #111111 !important;
-}
-
-.svg-icon-tool {
-  background-color: white !important;
-}
-
+.UiCPVisualEditor {
+  .x-grid-cell-inner .x-btn {
+    padding: 0;
+  }
+
+  .widget-box {
+    border: 2px solid #e0e0e0;
+    margin: 10px 20px;
+    padding: 7px;
+    border-radius: 10px;
+  }
+
+  /*-------------*/
+  .borders {
+    margin: 0 3px 15px 3px !important;
+    box-shadow: 0 1px 6px 0 rgba(86, 112, 163, 0.2);
+  }
+
+  .borders > .x-panel-bodyWrap > .x-panel-body {
+    border: 1px solid #e0e0e0 !important;
+    border-radius: 0 0 5px 5px;
+    margin-top: -1px;
+  }
+
+  .no-header-panel .x-panel-bodyWrap > .x-panel-body {
+    border: 1px solid #e0e0e0 !important;
+    border-radius: 5px;
+    margin-top: 0;
+  }
+
+  .borders .x-panel-header {
+    border-radius: 5px 5px 0 0;
+    height: auto;
+  }
+
+  .draggable-element {
+    width: 100px;
+    height: 100px;
+    background-color: #e0e0e0;
+  }
+
+
+  .btn i {
+    color: #FFF;
+    font-style: normal;
+  }
+
+
+  .icon {
+    font-size: 18px;
+    display: block;
+    text-align: center;
+    margin-top: 6px;
+  }
+
+
+  .btn {
+    &:hover {
+      background-color: rgba(61, 103, 128, 1) !important;
+    }
+
+    width: 30px;
+    height: 30px;
+    background-color: rgba(61, 103, 128, 0.7);
+    border-radius: 18px;
+    cursor: pointer;
+    z-index: 999;
+  }
+
+  .center-btn {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin: -12px 0 0 -11px;
+  }
+
+  .right-top-btn {
+    position: absolute;
+    right: 0;
+    top: 0;
+    margin: 1px 0 0 0;
+  }
+
+  .hidden-btn {
+    display: none !important;
+  }
+
+  .borders-default {
+    border: 1px solid black;
+  }
+
+  .hover-item {
+    border: 1px solid red;
+  }
+
+  .tree-container .x-panel-body{
+    background-color: #f0f0f0;
+  }
+}
+
+.menu-tip .x-tool-close {
+  background-color: #111111 !important;
+}
+
+.svg-icon-tool {
+  background-color: white !important;
+}
+

package/src/common/field/BankBikField.js

@@ -1,15 +1,15 @@
-Ext.define('Coon.common.field.BankBikField', {
-    extend: 'Ext.form.field.Text',
-    inputMask: '999999999',
-    xtype: 'BankBikField',
-    validator: function(value) {
-        const val = value.replace(/\_/gi, '');
-        if (!val.length) {
-            return true;
-        }
-        if (/[^0-9]/.test(val) === false) {
-            return 'Поле должно содержать только цифры';
-        }
-        return val.length === 9 ? true : 'Поле должно содержать 9 символов';
-    },
-});
+Ext.define('Coon.common.field.BankBikField', {
+    extend: 'Ext.form.field.Text',
+    inputMask: '999999999',
+    xtype: 'BankBikField',
+    validator: function(value) {
+        const val = value.replace(/\_/gi, '');
+        if (!val.length) {
+            return true;
+        }
+        if (/[^0-9]/.test(val) === false) {
+            return 'Поле должно содержать только цифры';
+        }
+        return val.length === 9 ? true : 'Поле должно содержать 9 символов';
+    },
+});