ru.coon 2.5.28 → 2.5.29

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 CHANGED
@@ -1,3 +1,10 @@
1
+ # Version 2.5.29, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b52df8476b55361b79c0484edffa53e9fc9d170)
2
+ * ## Fixes
3
+ * <span style='color:red'> BFL-8598 убраны серые звездочки, при валидности поля</span> ([c36dc2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c36dc2b38c4cea6c33829a694ad803b10d606c56))
4
+ * <span style='color:red'> BFL-8598 убраны серые звездочки, при валидности поля</span> ([a3cbbe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a3cbbe27e530f023d39d3478373a45252b601816))
5
+
6
+ * update: CHANGELOG.md ([104edb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/104edb305212754136d1ae57beaec1e9052dac80))
7
+
1
8
  # Version 2.5.28, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1234c97e665cf63c2ab2a4a0048f26b99c815f04)
2
9
  * ## Fixes
3
10
  * <span style='color:red'> TR-67140 method renamed</span> ([129cb9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/129cb965f9c1be60ca5ba877f35eedbead2dc815))
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "name": "ru.coon"
5
5
  },
6
6
  "description": "",
7
- "version": "2.5.28",
7
+ "version": "2.5.29",
8
8
  "repository": {
9
9
  "type": "git",
10
10
  "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -68,6 +68,16 @@ Ext.define('Coon.common.plugin.form.RequiredFlagPlugin', {
68
68
  return true;
69
69
  }.bind(this);
70
70
 
71
+ field.changeFieldFlag = function(isRequired) {
72
+ const field = this.field;
73
+ field.isRequired = isRequired;
74
+ if (isRequired) {
75
+ field.getEl().dom.querySelector('.required-flag').textContent = '*';
76
+ } else {
77
+ field.getEl().dom.querySelector('.required-flag').textContent = '';
78
+ }
79
+ }.bind(this);
80
+
71
81
  field.on('afterrender', function(fld) {
72
82
  if (fld.lastFlagColor) {
73
83
  fld.setFlagColor(fld.lastFlagColor);
@@ -106,6 +106,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
106
106
  this.fields.forEach((field) => { // Поставить все звездочки
107
107
  if (field.setFlagColor && typeof field.setFlagColor === 'function') {
108
108
  field.setFlagColor(this.requiredFieldColorState2);
109
+ field.changeFieldFlag(!valid);
109
110
  }
110
111
  });
111
112
  }
@@ -135,6 +136,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
135
136
  if (currentField && Ext.isEmpty(currentField.getValue())) {
136
137
  valid = false;
137
138
  }
139
+ currentField.changeFieldFlag(Ext.isEmpty(currentField.getValue()));
138
140
  currentField.setFlagColor(Ext.isEmpty(currentField.getValue()) ? this.requiredFieldColorState1: this.requiredFieldColorState2);
139
141
  }
140
142
  group.checkResult = this.getCheckResultAnd(valid, group);
@@ -150,6 +152,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
150
152
  }
151
153
  for (const field of group.children) {
152
154
  const currentField = this.fields.find((element) => element.name === field.reportParameterCd);
155
+ currentField.changeFieldFlag(!valid);
153
156
  currentField.setFlagColor(valid ? this.requiredFieldColorState2 : this.requiredFieldColorState1);
154
157
  }
155
158
  group.checkResult = this.getCheckResultOr(valid, group);
package/src/version.js CHANGED
@@ -1,4 +1,4 @@
1
1
  Ext.define('Coon.version', {
2
2
  singleton: true,
3
- number: '2.5.28',
3
+ number: '2.5.29',
4
4
  });