ru.coon 2.5.67 → 2.6.0

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

@@ -1,76 +1,76 @@
-/**
- * Окно добавления характеристик
- */
-Ext.define('Coon.common.component.editor.CharacteristicForeignWindow', {
-    extend: 'Coon.common.component.ForeignSelectWindow',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.CharacteristicForeignWindow'
-    ],
-    alias: 'widget.CharacteristicForeignWindow',
-    config: {
-        height: 500,
-        width: 530,
-
-        buttonText: {
-            ok: 'Добавить',
-            cancel: 'Закрыть',
-        },
-    },
-
-    setTypeList: function(usedTypeList, typeList) {
-        this.usedTypeList = usedTypeList || [];
-        this.filterStore.loadData(typeList || []);
-        this.filterStore.fireEvent('load');
-    },
-
-    createItems: function() {
-        this.filterStore = Ext.create('Coon.report.store.CharacteristicListStore');
-        this.filterStore.on('load', function() {
-            this.filterStore.filterBy(function(record) {
-                if (
-                    !record.get(Coon.report.model.CharacteristicBeanFields.$visible) ||
-                    (
-                        record.get(Coon.report.model.CharacteristicBeanFields.$single) &&
-                        this.usedTypeList.indexOf(record.get(Coon.report.model.CharacteristicBeanFields.$type)) != -1
-                    )
-                ) {
-                    return false;
-                }
-
-                return true;
-            }, this);
-
-            const allowRecords = this.filterStore.getRange(0, this.filterStore.getCount() - 1);
-            this.grid.doInit(allowRecords);
-        }, this);
-
-        this.grid = Ext.create('Coon.common.component.editor.CharacteristicAddTypeGrid', {
-            anchor: '100% 100%',
-        });
-        this.grid.on('select', this.selectHandler, this);
-
-        return [
-            this.grid
-        ];
-    },
-
-    selectHandler: function(sender) {
-        if (sender && sender.type === 'checkboxmodel') {
-            return;
-        }
-        if (this.validate()) {
-            const value = this.getValue();
-            if (this.fireEvent('select', this, value) !== false) {
-                this.clear();
-            }
-        }
-    },
-
-    validate: function() {
-        return this.grid.validate();
-    },
-
-    getValue: function() {
-        return this.grid.getSelected();
-    },
-});
+/**
+ * Окно добавления характеристик
+ */
+Ext.define('Coon.common.component.editor.CharacteristicForeignWindow', {
+    extend: 'Coon.common.component.ForeignSelectWindow',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.CharacteristicForeignWindow'
+    ],
+    alias: 'widget.CharacteristicForeignWindow',
+    config: {
+        height: 500,
+        width: 530,
+
+        buttonText: {
+            ok: 'Добавить',
+            cancel: 'Закрыть',
+        },
+    },
+
+    setTypeList: function(usedTypeList, typeList) {
+        this.usedTypeList = usedTypeList || [];
+        this.filterStore.loadData(typeList || []);
+        this.filterStore.fireEvent('load');
+    },
+
+    createItems: function() {
+        this.filterStore = Ext.create('Coon.report.store.CharacteristicListStore');
+        this.filterStore.on('load', function() {
+            this.filterStore.filterBy(function(record) {
+                if (
+                    !record.get(Coon.report.model.CharacteristicBeanFields.$visible) ||
+                    (
+                        record.get(Coon.report.model.CharacteristicBeanFields.$single) &&
+                        this.usedTypeList.indexOf(record.get(Coon.report.model.CharacteristicBeanFields.$type)) != -1
+                    )
+                ) {
+                    return false;
+                }
+
+                return true;
+            }, this);
+
+            const allowRecords = this.filterStore.getRange(0, this.filterStore.getCount() - 1);
+            this.grid.doInit(allowRecords);
+        }, this);
+
+        this.grid = Ext.create('Coon.common.component.editor.CharacteristicAddTypeGrid', {
+            anchor: '100% 100%',
+        });
+        this.grid.on('select', this.selectHandler, this);
+
+        return [
+            this.grid
+        ];
+    },
+
+    selectHandler: function(sender) {
+        if (sender && sender.type === 'checkboxmodel') {
+            return;
+        }
+        if (this.validate()) {
+            const value = this.getValue();
+            if (this.fireEvent('select', this, value) !== false) {
+                this.clear();
+            }
+        }
+    },
+
+    validate: function() {
+        return this.grid.validate();
+    },
+
+    getValue: function() {
+        return this.grid.getSelected();
+    },
+});

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/CharacteristicHistoryPanel.js

