ru.coon 2.7.44 → 2.7.46

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

@@ -1,66 +1,66 @@
-@mixin CharacteristicGridEditor {
-  &.compact-view {
-    .x-header {
-      padding: 0.7em;
-    }
-    .x-toolbar {
-      padding: 0.7em;
-      .x-btn {
-        padding: 0;
-        .x-btn-icon-el {
-          display: none;
-        }
-      }
-    }
-    .x-grid-header-ct .x-column-header-inner {
-      padding: 0.5em;
-    }
-    .x-grid-group-hd {
-      padding: 0.7em;
-    }
-  }
-
-  &.show-menu-burger {
-    .x-header .x-btn {
-      padding: 0;
-      .x-btn-button {
-        padding: 0;
-      }
-      .x-btn-arrow-right:after {
-        display: none;
-      }
-    }
-  }
-
-  &.hide-grid-header {
-    .x-grid-header-ct {
-      display: none;
-    }
-  }
-
-  .x-toolbar{
-    background-color: #ffffff;
-  }
-  .preferred-value-row {
-    .value-column {
-      background-color: orange;
-    }
-  }
-  .required-value-row {
-    .value-column {
-      background-color: red;
-    }
-  }
-  .readonly-value-row {
-    .value-column {
-      background-color: #f5f5f5;
-      &:hover {
-        cursor: not-allowed;
-      }
-    }
-  }
-}
-
-.CharacteristicGridEditor {
-  @include CharacteristicGridEditor();
-}
+@mixin CharacteristicGridEditor {
+  &.compact-view {
+    .x-header {
+      padding: 0.7em;
+    }
+    .x-toolbar {
+      padding: 0.7em;
+      .x-btn {
+        padding: 0;
+        .x-btn-icon-el {
+          display: none;
+        }
+      }
+    }
+    .x-grid-header-ct .x-column-header-inner {
+      padding: 0.5em;
+    }
+    .x-grid-group-hd {
+      padding: 0.7em;
+    }
+  }
+
+  &.show-menu-burger {
+    .x-header .x-btn {
+      padding: 0;
+      .x-btn-button {
+        padding: 0;
+      }
+      .x-btn-arrow-right:after {
+        display: none;
+      }
+    }
+  }
+
+  &.hide-grid-header {
+    .x-grid-header-ct {
+      display: none;
+    }
+  }
+
+  .x-toolbar{
+    background-color: #ffffff;
+  }
+  .preferred-value-row {
+    .value-column {
+      background-color: orange;
+    }
+  }
+  .required-value-row {
+    .value-column {
+      background-color: red;
+    }
+  }
+  .readonly-value-row {
+    .value-column {
+      background-color: #f5f5f5;
+      &:hover {
+        cursor: not-allowed;
+      }
+    }
+  }
+}
+
+.CharacteristicGridEditor {
+  @include CharacteristicGridEditor();
+}

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

@@ -54,9 +54,7 @@ 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) : {});
+        record.set('editorConfig', Ext.decode(record.get('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).trim())) {
@@ -66,37 +64,35 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
                 grid: this.grid,
             });
         } else {
-            let editor = this.editors[type];
-            if (!editor) {
-                switch (type) {
-                case Coon.common.component.editor.CharacteristicEditorTypes.TEXT:
-                    editor = new Coon.common.component.editor.TextTypeEditor();
-                    break;
-                case Coon.common.component.editor.CharacteristicEditorTypes.FLOAT:
-                    editor = new Coon.common.component.editor.NumberTypeEditor({
-                        record: record,
-                    });
-                    break;
-                case Coon.common.component.editor.CharacteristicEditorTypes.INT:
-                    editor = new Coon.common.component.editor.IntTypeEditor({
-                        record: record,
-                    });
-                    break;
-                case Coon.common.component.editor.CharacteristicEditorTypes.DATE:
-                    editor = new Coon.common.component.editor.DateTypeEditor({
-                        record: record,
-                    });
-                    break;
-                case Coon.common.component.editor.CharacteristicEditorTypes.LIST:
-                    editor = new Coon.common.component.editor.DFVTypeEditor({
-                        record: record,
-                    });
-                    break;
-                default:
-                    throw new Ext.Error('Не определен тип редактора');
-                }
-
-                this.editors[type] = editor;
+            let editor;
+            switch (type) {
+            case Coon.common.component.editor.CharacteristicEditorTypes.TEXT:
+                editor = new Coon.common.component.editor.TextTypeEditor({
+                    record: record,
+                });
+                break;
+            case Coon.common.component.editor.CharacteristicEditorTypes.FLOAT:
+                editor = new Coon.common.component.editor.NumberTypeEditor({
+                    record: record,
+                });
+                break;
+            case Coon.common.component.editor.CharacteristicEditorTypes.INT:
+                editor = new Coon.common.component.editor.IntTypeEditor({
+                    record: record,
+                });
+                break;
+            case Coon.common.component.editor.CharacteristicEditorTypes.DATE:
+                editor = new Coon.common.component.editor.DateTypeEditor({
+                    record: record,
+                });
+                break;
+            case Coon.common.component.editor.CharacteristicEditorTypes.LIST:
+                editor = new Coon.common.component.editor.DFVTypeEditor({
+                    record: record,
+                });
+                break;
+            default:
+                throw new Ext.Error('Не определен тип редактора');
             }
 
             return editor;
@@ -122,7 +118,12 @@ Ext.define('Coon.common.component.editor.TypeEditor', {
         this.prepare();
     },
 
-    createField: Ext.emptyFn,
+    createField: function(record) {
+        if (record.get('editorConfig') && record.get('editorConfig').regex) {
+            record.get('editorConfig').regex = new RegExp(record.get('editorConfig').regex);
+        }
+        return Ext.create(Ext.apply(this.field, record.get('editorConfig')));
+    },
 
     setData: Ext.emptyFn,
 
@@ -163,22 +164,19 @@ Ext.define('Coon.common.component.editor.TextTypeEditor', {
         const record = this.context.record;
         const type = this.grid.typeMap.get(record.get('type'));
         const field = this.field;
-        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;
-            }
+        if (record.get('editorConfig')) {
+            return;
+        }
+        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;
         }
     },
 });
