ru.coon 2.7.59 → 2.7.60

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 2.7.60, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a9834f48d78a0ef436d2fa1b0f542c87a49b6f58)
+* ## Fixes
+* <span style='color:red'> modifiedRecords in CharacteristicGridEditor</span> ([766d5d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/766d5d510024921fa18cf175034447778fc1bddb))
+
+* update: CHANGELOG.md ([8c963c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8c963c6dad24caf548735eb4b974f0e920eb85fa))
+
 # Version 2.7.59, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ef4a5428157a41658492ff36459d986a1778bb8e)
 * update: CHANGELOG.md ([9e5f92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9e5f92d3707bc7708262e16383521d4e290d45e4))
 

package/package.json

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

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

@@ -455,11 +455,18 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
      * Получить список значений характеристик, только измененные или добавленые
      * @param encodeFlag - сериализовать
      */
+
+    getModifiedRecords() {
+        return this.getStore().getRange().filter(
+            (record) => record.isNew || record.get('isDeleted') || record.get('markToCommit')
+        );
+    },
+
     getList: function(encodeFlag) {
         const ns = Coon.report.model.CharacteristicBeanFields;
 
         const encode = encodeFlag || false;
-        const records = this.getStore().getModifiedRecords();
+        const records = this.getModifiedRecords();
 
         // Фильтрация новых характеристик с пустым значением
         const exportRecords = [];

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

@@ -267,6 +267,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
 
         const ns = Coon.report.model.CharacteristicBeanFields;
         if (record.isModified('value') || record.isModified('valueDescription')) {
+            record.set('markToCommit', true);
             record.set(ns.$effectiveDate, this.effectiveDate);
             this.fireEvent('change', this, record);
         }

package/src/version.js

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