@magic-xpa/engine 4.900.0-dev490.111 → 4.900.0-dev490.114
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/esm2020/src/ClientManager.mjs +9 -4
- package/esm2020/src/CurrentClientVersion.mjs +2 -2
- package/esm2020/src/bridge/MagicBridge.mjs +3 -3
- package/esm2020/src/tasks/Task.mjs +5 -2
- package/fesm2015/magic-xpa-engine.mjs +14 -6
- package/fesm2015/magic-xpa-engine.mjs.map +1 -1
- package/fesm2020/magic-xpa-engine.mjs +14 -6
- package/fesm2020/magic-xpa-engine.mjs.map +1 -1
- package/package.json +4 -4
- package/src/ClientManager.d.ts +1 -1
- package/src/bridge/MagicBridge.d.ts +1 -1
|
@@ -24737,7 +24737,10 @@ class Task extends TaskBase {
|
|
|
24737
24737
|
let tokensVector = XmlParser.getTokens(RuntimeContextBase.Instance.Parser.getXMLsubstring(endTaskUrlIdx), XMLConstants.XML_ATTR_DELIM);
|
|
24738
24738
|
let taskCacheURL = tokensVector.get_Item(1);
|
|
24739
24739
|
let refListStr = tokensVector.get_Item(3);
|
|
24740
|
-
let taskContentOriginal =
|
|
24740
|
+
let taskContentOriginal = "";
|
|
24741
|
+
if (taskCacheURL.trim() != "") {
|
|
24742
|
+
taskContentOriginal = await Task.CommandsProcessor.GetContent(taskCacheURL, true);
|
|
24743
|
+
}
|
|
24741
24744
|
let taskContentFinal = new StringBuilder(xmlData.substr(0, RuntimeContextBase.Instance.Parser.getCurrIndex() - (ConstInterface.MG_TAG_TASKURL.length + 1)), taskContentOriginal.length);
|
|
24742
24745
|
let reflist = this.getReflist(refListStr, ';', true, -1);
|
|
24743
24746
|
let refListIdx = 0;
|
|
@@ -29529,7 +29532,7 @@ class CommandsTable {
|
|
|
29529
29532
|
}
|
|
29530
29533
|
}
|
|
29531
29534
|
|
|
29532
|
-
let CurrentClientVersion = '4.900.0-dev490.
|
|
29535
|
+
let CurrentClientVersion = '4.900.0-dev490.114';
|
|
29533
29536
|
|
|
29534
29537
|
class ClientManager {
|
|
29535
29538
|
constructor() {
|
|
@@ -29790,7 +29793,7 @@ class ClientManager {
|
|
|
29790
29793
|
}
|
|
29791
29794
|
return pic;
|
|
29792
29795
|
}
|
|
29793
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
29796
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
29794
29797
|
let pic = null;
|
|
29795
29798
|
let task = MGDataCollection.Instance.GetTaskByID(taskId);
|
|
29796
29799
|
let control = null;
|
|
@@ -29798,7 +29801,12 @@ class ClientManager {
|
|
|
29798
29801
|
if (controlName !== null && task !== null)
|
|
29799
29802
|
control = task.getForm().GetCtrl(controlName);
|
|
29800
29803
|
if (control != null && control.DataType == StorageAttribute.NUMERIC) {
|
|
29801
|
-
|
|
29804
|
+
if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
|
|
29805
|
+
let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
|
|
29806
|
+
pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
|
|
29807
|
+
}
|
|
29808
|
+
else
|
|
29809
|
+
pic = control.getPIC();
|
|
29802
29810
|
let dispValue = String(value);
|
|
29803
29811
|
let newPic = pic.getUnformattedNumericPic();
|
|
29804
29812
|
let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
|
|
@@ -29899,8 +29907,8 @@ class MagicBridge {
|
|
|
29899
29907
|
static GetControlPictureMask(taskId, controlName) {
|
|
29900
29908
|
return ClientManager.GetControlPictureMask(taskId, controlName);
|
|
29901
29909
|
}
|
|
29902
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
29903
|
-
return ClientManager.GetFormattedValue(taskId, controlName, value);
|
|
29910
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
29911
|
+
return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
|
|
29904
29912
|
}
|
|
29905
29913
|
static GetRangedValue(taskId, controlName, value) {
|
|
29906
29914
|
return ClientManager.GetRangedValue(taskId, controlName, value);
|