ru.coon 2.7.9 → 2.7.11

package/src/logSender.js

@@ -1,63 +1,63 @@
-Ext.define('Coon.logSender', {
-    singleton: true,
-    lastSendAt: 0,
-    timeBetween: 1000,
-    isBusy: false,
-
-    url: 'utility/log',
-
-    buffer: [],
-    maxBufferLength: 30,
-
-    clearBusy() {
-        this.isBusy = false;
-    },
-
-    geMsg() {
-        if (this.buffer.length > this.maxBufferLength) {
-            const msg = this.buffer.slice(this.buffer.length - this.maxBufferLength).join('\n');
-            return `last[${this.maxBufferLength}]messages\n` + msg;
-        } else {
-            return this.buffer.join('\n');
-        }
-    },
-
-    send(message) {
-        if (!message) {
-            return;
-        }
-        if (typeof message !== 'string') {
-            try {
-                message = JSON.stringify(message);
-            } catch (ex) {
-                message = `messageToJsonError:${ex}`;
-            }
-        }
-        const statePath = Coon.nav.state.getPath();
-        message = message + '\npath=' + JSON.stringify(statePath);
-        const me = this;
-        const sendLog = function() {
-            if (me.buffer.length) {
-                Ext.Ajax.request({
-                    url: me.url,
-                    jsonData: me.geMsg(),
-                }).then(function(result) {
-                    if (result.completionAction === 'reject') {
-                        console.error('cant send log');
-                    }
-                });
-                me.buffer = [];
-            }
-        };
-
-        this.buffer.push(message);
-        if (!this.isBusy) {
-            this.isBusy = true;
-            setTimeout(function() {
-                me.clearBusy();
-                sendLog();
-            }, this.timeBetween);
-            sendLog();
-        }
-    },
-});
+Ext.define('Coon.logSender', {
+    singleton: true,
+    lastSendAt: 0,
+    timeBetween: 1000,
+    isBusy: false,
+
+    url: 'utility/log',
+
+    buffer: [],
+    maxBufferLength: 30,
+
+    clearBusy() {
+        this.isBusy = false;
+    },
+
+    geMsg() {
+        if (this.buffer.length > this.maxBufferLength) {
+            const msg = this.buffer.slice(this.buffer.length - this.maxBufferLength).join('\n');
+            return `last[${this.maxBufferLength}]messages\n` + msg;
+        } else {
+            return this.buffer.join('\n');
+        }
+    },
+
+    send(message) {
+        if (!message) {
+            return;
+        }
+        if (typeof message !== 'string') {
+            try {
+                message = JSON.stringify(message);
+            } catch (ex) {
+                message = `messageToJsonError:${ex}`;
+            }
+        }
+        const statePath = Coon.nav.state.getPath();
+        message = message + '\npath=' + JSON.stringify(statePath);
+        const me = this;
+        const sendLog = function() {
+            if (me.buffer.length) {
+                Ext.Ajax.request({
+                    url: me.url,
+                    jsonData: me.geMsg(),
+                }).then(function(result) {
+                    if (result.completionAction === 'reject') {
+                        console.error('cant send log');
+                    }
+                });
+                me.buffer = [];
+            }
+        };
+
+        this.buffer.push(message);
+        if (!this.isBusy) {
+            this.isBusy = true;
+            setTimeout(function() {
+                me.clearBusy();
+                sendLog();
+            }, this.timeBetween);
+            sendLog();
+        }
+    },
+});

package/src/model/MoParameterFields.js

@@ -1,7 +1,7 @@
-Ext.define('Coon.model.MoParameterFields', {
-    singleton: true,
-    $name: 'name',
-    $value: 'value',
-    $description: 'description',
-    $group: 'group',
-});
+Ext.define('Coon.model.MoParameterFields', {
+    singleton: true,
+    $name: 'name',
+    $value: 'value',
+    $description: 'description',
+    $group: 'group',
+});

package/src/model/SimpleEntityCharacteristicBeanFields.js

@@ -1,6 +1,6 @@
-Ext.define('Coon.model.SimpleEntityCharacteristicBeanFields', {
-    singleton: true,
-    $characteristicType: 'characteristicType',
-    $characteristicValue: 'characteristicValue',
-    $sequenceNumber: 'sequenceNumber',
-});
+Ext.define('Coon.model.SimpleEntityCharacteristicBeanFields', {
+    singleton: true,
+    $characteristicType: 'characteristicType',
+    $characteristicValue: 'characteristicValue',
+    $sequenceNumber: 'sequenceNumber',
+});

package/src/model/VisualCharacteristicValueFields.js

