ru.coon 2.7.12 → 2.7.13

package/CHANGELOG.md

@@ -1,9 +1,16 @@
+# Version 2.7.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2a509ebbdf7d3ddd07faaf3a42f0ef759a31cc4)
+* ## Fixes
+* <span style='color:red'>fix report property editor</span> ([ba33a6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ba33a6f5379601e92e243ee8f971fc5811ac648f))
+
+* update: CHANGELOG.md ([52e5a1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/52e5a14c22b9cf57be5d97fc73d81adfcd2c53f1))
+
 # Version 2.7.12, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0f357b6b648867b16809b8dc164e2dcdf023eac)
 * ## Features
 * <span style='color:green'>feat: HT-8422: make plugin</span> ([c0f288], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0f28814e230b079799bb7091ccfc6a4985027d7))
 * <span style='color:green'>feat: HT-8422: make plugin</span> ([3a716f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3a716f1e031351cc9cb7e824dd547bb26a209d8a))
 * <span style='color:green'>feat: HT-8422: make plugin</span> ([dfee6a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dfee6a538ab0930e3a6768024dd1cc3d680f379e))
 
+* upd ([20702b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20702be763b8d49e5844a472789d013fca40708b))
 * HT-8467 fix: Проверка наличия плагина перед использованием его методов. ([e531df], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e531df48524bc9ccef92c62463eea5d114f3a9cf))
 * update: CHANGELOG.md ([6a43ba], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6a43ba46583e65e72523c1b6f28c46049d02e372))
 

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.7.12",
+  "version": "2.7.13",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/log.js

@@ -185,6 +185,14 @@ Ext.define('Coon.log', {
         }
     },
 
