ru.coon 2.5.67 → 2.6.0

package/src/uielement/component/settings/PropertyTreePanel.js

@@ -1,121 +1,121 @@
-Ext.define('Coon.uielement.component.settings.PropertyTreePanel', {
-    extend: 'Ext.tree.Panel',
-    alias: 'widget.PropertyTreePanel',
-    xtype: 'PropertyTreePanel',
-    uses: [],
-    requires: [
-        'Coon.uielement.component.settings.PropertyModel'
-    ],
-    title: 'Настройки',
-    flex: 1,
-    frame: true,
-    reserveScrollbar: true,
-    useArrows: true,
-    rootVisible: false,
-    multiSelect: false,
-    singleExpand: false,
-    rowViewModel: true,
-    selModel: 'cellmodel',
-    plugins: {
-        cellediting: {
-            clicksToEdit: 1,
-        },
-    },
-    viewConfig: {
-        /* plugins: {
-            treeviewdragdrop: {
-                containerScroll: true
-            }
-        },
-        listeners: {
-            drop: function () {
-                this.getSelectionModel().clearSelections();
-            },
-            beforedrop: 'beforeDrop'
-        }*/
-    },
-    store: {
-        type: 'tree',
-        model: 'Coon.uielement.component.settings.PropertyModel',
-    },
-    dockedItems: {
-        xtype: 'toolbar',
-        dock: 'top',
-        items: [
-            {
-                xtype: 'button',
-                text: 'Добавить',
-                ui: 'orange-button',
-                width: 100,
-                handler: 'addProperty',
-            }
-        ],
-    },
-    columns: [
-        /* {
-            xtype: 'actioncolumn',
-            width: 30,
-            items: [
-                {
-                    //iconCls: 'svg-icon svg-icon-edit',
-                    iconCls: 'x-ccb-btn-custom-pencil',
-                    tooltip: 'Редактировать',
-                    //handler: 'onEditDetail'
-                }
-            ]
-        },*/
-        {
-            xtype: 'hintColumn',
-            text: 'Свойство',
-            dataIndex: 'name',
-            editor: {
-                alignment: 'tl-tl',
-                field: {
-                    xtype: 'textfield',
-                },
-            },
-        },
-        {
-            xtype: 'treecolumn',
-            text: 'Значение',
-            flex: 1,
-            dataIndex: 'value',
-            editor: {
-                alignment: 'tl-tl',
-                field: {
-                    xtype: 'textfield',
-                },
-            },
-            cellTpl: [
-                '<table><tr>',
-                '<tpl for="lines">',
-                '<td class="{parent.childCls} {parent.elbowCls}-img ',
-                '{parent.elbowCls}-<tpl if=".">line<tpl else>empty</tpl>" role="presentation"></td>',
-                '</tpl>',
-                '<td class="{childCls} {elbowCls}-img {elbowCls}',
-                '<tpl if="isLast">-end</tpl><tpl if="expandable">-plus {expanderCls}</tpl>" role="presentation"></td>',
-                '<td role="presentation" class="x-tree-icon svg-icon {svgIconCls}" >',
-                '</td>',
-                '<td class="{textCls} {childCls}">{value}</td>',
-                '</tr></table>'
-            ],
-        },
-        {
-            xtype: 'actioncolumn',
-            width: 30,
-            items: [
-                {
-                    iconCls: 'svg-icon svg-icon-close',
-                    ui: 'orange-button',
-                    tooltip: 'Удалить',
-                    handler: 'onRemoveProperty',
-                }
-            ],
-        }
-    ],
-    listeners: {
-        beforeedit: function(editor, context) {
-            return context.record.getData().leaf;
-        },
-    },
-});
+Ext.define('Coon.uielement.component.settings.PropertyTreePanel', {
+    extend: 'Ext.tree.Panel',
+    alias: 'widget.PropertyTreePanel',
+    xtype: 'PropertyTreePanel',
+    uses: [],
+    requires: [
+        'Coon.uielement.component.settings.PropertyModel'
+    ],
+    title: 'Настройки',
+    flex: 1,
+    frame: true,
+    reserveScrollbar: true,
+    useArrows: true,
+    rootVisible: false,
+    multiSelect: false,
+    singleExpand: false,
+    rowViewModel: true,
+    selModel: 'cellmodel',
+    plugins: {
+        cellediting: {
+            clicksToEdit: 1,
+        },
+    },
+    viewConfig: {
+        /* plugins: {
+            treeviewdragdrop: {
+                containerScroll: true
+            }
+        },
+        listeners: {
+            drop: function () {
+                this.getSelectionModel().clearSelections();
+            },
+            beforedrop: 'beforeDrop'
+        }*/
+    },
+    store: {
+        type: 'tree',
+        model: 'Coon.uielement.component.settings.PropertyModel',
+    },
+    dockedItems: {
+        xtype: 'toolbar',
+        dock: 'top',
+        items: [
+            {
+                xtype: 'button',
+                text: 'Добавить',
+                ui: 'orange-button',
+                width: 100,
+                handler: 'addProperty',
+            }
+        ],
+    },
+    columns: [
+        /* {
+            xtype: 'actioncolumn',
+            width: 30,
+            items: [
+                {
+                    //iconCls: 'svg-icon svg-icon-edit',
+                    iconCls: 'x-ccb-btn-custom-pencil',
+                    tooltip: 'Редактировать',
+                    //handler: 'onEditDetail'
+                }
+            ]
+        },*/
+        {
+            xtype: 'hintColumn',
+            text: 'Свойство',
+            dataIndex: 'name',
+            editor: {
+                alignment: 'tl-tl',
+                field: {
+                    xtype: 'textfield',
+                },
+            },
+        },
+        {
+            xtype: 'treecolumn',
+            text: 'Значение',
+            flex: 1,
+            dataIndex: 'value',
+            editor: {
+                alignment: 'tl-tl',
+                field: {
+                    xtype: 'textfield',
+                },
+            },
+            cellTpl: [
+                '<table><tr>',
+                '<tpl for="lines">',
+                '<td class="{parent.childCls} {parent.elbowCls}-img ',
+                '{parent.elbowCls}-<tpl if=".">line<tpl else>empty</tpl>" role="presentation"></td>',
+                '</tpl>',
+                '<td class="{childCls} {elbowCls}-img {elbowCls}',
+                '<tpl if="isLast">-end</tpl><tpl if="expandable">-plus {expanderCls}</tpl>" role="presentation"></td>',
+                '<td role="presentation" class="x-tree-icon svg-icon {svgIconCls}" >',
+                '</td>',
+                '<td class="{textCls} {childCls}">{value}</td>',
+                '</tr></table>'
+            ],
+        },
+        {
+            xtype: 'actioncolumn',
+            width: 30,
+            items: [
+                {
+                    iconCls: 'svg-icon svg-icon-close',
+                    ui: 'orange-button',
+                    tooltip: 'Удалить',
+                    handler: 'onRemoveProperty',
+                }
+            ],
+        }
+    ],
+    listeners: {
+        beforeedit: function(editor, context) {
+            return context.record.getData().leaf;
+        },
+    },
+});