@@ -1,6 +1,6 @@
-Ext.define('Coon.model.VisualCharacteristicValueFields', {
-    singleton: true,
-    $description: 'description',
-    $sequenceNumber: 'sequenceNumber',
-    $value: 'value',
-});
+Ext.define('Coon.model.VisualCharacteristicValueFields', {
+    singleton: true,
+    $description: 'description',
+    $sequenceNumber: 'sequenceNumber',
+    $value: 'value',
+});

package/src/model/VisualCharacteristicValuesFields.js

@@ -1,17 +1,17 @@
-Ext.define('Coon.model.VisualCharacteristicValuesFields', {
-    singleton: true,
-    $adhocValueTypeLookup: 'adhocValueTypeLookup',
-    $characteristicTypeCd: 'characteristicTypeId',
-    $characteristicValue: 'characteristicValue',
-    $characteristicValueTypeLookup: 'characteristicValueTypeLookup',
-    $defaultSwitch: 'defaultSwitch',
-    $description: 'description',
-    $editableSwitch: 'editableSwitch',
-    $foreignKeyUIElement: 'foreignKeyUIElement',
-    $lookup: 'lookup',
-    $multiplicitySwitch: 'multiplicitySwitch',
-    $requiredSwitch: 'requiredSwitch',
-    $sortSequence: 'sortSequence',
-    $uIElement: 'uiElement',
-    $visualCharacteristicValues: 'visualCharacteristicValues',
-});
+Ext.define('Coon.model.VisualCharacteristicValuesFields', {
+    singleton: true,
+    $adhocValueTypeLookup: 'adhocValueTypeLookup',
+    $characteristicTypeCd: 'characteristicTypeId',
+    $characteristicValue: 'characteristicValue',
+    $characteristicValueTypeLookup: 'characteristicValueTypeLookup',
+    $defaultSwitch: 'defaultSwitch',
+    $description: 'description',
+    $editableSwitch: 'editableSwitch',
+    $foreignKeyUIElement: 'foreignKeyUIElement',
+    $lookup: 'lookup',
+    $multiplicitySwitch: 'multiplicitySwitch',
+    $requiredSwitch: 'requiredSwitch',
+    $sortSequence: 'sortSequence',
+    $uIElement: 'uiElement',
+    $visualCharacteristicValues: 'visualCharacteristicValues',
+});

package/src/nav/AppNavTab.js

