@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
|
@@ -25411,7 +25411,10 @@ class Task extends TaskBase {
|
|
|
25411
25411
|
let tokensVector = XmlParser.getTokens(RuntimeContextBase.Instance.Parser.getXMLsubstring(endTaskUrlIdx), XMLConstants.XML_ATTR_DELIM);
|
|
25412
25412
|
let taskCacheURL = tokensVector.get_Item(1);
|
|
25413
25413
|
let refListStr = tokensVector.get_Item(3);
|
|
25414
|
-
let taskContentOriginal =
|
|
25414
|
+
let taskContentOriginal = "";
|
|
25415
|
+
if (taskCacheURL.trim() != "") {
|
|
25416
|
+
taskContentOriginal = yield Task.CommandsProcessor.GetContent(taskCacheURL, true);
|
|
25417
|
+
}
|
|
25415
25418
|
let taskContentFinal = new StringBuilder(xmlData.substr(0, RuntimeContextBase.Instance.Parser.getCurrIndex() - (ConstInterface.MG_TAG_TASKURL.length + 1)), taskContentOriginal.length);
|
|
25416
25419
|
let reflist = this.getReflist(refListStr, ';', true, -1);
|
|
25417
25420
|
let refListIdx = 0;
|
|
@@ -30374,7 +30377,7 @@ class CommandsTable {
|
|
|
30374
30377
|
}
|
|
30375
30378
|
}
|
|
30376
30379
|
|
|
30377
|
-
let CurrentClientVersion = '4.900.0-dev490.
|
|
30380
|
+
let CurrentClientVersion = '4.900.0-dev490.114';
|
|
30378
30381
|
|
|
30379
30382
|
class ClientManager {
|
|
30380
30383
|
constructor() {
|
|
@@ -30643,7 +30646,7 @@ class ClientManager {
|
|
|
30643
30646
|
}
|
|
30644
30647
|
return pic;
|
|
30645
30648
|
}
|
|
30646
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
30649
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
30647
30650
|
let pic = null;
|
|
30648
30651
|
let task = MGDataCollection.Instance.GetTaskByID(taskId);
|
|
30649
30652
|
let control = null;
|
|
@@ -30651,7 +30654,12 @@ class ClientManager {
|
|
|
30651
30654
|
if (controlName !== null && task !== null)
|
|
30652
30655
|
control = task.getForm().GetCtrl(controlName);
|
|
30653
30656
|
if (control != null && control.DataType == StorageAttribute.NUMERIC) {
|
|
30654
|
-
|
|
30657
|
+
if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
|
|
30658
|
+
let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
|
|
30659
|
+
pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
|
|
30660
|
+
}
|
|
30661
|
+
else
|
|
30662
|
+
pic = control.getPIC();
|
|
30655
30663
|
let dispValue = String(value);
|
|
30656
30664
|
let newPic = pic.getUnformattedNumericPic();
|
|
30657
30665
|
let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
|
|
@@ -30754,8 +30762,8 @@ class MagicBridge {
|
|
|
30754
30762
|
static GetControlPictureMask(taskId, controlName) {
|
|
30755
30763
|
return ClientManager.GetControlPictureMask(taskId, controlName);
|
|
30756
30764
|
}
|
|
30757
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
30758
|
-
return ClientManager.GetFormattedValue(taskId, controlName, value);
|
|
30765
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
30766
|
+
return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
|
|
30759
30767
|
}
|
|
30760
30768
|
static GetRangedValue(taskId, controlName, value) {
|
|
30761
30769
|
return ClientManager.GetRangedValue(taskId, controlName, value);
|