package/src/uielement/component/settings/UiAceEditor.js

@@ -14,9 +14,11 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
         value: '',
         readOnly: false,
         useLinter: false,
+        enableEmptyValue: false,
     },
     errors: [],
     keyMapEnabled: true,
+    linterInitialized: false,
 
     keyMap: {
         'F4': {
@@ -249,20 +251,15 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
         }.bind(this));
         this.editor.setOptions(this.getEditModeConfig());
         if (this.getUseLinter()) {
-            const vm = this.up('UiCustomPanelEditor') ? this.up('UiCustomPanelEditor').getViewModel() : false;
-            this.addPlugin({ptype: 'UiAceLinterPlugin'});
-            if (typeof this.doLint === 'function' && vm) {
+            this.addPlugin({
+                ptype: 'UiAceLinterPlugin',
+                enableEmptyValue: this.enableEmptyValue,
+            });
+            if (typeof this.doLint === 'function') {
                 const doLint = new Ext.util.DelayedTask(this.doLint);
                 this.editor.on('change', (data) => {
-                    if (vm.get('iframeIsFirstLoad')) {
-                        doLint.delay(1000, undefined, undefined, [data]);
-                    }
+                    doLint.delay(1000, undefined, undefined, [data]);
                 }, this);
-                vm.bind('{iframeIsFirstLoad}', (iframeIsFirstLoad) => {
-                    if (iframeIsFirstLoad) {
-                        doLint.delay(1000, undefined, undefined, [this.editor.getSession().getValue()]);
-                    }
-                });
             }
         }
         if (this.type) {
@@ -277,6 +274,7 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
                 console.error(`${this.type} is not supported.`);
             }
         }