@@ -1,106 +1,106 @@
-Ext.define('Coon.nav.AppNavTab', {
-    extend: 'Ext.container.Container',
-    xtype: 'AppNavTab',
-    cls: 'AppNavTab',
-
-    layout: {
-        type: 'hbox',
-        pack: 'left',
-        align: 'middle',
-    },
-
-    config: {
-        cmp: false,
-    },
-
-    items: [
-        {
-            xtype: 'component',
-            hidden: true,
-            itemId: 'separator',
-            margin: '0 16 0 0',
-            html: '/',
-        },
-        {
-            xtype: 'component',
-            itemId: 'text',
-        },
-        {
-            xtype: 'button',
-            hidden: true,
-            itemId: 'close',
-            iconCls: 'x-fa fa-chevron-left',
-            margin: 0,
-            width: 32,
-        }
-    ],
-
-    setCloseHandler(handler, scope) {
-        if (!this.links.closeBtn.hasListeners.close) {
-            this.links.closeBtn.on('click', handler, scope);
-            this.links.text.on('afterrender', function() {
-                this.setComponentClosable(handler, scope);
-            }, this);
-        }
-    },
-
-    checkId(id) {
-        return this.tabId === id;
-    },
-
-    setComponentClosable(handler, scope) {
-        const el = this.links.text.getEl();
-        if (!el.hasListener('click')) {
-            el.addListener('click', function() {
-                Ext.Msg.confirm('', 'закрыть ?', function(id) {
-                    if (id === 'yes') {
-                        handler.call(scope);
-                    }
-                });
-            });
-        }
-    },
-
-    setClosable(state, handler, scope) {
-        this.closable = state;
-        if (state) {
-            if (typeof handler === 'function') {
-                this.setCloseHandler(handler, scope);
-            }
-            this.links.closeBtn.show();
-        } else {
-            this.links.closeBtn.hide();
-        }
-    },
-
-    initComponent(...args) {
-        if (this.first) {
-            this.margin = 0;
-        } else {
-            this.margin = '0 0 0 16';
-        }
-        this.callParent(...args);
-
-        this.links = {
-            closeBtn: this.down('#close'),
-            text: this.down('#text'),
-            separator: this.down('#separator'),
-        };
-        if (this.first) {
-            this.links.separator.hide();
-        } else {
-            this.links.separator.show();
-        }
-        this.setClosable(this.closable);
-        this.setText(this.text);
-    },
-
-    setText(text) {
-        const html = `
-                    <div class="nav-tab nav-tab-${this.tabId}">
-                        <span class="nav-tab-text" data-qtip="${Ext.util.Format.htmlEncode(text)}">${text}</span>
-                    </div>
-                `;
-        this.links && this.links.text.setHtml(html);
-    },
-});
+Ext.define('Coon.nav.AppNavTab', {
+    extend: 'Ext.container.Container',
+    xtype: 'AppNavTab',
+    cls: 'AppNavTab',
+
+    layout: {
+        type: 'hbox',
+        pack: 'left',
+        align: 'middle',
+    },
+
+    config: {
+        cmp: false,
+    },
+
+    items: [
+        {
+            xtype: 'component',
+            hidden: true,
+            itemId: 'separator',
+            margin: '0 16 0 0',
+            html: '/',
+        },
+        {
+            xtype: 'component',
+            itemId: 'text',
+        },
+        {
+            xtype: 'button',
+            hidden: true,
+            itemId: 'close',
+            iconCls: 'x-fa fa-chevron-left',
+            margin: 0,
+            width: 32,
+        }
+    ],
+
+    setCloseHandler(handler, scope) {
+        if (!this.links.closeBtn.hasListeners.close) {
+            this.links.closeBtn.on('click', handler, scope);
+            this.links.text.on('afterrender', function() {
+                this.setComponentClosable(handler, scope);
+            }, this);
+        }
+    },
+
+    checkId(id) {
+        return this.tabId === id;
+    },
+
+    setComponentClosable(handler, scope) {
+        const el = this.links.text.getEl();
+        if (!el.hasListener('click')) {
+            el.addListener('click', function() {
+                Ext.Msg.confirm('', 'закрыть ?', function(id) {
+                    if (id === 'yes') {
+                        handler.call(scope);
+                    }
+                });
+            });
+        }
+    },
+
+    setClosable(state, handler, scope) {
+        this.closable = state;
+        if (state) {
+            if (typeof handler === 'function') {
+                this.setCloseHandler(handler, scope);
+            }
+            this.links.closeBtn.show();
+        } else {
+            this.links.closeBtn.hide();
+        }
+    },
+
+    initComponent(...args) {
+        if (this.first) {
+            this.margin = 0;
+        } else {
+            this.margin = '0 0 0 16';
+        }
+        this.callParent(...args);
+
+        this.links = {
+            closeBtn: this.down('#close'),
+            text: this.down('#text'),
+            separator: this.down('#separator'),
+        };
+        if (this.first) {
+            this.links.separator.hide();
+        } else {
+            this.links.separator.show();
+        }
+        this.setClosable(this.closable);
+        this.setText(this.text);
+    },
+
+    setText(text) {
+        const html = `
+                    <div class="nav-tab nav-tab-${this.tabId}">
+                        <span class="nav-tab-text" data-qtip="${Ext.util.Format.htmlEncode(text)}">${text}</span>
+                    </div>
+                `;
+        this.links && this.links.text.setHtml(html);
+    },
+});

package/src/nav/AppNavTab.scss