@@ -1,110 +1,110 @@
-Ext.define('Coon.common.component.editor.CharacteristicHistoryPanel', {
-    extend: 'Ext.Panel',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.CharacteristicHistoryPanel'
-    ],
-
-    ID: undefined,
-    entity: undefined,
-    effdt: undefined,
-    charTypeCd: undefined,
-    characteristicEntity: undefined,
-    needAuditLoad: false,
-    scrollable: 'y',
-
-    initComponent: function() {
-        this.layout = {
-            type: 'hbox',
-            align: 'stretch',
-        };
-
-        this.characteristics = Ext.create('Coon.common.component.editor.HistoryTypedCharacteristicEditor', {
-            flex: 1,
-            enableHistoryPanel: false,
-            createRequired: false,
-            readMode: true,
-            split: true,
-            enableToolBar: false,
-            scrollable: true,
-            plugins: [{ptype: 'CharacteristicTypeLoaderPlugin', exactDate: true}],
-        });
-
-        this.characteristicsValueEditor = Ext.create('Coon.common.component.editor.HistoryListForTypeCharacteristicEditor', {
-            title: 'Значения',
-        });
-
-        this.characteristicsValueTabs = Ext.create({
-            xtype: 'tabpanel',
-            activeTab: 0,
-            flex: 1,
-            deferredRender: true,
-            enableTabScroll: true,
-            autoScroll: true,
-            split: true,
-            items: [
-                this.characteristicsValueEditor,
-                {
-                    xtype: 'ReportPanel',
-                    reportID: 'AUDIT_ENTITY_CHAR',
-                    hideFilterPanel: true,
-                    autoFilter: true,
-                    title: 'Аудит',
-                    fixedTitle: true,
-                    listeners: {
-                        activate: function(report) {
-                            if (this.needAuditLoad && this.ID && this.charTypeCd) {
-                                report.setFilterDefaults({
-                                    'SUBENTITY_CD': this.entity,
-                                    'CHAR_TYPE_CD': this.charTypeCd,
-                                    'ENTITY_ID': this.ID,
-                                    'CHAR_ENTITY_FLG': this.characteristicEntity,
-                                });
-                            }
-                        }.bind(this),
-                    },
-                }
-            ],
-        });
-        this.items = [
-            this.characteristics,
-            this.characteristicsValueTabs
-        ];
-
-
-        this.callParent();
-
-        this.characteristics.on('select', this.selectionChangeHandler, this);
-    },
-
-    doInit: function(ID, entity, characteristicEntity, effectiveDate) {
-        this.ID = ID;
-        this.entity = entity;
-        this.characteristicEntity = characteristicEntity;
-        this.characteristicsValueTabs.setActiveTab(0);
-        this.characteristics.doInit(ID, entity, characteristicEntity, effectiveDate);
-        this.characteristicsValueEditor.getStore().sort(Coon.report.model.CharacteristicBeanFields.$effectiveDate, 'DESC');
-    },
-
-    clear: function() {
-        this.characteristics.clear();
-    },
-
-    selectionChangeHandler: function(panel, data) {
-        if (data) {
-            this.characteristicsValueTabs.setActiveTab(0);
-            const ns = Coon.report.model.CharacteristicBeanFields;
-            this.effdt = this.characteristics.getDate();
-            this.needAuditLoad = !(this.charTypeCd === data.get(ns.$type));
-            this.charTypeCd = data.get(ns.$type);
-            this.characteristicsValueEditor.doInit(
-                this.ID,
-                this.entity,
-                this.characteristicEntity,
-                this.effdt,
-                this.charTypeCd
-            );
-        } else {
-            this.characteristicsValueEditor.clear();
-        }
-    },
-});
+Ext.define('Coon.common.component.editor.CharacteristicHistoryPanel', {
+    extend: 'Ext.Panel',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.CharacteristicHistoryPanel'
+    ],
+
+    ID: undefined,
+    entity: undefined,
+    effdt: undefined,
+    charTypeCd: undefined,
+    characteristicEntity: undefined,
+    needAuditLoad: false,
+    scrollable: 'y',
+
+    initComponent: function() {
+        this.layout = {
+            type: 'hbox',
+            align: 'stretch',
+        };
+
+        this.characteristics = Ext.create('Coon.common.component.editor.HistoryTypedCharacteristicEditor', {
+            flex: 1,
+            enableHistoryPanel: false,
+            createRequired: false,
+            readMode: true,
+            split: true,
+            enableToolBar: false,
+            scrollable: true,
+            plugins: [{ptype: 'CharacteristicTypeLoaderPlugin', exactDate: true}],
+        });
+
+        this.characteristicsValueEditor = Ext.create('Coon.common.component.editor.HistoryListForTypeCharacteristicEditor', {
+            title: 'Значения',
+        });
+
+        this.characteristicsValueTabs = Ext.create({
+            xtype: 'tabpanel',
+            activeTab: 0,
+            flex: 1,
+            deferredRender: true,
+            enableTabScroll: true,
+            autoScroll: true,
+            split: true,
+            items: [
+                this.characteristicsValueEditor,
+                {
+                    xtype: 'ReportPanel',
+                    reportID: 'AUDIT_ENTITY_CHAR',
+                    hideFilterPanel: true,
+                    autoFilter: true,
+                    title: 'Аудит',
+                    fixedTitle: true,
+                    listeners: {
+                        activate: function(report) {
+                            if (this.needAuditLoad && this.ID && this.charTypeCd) {
+                                report.setFilterDefaults({
+                                    'SUBENTITY_CD': this.entity,
+                                    'CHAR_TYPE_CD': this.charTypeCd,
+                                    'ENTITY_ID': this.ID,
+                                    'CHAR_ENTITY_FLG': this.characteristicEntity,
+                                });
+                            }
+                        }.bind(this),
+                    },
+                }
+            ],
+        });
+        this.items = [
+            this.characteristics,
+            this.characteristicsValueTabs
+        ];
+
+
+        this.callParent();
+
+        this.characteristics.on('select', this.selectionChangeHandler, this);
+    },
+
+    doInit: function(ID, entity, characteristicEntity, effectiveDate) {
+        this.ID = ID;
+        this.entity = entity;
+        this.characteristicEntity = characteristicEntity;
+        this.characteristicsValueTabs.setActiveTab(0);
+        this.characteristics.doInit(ID, entity, characteristicEntity, effectiveDate);
+        this.characteristicsValueEditor.getStore().sort(Coon.report.model.CharacteristicBeanFields.$effectiveDate, 'DESC');
+    },
+
+    clear: function() {
+        this.characteristics.clear();
+    },
+
+    selectionChangeHandler: function(panel, data) {
+        if (data) {
+            this.characteristicsValueTabs.setActiveTab(0);
+            const ns = Coon.report.model.CharacteristicBeanFields;
+            this.effdt = this.characteristics.getDate();
+            this.needAuditLoad = !(this.charTypeCd === data.get(ns.$type));
+            this.charTypeCd = data.get(ns.$type);
+            this.characteristicsValueEditor.doInit(
+                this.ID,
+                this.entity,
+                this.characteristicEntity,
+                this.effdt,
+                this.charTypeCd
+            );
+        } else {
+            this.characteristicsValueEditor.clear();
+        }
+    },
+});