+        this.linterInitialized = true;
         this.fireEvent('ready', this);
     },
 

package/src/uielement/component/settings/UiCustomPanelAnnotationWindow.js

@@ -1,71 +1,71 @@
-/**
- * Window to view annotations
- */
-Ext.define('Coon.uielement.component.settings.UiCustomPanelAnnotationWindow', {
-    extend: 'Ext.window.Window',
-    xtype: 'UiCustomPanelAnnotationWindow',
-
-    layout: 'fit',
-    modal: 'true',
-    width: 620,
-    maxHeight: 350,
-    padding: 20,
-
-    buttons: [
-        {
-            text: 'Все равно сохранить?',
-            ui: 'blue-button',
-            itemId: 'save',
-        },
-        {
-            text: 'Отменить',
-            ui: 'blue-button',
-            handler() {
-                this.up('window').close();
-            },
-        }
-    ],
-
-    items: [{
-        xtype: 'container',
-        layout: 'vbox',
-        items: [
-            {
-                xtype: 'grid',
-                store: {
-                    fields: ['row', 'column', 'text', 'type'],
-                },
-                layout: 'fit',
-                hideHeaders: true,
-                columns: [
-                    {
-                        xtype: 'gridcolumn',
-                        text: 'Description',
-                        dataIndex: 'text',
-                        width: '100%',
-                        renderer(value, metadata, record) {
-                            metadata.style = `
-                                cursor: pointer;
-                                font-size: 14px;
-                                color: ${record.getData().type === 'error' ? 'red' : '#b9b92d'};
-                            `;
-                            return value;
-                        },
-                    }
-                ],
-                width: '100%',
-                margin: '0 0 20 0',
-                infinite: false,
-                maxHeight: 120,
-                scrollable: true,
-                rowLines: false,
-                border: false,
-            }
-        ],
-    }],
-
-    initComponent() {
-        this.callParent(arguments);
-        this.down('grid').store.loadData(this.messages);
-    },
-});
+/**
+ * Window to view annotations
+ */
+Ext.define('Coon.uielement.component.settings.UiCustomPanelAnnotationWindow', {
+    extend: 'Ext.window.Window',
+    xtype: 'UiCustomPanelAnnotationWindow',
+
+    layout: 'fit',
+    modal: 'true',
+    width: 620,
+    maxHeight: 350,
+    padding: 20,
+
+    buttons: [
+        {
+            text: 'Все равно сохранить?',
+            ui: 'blue-button',
+            itemId: 'save',
+        },
+        {
+            text: 'Отменить',
+            ui: 'blue-button',
+            handler() {
+                this.up('window').close();
+            },
+        }
+    ],
+
+    items: [{
+        xtype: 'container',
+        layout: 'vbox',
+        items: [
+            {
+                xtype: 'grid',
+                store: {
+                    fields: ['row', 'column', 'text', 'type'],
+                },
+                layout: 'fit',
+                hideHeaders: true,
+                columns: [
+                    {
+                        xtype: 'gridcolumn',
+                        text: 'Description',
+                        dataIndex: 'text',
+                        width: '100%',
+                        renderer(value, metadata, record) {
+                            metadata.style = `
+                                cursor: pointer;
+                                font-size: 14px;
+                                color: ${record.getData().type === 'error' ? 'red' : '#b9b92d'};
+                            `;
+                            return value;
+                        },
+                    }
+                ],
+                width: '100%',
+                margin: '0 0 20 0',
+                infinite: false,
+                maxHeight: 120,
+                scrollable: true,
+                rowLines: false,
+                border: false,
+            }
+        ],
+    }],
+
+    initComponent() {
+        this.callParent(arguments);
+        this.down('grid').store.loadData(this.messages);
+    },
+});

