@magic-xpa/gui 4.801.0-dev481.244 → 4.801.0-dev481.245
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/bundles/magic-xpa-gui.umd.js +18 -7
- package/bundles/magic-xpa-gui.umd.js.map +1 -1
- package/bundles/magic-xpa-gui.umd.min.js +1 -1
- package/bundles/magic-xpa-gui.umd.min.js.map +1 -1
- package/esm2015/src/management/gui/Property.js +15 -4
- package/fesm2015/magic-xpa-gui.js +14 -3
- package/fesm2015/magic-xpa-gui.js.map +1 -1
- package/package.json +2 -2
|
@@ -10796,7 +10796,7 @@
|
|
|
10796
10796
|
};
|
|
10797
10797
|
Property.prototype.ComputeValue = function () {
|
|
10798
10798
|
return __awaiter(this, void 0, void 0, function () {
|
|
10799
|
-
var result, len, wasEvaluated, alwaysEvaluate, _a, _b, e_3, warningMsg;
|
|
10799
|
+
var result, len, wasEvaluated, evaluated, alwaysEvaluate, _a, _b, e_3, warningMsg;
|
|
10800
10800
|
return __generator(this, function (_c) {
|
|
10801
10801
|
switch (_c.label) {
|
|
10802
10802
|
case 0:
|
|
@@ -10814,9 +10814,11 @@
|
|
|
10814
10814
|
if (!(this._id === exports.PropInterface.PROP_TYPE_CUSTOM_VALIDATORS)) return [3 /*break*/, 4];
|
|
10815
10815
|
return [4 /*yield*/, this.computeCustomValidators()];
|
|
10816
10816
|
case 3:
|
|
10817
|
-
_c.sent();
|
|
10818
|
-
|
|
10819
|
-
|
|
10817
|
+
evaluated = _c.sent();
|
|
10818
|
+
if (evaluated) {
|
|
10819
|
+
result = this.GetArrayValuesForCustomValidationProperties();
|
|
10820
|
+
this.setValue(result);
|
|
10821
|
+
}
|
|
10820
10822
|
return [3 /*break*/, 10];
|
|
10821
10823
|
case 4:
|
|
10822
10824
|
if (!(this._expId > 0)) return [3 /*break*/, 10];
|
|
@@ -11319,13 +11321,14 @@
|
|
|
11319
11321
|
};
|
|
11320
11322
|
Property.prototype.computeCustomValidators = function () {
|
|
11321
11323
|
return __awaiter(this, void 0, void 0, function () {
|
|
11322
|
-
var mgControl, _a, _b, _c, customPropertyKey, customValidatorProperty, len, wasEvaluated, expression, isInValid, errString, InValid, e_5_1;
|
|
11324
|
+
var mgControl, evaluated, _a, _b, _c, customPropertyKey, customValidatorProperty, len, wasEvaluated, expression, isInValid, errString, InValid, e_5_1;
|
|
11323
11325
|
var e_5, _d;
|
|
11324
11326
|
return __generator(this, function (_e) {
|
|
11325
11327
|
switch (_e.label) {
|
|
11326
11328
|
case 0:
|
|
11327
11329
|
mgControl = this._parentObj;
|
|
11328
|
-
|
|
11330
|
+
evaluated = true;
|
|
11331
|
+
if (!(mgControl.ModifiedByUser || mgControl.ValidateControl || this.GetTaskByParentObject().IsInRecompute())) return [3 /*break*/, 12];
|
|
11329
11332
|
_e.label = 1;
|
|
11330
11333
|
case 1:
|
|
11331
11334
|
_e.trys.push([1, 9, 10, 11]);
|
|
@@ -11353,6 +11356,7 @@
|
|
|
11353
11356
|
errString = customValidatorProperty._errorMessage;
|
|
11354
11357
|
_e.label = 6;
|
|
11355
11358
|
case 6:
|
|
11359
|
+
evaluated = true;
|
|
11356
11360
|
this.customValidatorValues.set(customPropertyKey, new CustomValidator(!InValid, errString));
|
|
11357
11361
|
_e.label = 7;
|
|
11358
11362
|
case 7:
|
|
@@ -11369,7 +11373,14 @@
|
|
|
11369
11373
|
}
|
|
11370
11374
|
finally { if (e_5) throw e_5.error; }
|
|
11371
11375
|
return [7 /*endfinally*/];
|
|
11372
|
-
case 11: return [
|
|
11376
|
+
case 11: return [3 /*break*/, 13];
|
|
11377
|
+
case 12:
|
|
11378
|
+
if (mgControl.isRepeatable()) {
|
|
11379
|
+
this.customValidatorValues.clear();
|
|
11380
|
+
evaluated = false;
|
|
11381
|
+
}
|
|
11382
|
+
_e.label = 13;
|
|
11383
|
+
case 13: return [2 /*return*/, evaluated];
|
|
11373
11384
|
}
|
|
11374
11385
|
});
|
|
11375
11386
|
});
|