ru.coon 2.5.33 → 2.5.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/package.json +1 -1
- package/src/report/component/ReportLookupCombo.js +11 -1
- package/src/version.js +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
# Version 2.5.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83a61a9400eca79d2a71c3e7d0b2e834c6df1cec)
|
|
2
|
+
* ## Fixes
|
|
3
|
+
* <span style='color:red'> BFL-8646: fix object value and assign object params</span> ([15d3e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/15d3e8515a3ecefa750c06b85387d57f101e24fe))
|
|
4
|
+
|
|
5
|
+
* update: CHANGELOG.md ([a4612b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a4612b5a0e83714c0bf5ab766458cdf0949f1daa))
|
|
6
|
+
|
|
1
7
|
# Version 2.5.33, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3c703020664a8b7ecc9b4fdbc0d82e6121769531)
|
|
2
8
|
* ## Fixes
|
|
3
9
|
* <span style='color:red'> CRM-7853 ParameterizedReportCombo исправлена логика работы при включенном parseParameters</span> ([bf36ba], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bf36ba56567b934fe6d2cd1ac809e3d66cf3041f))
|
package/package.json
CHANGED
|
@@ -240,11 +240,20 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
|
|
|
240
240
|
* @param {string} value
|
|
241
241
|
*/
|
|
242
242
|
loadReportData(value) {
|
|
243
|
+
if (Ext.isObject(value)) {
|
|
244
|
+
if (typeof value.isModel === 'function' && value.isModel() && this.valueField) {
|
|
245
|
+
value = value.get(this.valueField);
|
|
246
|
+
} else {
|
|
247
|
+
Coon.log.error('ReportLookupCombo has an object value param in loadReportData function!');
|
|
248
|
+
return false;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
243
251
|
if (value && this._cachedValue === value && this.getStore().getData().length) {
|
|
244
252
|
this.selectRecordByValue(value);
|
|
245
253
|
return;
|
|
246
254
|
}
|
|
247
255
|
const parameters = Object.assign(
|
|
256
|
+
{},
|
|
248
257
|
this.getFilterDefaults(),
|
|
249
258
|
this.params,
|
|
250
259
|
{
|
|
@@ -335,7 +344,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
|
|
|
335
344
|
this.setViewModelValue(record);
|
|
336
345
|
}
|
|
337
346
|
this.store.loadData([record]);
|
|
338
|
-
this.
|
|
347
|
+
this.setValue(record[this.valueField]);
|
|
339
348
|
},
|
|
340
349
|
|
|
341
350
|
/**
|
|
@@ -386,6 +395,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
|
|
|
386
395
|
});
|
|
387
396
|
win.show();
|
|
388
397
|
const parameters = Object.assign(
|
|
398
|
+
{},
|
|
389
399
|
this.getFilterDefaults(),
|
|
390
400
|
this.params || {}
|
|
391
401
|
);
|
package/src/version.js
CHANGED