@@ -207,13 +205,19 @@ 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;
-        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(';');
+        if (record.get('editorConfig')) {
+            return;
+        }
+        if (type && type.mask.startsWith('minValue')) {
+            const range = type.mask.split(';');
             field.minValue = range[0].slice(9);
-            field.maxValue = range.length === 2 ? range[1].slice(10) : Number.POSITIVE_INFINITY;
+            if (range.length === 2) {
+                field.maxValue = range[1].slice(10);
+            } else {
+                field.maxValue = Number.POSITIVE_INFINITY;
+            }
+        } else {
+            field.minValue = Number.NEGATIVE_INFINITY;
         }
     },
 
@@ -259,7 +263,7 @@ Ext.define('Coon.common.component.editor.DateTypeEditor', {
     ],
 
     createField: function() {
-        const mask = Ext.Object.isEmpty(this.record.get('editorConfig')) ? this.parseMask(this.record.get('mask')) : {};
+        const mask = this.record.get('editorConfig') ? this.parseMask(this.record.get('mask')) : {};
         return Ext.create(Ext.apply({
             xtype: 'datefield',
             allowBlank: true,
@@ -269,12 +273,13 @@ Ext.define('Coon.common.component.editor.DateTypeEditor', {
     },
 
     setData: function(value, record) {
-        const mask = Ext.Object.isEmpty(this.record.get('editorConfig')) ? this.parseMask(this.record.get('mask')) : {};
+        const editorConfig = this.record.get('editorConfig');
+        const mask = 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));
         }
-        const displayFormat = mask['displayFormat'] || (record.get('editorConfig') && record.get('editorConfig').displayFormat) || 'd.m.Y';
+        const displayFormat = mask['displayFormat'] || (editorConfig && editorConfig.displayFormat) || 'd.m.Y';
         record.set('valueDescription', Ext.util.Format.dateRenderer(displayFormat)(value));
     },
 

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/formeditor/UiCustomFilterForm.scss

@@ -1,7 +1,7 @@
-.UiCustomFilterForm{
-    margin-bottom: 20px;
-    margin-top: 5px;
-    .x-form-layout-wrap{
-        border-spacing: 0;
-    }
-}
+.UiCustomFilterForm{
+    margin-bottom: 20px;
+    margin-top: 5px;
+    .x-form-layout-wrap{
+        border-spacing: 0;
+    }
+}

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

@@ -1,42 +1,42 @@
-.UiCustomFormEditor {
-  .UiCFRow{
-    min-height: 20px;
-  }
-  .UiCFCell{
-    margin: 5px;
-  }
-  .selectedField {
-    border-radius: 2px;
-    border: 1px solid #c7eef5;
-  }
-
-  .UiCFContainer {
-    border-radius: 2px;
-    border: 1px solid #c7f5c8;
-  }
-
-  .cutCell {
-    border: 1px dashed red;
-  }
-}
-
-.UiCFMenuEditorWindow {
-  .no-used {
-    color: red;
-  }
-}
-
-.UiCFFavoriteMenuItem.x-menu-item-checked a .x-menu-item-icon {
-  color: gold;
-}
-
-.UiCFFavoriteMenuItem.x-menu-item-unchecked a .x-menu-item-icon {
-  color: #dddddd;
-}
-/*.UiCFCell .x-form-item :hover{
-  border: 1px solid blue;
-}
-
-.UiCFCell .x-form-item :hover{
-  border: 1px solid transparent;
-}*/
+.UiCustomFormEditor {
+  .UiCFRow{
+    min-height: 20px;
+  }
+  .UiCFCell{
+    margin: 5px;
+  }
+  .selectedField {
+    border-radius: 2px;
+    border: 1px solid #c7eef5;
+  }
+
+  .UiCFContainer {
+    border-radius: 2px;
+    border: 1px solid #c7f5c8;
+  }
+
+  .cutCell {
+    border: 1px dashed red;
+  }
+}
+
+.UiCFMenuEditorWindow {
+  .no-used {
+    color: red;
+  }
+}
+
+.UiCFFavoriteMenuItem.x-menu-item-checked a .x-menu-item-icon {
+  color: gold;
+}
+
+.UiCFFavoriteMenuItem.x-menu-item-unchecked a .x-menu-item-icon {
+  color: #dddddd;
+}
+/*.UiCFCell .x-form-item :hover{
+  border: 1px solid blue;
+}
+
+.UiCFCell .x-form-item :hover{
+  border: 1px solid transparent;
+}*/

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;
+}
+