+    fnDebug(fn, desc) {
+        return function(...args) {
+            const result = fn.call(this, ...args);
+            Coon.log.debug(desc ? desc+' : ' : '', result);
+            return result;
+        };
+    },
+
     getParentPropChain(id, propPaths) {
         const seek = (cfg, props, acc, opts) => {
             acc = acc || [];

package/src/report/component/settings/property/ReportPropertiesPanel.js

@@ -56,7 +56,7 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanel', {
                     items: [
                         {
                             xtype: 'treepanel',
-                            flex: 1,
+                            width: 400,
                             style: {
                                 borderTop: '1px solid #e1e1e1',
                                 borderRight: '1px solid #e1e1e1',
@@ -74,14 +74,13 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanel', {
                                 },
                             },
                             viewConfig: {
-                                getRowClass: function(record) {
+                                getRowClass: Coon.log.fnDebug(function(record) {
                                     if (record.get('isDeleted')) {
                                         return 'is-deleted';
                                     }
                                     if (record.get('value') === undefined &&
                                         record.get('leaf') === true) {
                                         return record.get('isDeleted') ? 'is-deleted' : 'is-new-rec';
-                                        // return record.get('isDeleted') && !record.get('isNewColumn') === 'true' ? 'is-deleted' : 'is-new-rec';
                                     }
 
                                     if (record) {
@@ -90,14 +89,14 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanel', {
                                         classes.push(record.get('duplicate') ? 'duplicate-record' : '');
                                         return classes.join(' ');
                                     }
-                                },
+                                }, 'getRowClass'),
                             },
                             columns: [
                                 {
                                     xtype: 'treecolumn',
                                     dataIndex: 'name',
                                     text: 'Параметр',
-                                    width: 300,
+                                    width: 200,
                                     renderer(v, mt, record) {
                                         return v ? `<span style="font-weight:bold;color: darkgray">${v}</span>`:
                                             `<span>${(record.get('children') && record.get('propTag')) || record.get('key') || ''}</span>`;

package/src/report/component/settings/property/ReportPropertiesPanelController.js

@@ -25,9 +25,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         this.lookup('customPropertyGrid').on('propertyChanged', this.recordChangeHandler, this);
         this.lookup('propertyGrid').on('propertyChanged', this.recordChangeHandler, this);
         view.on('propertyChanged', this.recordChangeHandler, this);
-        // view.on('reloadProperties', () => this.allowDuplicate.map((key) =>
-        //     this.allowDuplicateRecords = this.getViewModel().get('report.properties') &&
-        //     this.getViewModel().get('report.properties').filter((record) => key === record.key)));
     },
 
     getExistedKeysSet() {
@@ -48,7 +45,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
                     xtype: 'PropertySelectPanel',
                     existedKeys: this.getExistedKeysSet(),
                     treeData: Coon.report.component.settings.property.ReportPropertyDictionary.schema,
-                    // buildPropertiesTreeData: this.buildPropertiesTreeData.bind(this),
                     listeners: {
                         itemdblclick: {
                             fn: this.onAddProperty,
@@ -69,7 +65,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
     },
 
     onAddProperty(_, record) {
-        const allowMultiple = record.get('allowMultiple');
         const store = this.lookup('propertyGrid').store;
         const propPathMap = this.getRecordPathMap(record);
         let currentNode = store.getRootNode();
@@ -78,10 +73,10 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
             const existNode = currentNode.childNodes.find((childNode) => {
                 const state = (
                     key &&
-                    !allowMultiple &&
                     key === childNode.get('key')
                 ) || (
                     !leaf &&
+                    propTag &&
                     propTag === childNode.get('propTag')
                 );
                 return state;
@@ -99,41 +94,13 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         this.lookup('propertyValueContainer').removeAll();
 
         this.propertySelectPanel.close();
-        this.getView().fireEvent('propertyChanged');
         return;
     },
 
-    checkPropertyDependencies(propertyName, val) {
-        const property = this.dictionary.propertyMap.get(propertyName);
-        const excludeObj = property && property.exclude;
-        excludeObj && Object.entries(excludeObj).forEach((el) => {
-            const [prop, value] = el;
-            if (value.onVal + '' === val + '') {
-                // если для данного свойства уже есть набор других свойств,
-                // которые его перекрывают, то добавить новое,
-                // иначе создать и добавить новый набор
-                this.excludeMap.has(prop) ? this.excludeMap.get(prop).add(propertyName) : this.excludeMap.set(prop, new Set([propertyName]));
-            } else if (value + '' !== val + '' && this.excludeMap.has(prop)) {
-                // удалить исключающее сойтво
-                this.excludeMap.get(prop).delete(propertyName);
-                // если после удаления не осталось перекрывающих свойств, то удалить из списка текущее свойство
-                Array.from(this.excludeMap.get(prop).values()).length === 0 && this.excludeMap.delete(prop);
-            }
-        });
-        this.lookup('propertyGrid').getStore().getRange().forEach((record) => {
-            if (this.excludeMap.has(record.get('key'))) {
-                record.set('isExcluded', true);
-            } else {
-                record.set('isExcluded', false);
-            }
-        });
-    },
-
     beforeSelectPropGrid(_, record) {
         return !this.excludeMap.has(record.get('key'));
     },
 
-
     selectProperty(_, record) {
         this.lookup('propertyValueContainer').removeAll();
         this.lookup('descriptionField').setValue(record.get('description'));
@@ -181,22 +148,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         contextMenu.showAt(e.getXY());
     },
 
-    // setDuplicateValue(duplicateValues) {
-    //     const store = this.lookup('propertyGrid').getStore();
-
-    //     for (const elem of duplicateValues) {
-    //         const record = store.findRecord('sequenceNumber', elem.sequenceNumber);
-    //         if (record) {
-    //             record.set('value', record.get('value'));
-    //         } else {
-    //             if (store.findRecord('key', elem.key)) {
-    //                 const value = store.findRecord('key', elem.key).get('value');
-    //                 store.findRecord('key', elem.key).set('value', `${value},${elem.value}`, {commit: true});
-    //             }
-    //         }
-    //     }
-    // },
-
     onDeleteProperty() {
         const record = this.lookup('propertyGrid').getSelection()[0];
         if (!record) {
@@ -326,92 +277,48 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         if (!Array.isArray(data)) {
             return;
         }
-        const customPropStore = this.lookup('customPropertyGrid').getStore();
+        const propStore = this.lookup('customPropertyGrid').getStore();
 
         const customProps = [];
         const props = [];
-        // const duplicateValues = [];
         data.forEach((el) => {
-            if (el.isDeleted) {
-                return;
-            }
             const property = this.dictionary.propertyMap.get(el.key);
             if (!property) {
                 customProps.push(el);
                 return;
             }
-            // if (this.allowDuplicate.includes(el.key)) {
-            //     duplicateValues.push(el);
-            // }
             props.push(el);
         });
         const treeData = this.buildPropertiesTreeData(props);
         this.lookup('propertyGrid').getStore().setRoot(treeData);
-
-        customPropStore.loadData(customProps);
-        // this.setDuplicateValue(duplicateValues);
+        propStore.loadData(customProps);
     },
 
     getData: function() {
         const customRecords = this.lookup('customPropertyGrid').getStore().getRange();
+
         const records = this.lookup('propertyGrid').getStore().getRange();
 
-        this.recordsToSave = [];
-        for (let i = 0; i < customRecords.length; i++) {
-            this.recordsToSave.push(customRecords[i].getData());
-        }
-        for (const record of records) {
-            if ((!Ext.isEmpty(record.get('value')) || record.get('isDeleted')) && !record.get('isExcluded')) {
-                // if (this.allowDuplicate.includes(record.get('key'))) {
-                //     this.processDuplicateRecords(record);
-                // } else {
+        this.recordsToSave = customRecords.map((el) => el.getData());
+        records.forEach((record) => {
+            if (
+                record.get('value') ||
+                record.get('isDeleted')
+            ) {
                 this.recordsToSave.push(record.getData());
-                // }
-            }
-        }
-        // this.allowDuplicateRecords && this.allowDuplicateRecords.map((el) => {
-        //     const foundInRecordsToSave = this.recordsToSave.find((record) => record.key === el.key && record.value === el.value);
-        //     if (!foundInRecordsToSave) {
-        //         el.isDeleted = true;
-        //         this.recordsToSave.push(el);
-        //     } else {
-        //         foundInRecordsToSave.sequenceNumber = el.sequenceNumber;
-        //     }
-        //     if (foundInRecordsToSave) {
-        //         foundInRecordsToSave.sequenceNumber = el.sequenceNumber;
-        //     }
-        // });
-        this.recordsToSave.forEach((record) => {
-            if (!record.sequenceNumber) {
-                record.sequenceNumber = this.generateSequenceNumber();
             }
         });
         const data = Coon.Function.serializeRecords(
-            this.recordsToSave.map(this.formatRecordObject)
+            this.recordsToSave.map(this.formatRecordObject, this)
         );
         return data;
     },
 
-    // processDuplicateRecords(record) {
-    //     const arrayValue = [record.get('value')];
-    //     if (arrayValue.length > 1) {
-    //         arrayValue.map((duplicateRecord) => {
-    //             if (this.recordsToSave.find((recordToSave) =>
-    //                 recordToSave.value === duplicateRecord && recordToSave.key === record.get('key'))) {
-    //                 return;
-    //             }
-    //             this.recordsToSave.push({
-    //                 key: record.get('key'),
-    //                 value: duplicateRecord,
-    //             });
-    //         });
-    //     } else {
-    //         this.recordsToSave.push(record.getData());
-    //     }
-    // },
-
-    formatRecordObject(obj) {
-        const {key, value, sequenceNumber, isNew, isDeleted} = obj;
+    formatRecordObject(record) {
+        if (!record.sequenceNumber) {
+            record.sequenceNumber = this.generateSequenceNumber();
+        }
+        const {key, value, sequenceNumber, isNew, isDeleted} = record;
         return {
             key,
             value,

package/src/report/component/settings/property/ReportPropertyDictionary.js

@@ -280,13 +280,11 @@ Ext.define('Coon.report.component.settings.property.ReportPropertyDictionary', {
                 {
                     id: 'TAG',
                     leaf: true,
-                    allowMultiple: true,
                     defaultVal: null,
                     description: `
                             Свойство позволяет добавить еще один параметр поиска отчета в списке отчетов. </br>
                             string
                         `,
-                    // valueType: 'tag',
                 },
                 {
                     id: 'TEMPLATE',

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.7.12',
+    number: '2.7.13',
 });