@magic-xpa/engine 4.900.0-dev490.112 → 4.900.0-dev490.113
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/fesm2015/magic-xpa-engine.mjs +10 -5
- package/fesm2015/magic-xpa-engine.mjs.map +1 -1
- package/fesm2020/magic-xpa-engine.mjs +10 -5
- 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
|
@@ -29529,7 +29529,7 @@ class CommandsTable {
|
|
|
29529
29529
|
}
|
|
29530
29530
|
}
|
|
29531
29531
|
|
|
29532
|
-
let CurrentClientVersion = '4.900.0-dev490.
|
|
29532
|
+
let CurrentClientVersion = '4.900.0-dev490.113';
|
|
29533
29533
|
|
|
29534
29534
|
class ClientManager {
|
|
29535
29535
|
constructor() {
|
|
@@ -29790,7 +29790,7 @@ class ClientManager {
|
|
|
29790
29790
|
}
|
|
29791
29791
|
return pic;
|
|
29792
29792
|
}
|
|
29793
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
29793
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
29794
29794
|
let pic = null;
|
|
29795
29795
|
let task = MGDataCollection.Instance.GetTaskByID(taskId);
|
|
29796
29796
|
let control = null;
|
|
@@ -29798,7 +29798,12 @@ class ClientManager {
|
|
|
29798
29798
|
if (controlName !== null && task !== null)
|
|
29799
29799
|
control = task.getForm().GetCtrl(controlName);
|
|
29800
29800
|
if (control != null && control.DataType == StorageAttribute.NUMERIC) {
|
|
29801
|
-
|
|
29801
|
+
if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
|
|
29802
|
+
let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
|
|
29803
|
+
pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
|
|
29804
|
+
}
|
|
29805
|
+
else
|
|
29806
|
+
pic = control.getPIC();
|
|
29802
29807
|
let dispValue = String(value);
|
|
29803
29808
|
let newPic = pic.getUnformattedNumericPic();
|
|
29804
29809
|
let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
|
|
@@ -29899,8 +29904,8 @@ class MagicBridge {
|
|
|
29899
29904
|
static GetControlPictureMask(taskId, controlName) {
|
|
29900
29905
|
return ClientManager.GetControlPictureMask(taskId, controlName);
|
|
29901
29906
|
}
|
|
29902
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
29903
|
-
return ClientManager.GetFormattedValue(taskId, controlName, value);
|
|
29907
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
29908
|
+
return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
|
|
29904
29909
|
}
|
|
29905
29910
|
static GetRangedValue(taskId, controlName, value) {
|
|
29906
29911
|
return ClientManager.GetRangedValue(taskId, controlName, value);
|