@@ -1,20 +1,20 @@
-.AppNavTab {
-    .nav-tab {
-        display: inline-block;
-        color: #1E3B4B;
-        .nav-tab-text {
-            font-style: italic;;
-            font-weight:500;
-            min-width: 80px;
-            max-width: 120px;
-            display: inline-block;
-            overflow:hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-    }
-    .x-btn {
-        padding-top: 2px!important;
-        color: #1E3B4B;
-    }
-}
+.AppNavTab {
+    .nav-tab {
+        display: inline-block;
+        color: #1E3B4B;
+        .nav-tab-text {
+            font-style: italic;;
+            font-weight:500;
+            min-width: 80px;
+            max-width: 120px;
+            display: inline-block;
+            overflow:hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+    .x-btn {
+        padding-top: 2px!important;
+        color: #1E3B4B;
+    }
+}

package/src/nav/AppNavigationBar.js

@@ -1,88 +1,88 @@
-Ext.define('Coon.nav.AppNavigationBar', {
-    extend: 'Ext.toolbar.Toolbar',
-    xtype: 'AppNavigationBar',
-    requires: [
-        'Coon.nav.AppNavigationBarViewController'
-    ],
-    controller: 'AppNavigationBarViewController',
-
-    cls: 'AppNavigationBar',
-
-    layout: {
-        type: 'hbox',
-        pack: 'left',
-        align: 'middle',
-    },
-
-    style: {
-        backgroundColor: 'white',
-        marginLeft: '0.5em',
-    },
-    enableOverflow: true,
-
-    items: [
-    ],
-
-    tabs: new Map(),
-    rootTabId: false,
-
-    getTabs() {
-        this.items.getRange();
-    },
-
-    loadTabs(tabs, viewport) {
-        this.removeAll();
-        tabs.forEach((tab, idx) => {
-            const cmp = Ext.getCmp(tab.id);
-            if (!cmp) {
-                Coon.log.error(`cmp with id ${tab.id} not found`);
-                return;
-            }
-            const text = cmp.getTitle && cmp.getTitle() || cmp.heading || 'компонент';
-            const el = Ext.create({
-                xtype: 'AppNavTab',
-                tabId: tab.id,
-                hidden: !Coon.setup.get('overrides.displacedMode'),
-                tooltip: text,
-                text,
-                first: idx === 0,
-            });
-            cmp.on('titlechange', function(_, text) {
-                el.setText(text);
-            });
-            if (tabs.length > 1 && idx === tabs.length - 1) {
-                Coon.log.debug('setClosable', tab.id);
-
-                cmp.on('destroy', function() {
-                    this.remove(el);
-                    this.tabs.set(this.rootTabId, tabs.filter((el) => el.id !== tab.id));
-                    this.loadTabs(this.tabs.get(this.rootTabId), viewport);
-                }, this);
-
-                el.setClosable(true, function() {
-                    cmp.close();
-                }, this);
-            } else {
-                if (idx > 0) {
-                    el.setClosable(false);
-                }
-            }
-            this.add(el);
-        });
-    },
-
-    addTab(cfg) {
-        window.tabs = this.tabs;
-        const {text, root, viewport, id} = cfg;
-        if (root) {
-            this.rootTabId = id;
-        }
-        const tabs = this.tabs.get(this.rootTabId) || [];
-        if (!tabs.find((tab) => tab.id === id)) {
-            tabs.push({id, text, root});
-            this.tabs.set(this.rootTabId, tabs);
-        }
-        this.loadTabs(tabs, viewport);
-    },
-
-});
+Ext.define('Coon.nav.AppNavigationBar', {
+    extend: 'Ext.toolbar.Toolbar',
+    xtype: 'AppNavigationBar',
+    requires: [
+        'Coon.nav.AppNavigationBarViewController'
+    ],
+    controller: 'AppNavigationBarViewController',
+
+    cls: 'AppNavigationBar',
+
+    layout: {
+        type: 'hbox',
+        pack: 'left',
+        align: 'middle',
+    },
+
+    style: {
+        backgroundColor: 'white',
+        marginLeft: '0.5em',
+    },
+    enableOverflow: true,
+
+    items: [
+    ],
+
+    tabs: new Map(),
+    rootTabId: false,
+
+    getTabs() {
+        this.items.getRange();
+    },
+
+    loadTabs(tabs, viewport) {
+        this.removeAll();
+        tabs.forEach((tab, idx) => {
+            const cmp = Ext.getCmp(tab.id);
+            if (!cmp) {
+                Coon.log.error(`cmp with id ${tab.id} not found`);
+                return;
+            }
+            const text = cmp.getTitle && cmp.getTitle() || cmp.heading || 'компонент';
+            const el = Ext.create({
+                xtype: 'AppNavTab',
+                tabId: tab.id,
+                hidden: !Coon.setup.get('overrides.displacedMode'),
+                tooltip: text,
+                text,
+                first: idx === 0,
+            });
+            cmp.on('titlechange', function(_, text) {
+                el.setText(text);
+            });
+            if (tabs.length > 1 && idx === tabs.length - 1) {
+                Coon.log.debug('setClosable', tab.id);
+
+                cmp.on('destroy', function() {
+                    this.remove(el);
+                    this.tabs.set(this.rootTabId, tabs.filter((el) => el.id !== tab.id));
+                    this.loadTabs(this.tabs.get(this.rootTabId), viewport);
+                }, this);
+
+                el.setClosable(true, function() {
+                    cmp.close();
+                }, this);
+            } else {
+                if (idx > 0) {
+                    el.setClosable(false);
+                }
+            }
+            this.add(el);
+        });
+    },
+
+    addTab(cfg) {
+        window.tabs = this.tabs;
+        const {text, root, viewport, id} = cfg;
+        if (root) {
+            this.rootTabId = id;
+        }
+        const tabs = this.tabs.get(this.rootTabId) || [];
+        if (!tabs.find((tab) => tab.id === id)) {
+            tabs.push({id, text, root});
+            this.tabs.set(this.rootTabId, tabs);
+        }
+        this.loadTabs(tabs, viewport);
+    },
+
+});

package/src/nav/AppNavigationBar.scss

@@ -1,10 +1,10 @@
-.AppNavigationBar {
-    .nav-tab {
-        color: #1E3B4B;
-        .nav-tab-text {
-            overflow:hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-    }
+.AppNavigationBar {
+    .nav-tab {
+        color: #1E3B4B;
+        .nav-tab-text {
+            overflow:hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
 }