package/src/uielement/component/settings/UiCustomPanelEditor.scss

@@ -1,10 +1,10 @@
-.UiCustomPanelEditor {
-    .good-hash {
-        color: #64AA2B;
-        font-size: 19px;
-    }
-    .bad-hash {
-        color: red;
-        font-size: 19px;
-    }
+.UiCustomPanelEditor {
+    .good-hash {
+        color: #64AA2B;
+        font-size: 19px;
+    }
+    .bad-hash {
+        color: red;
+        font-size: 19px;
+    }
 }

package/src/uielement/component/settings/config/UiCPConfigPanelController.js

@@ -48,6 +48,8 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
         uiEditor.setCallback(
             this.getConfigHandlerNames.bind(this)
         );
+        const doLint = new Ext.util.DelayedTask(uiEditor.doLint);
+        doLint.delay(1000, undefined, undefined, [uiEditor.editor.getSession().getValue()]);
     },
     setHandlerList(data) {
         this.lookup('uiEditor').setHandlerList(data);

package/src/uielement/component/settings/config/UiCPConfigPanelController.scss

@@ -1,24 +1,24 @@
-.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
-	color: red !important;
-}
-
-.errorsCountBtn, .warningsCountBtn {
-	font-size: 15px !important;
-	background-color: white !important;
-}
-
-.warningsCountBtn span[data-ref="btnInnerEl"] {
-	color: #b9b92d !important;
-}
-
-.errorsCountMsg {
-	margin-top: 12px !important;
-}
-
-.x-warningsCountBtn-focus {
-	background-color: white !important;
-}
-
-.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
-	background-color: #d0d0d0 !important;
-}
+.errorsCountMsg, .errorsCountBtn span[data-ref="btnInnerEl"] {
+	color: red !important;
+}
+
+.errorsCountBtn, .warningsCountBtn {
+	font-size: 15px !important;
+	background-color: white !important;
+}
+
+.warningsCountBtn span[data-ref="btnInnerEl"] {
+	color: #b9b92d !important;
+}
+
+.errorsCountMsg {
+	margin-top: 12px !important;
+}
+
+.x-warningsCountBtn-focus {
+	background-color: white !important;
+}
+
+.x-warningsCountMenuItem-focus a[data-ref="itemEl"] {
+	background-color: #d0d0d0 !important;
+}

package/src/uielement/component/settings/linter/UiAceLinterPlugin.js

@@ -4,6 +4,9 @@ Ext.define('Coon.uielement.component.settings.linter.UiAceLinterPlugin', {
     requires: ['Coon.uielement.component.settings.linter.rule.*'],
     editor: null,
     locals: {},
+    config: {
+        enableEmptyValue: false,
+    },
     init: function(view) {
         this.editor = view.editor;
         view.doLint = this.doLint.bind(this);
@@ -17,6 +20,10 @@ Ext.define('Coon.uielement.component.settings.linter.UiAceLinterPlugin', {
     privates: {
         lint(stringValue) {
             stringValue = this.addLineNumbers(stringValue);
+            if (this.enableEmptyValue && stringValue === '') {
+                this.cmp.clearMarkers();
+                return;
+            }
             this.cmp.errors = [];
             this.isParseStart = true;
             JSON5.parse(stringValue, (key, node) => {