@magic-xpa/engine 4.801.0-dev481.390 → 4.801.0-dev481.391
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
|
@@ -29518,7 +29518,7 @@ class CommandsTable {
|
|
|
29518
29518
|
}
|
|
29519
29519
|
}
|
|
29520
29520
|
|
|
29521
|
-
let CurrentClientVersion = '4.801.0-dev481.
|
|
29521
|
+
let CurrentClientVersion = '4.801.0-dev481.391';
|
|
29522
29522
|
|
|
29523
29523
|
class ClientManager {
|
|
29524
29524
|
constructor() {
|
|
@@ -29779,7 +29779,7 @@ class ClientManager {
|
|
|
29779
29779
|
}
|
|
29780
29780
|
return pic;
|
|
29781
29781
|
}
|
|
29782
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
29782
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
29783
29783
|
let pic = null;
|
|
29784
29784
|
let task = MGDataCollection.Instance.GetTaskByID(taskId);
|
|
29785
29785
|
let control = null;
|
|
@@ -29787,7 +29787,12 @@ class ClientManager {
|
|
|
29787
29787
|
if (controlName !== null && task !== null)
|
|
29788
29788
|
control = task.getForm().GetCtrl(controlName);
|
|
29789
29789
|
if (control != null && control.DataType == StorageAttribute.NUMERIC) {
|
|
29790
|
-
|
|
29790
|
+
if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
|
|
29791
|
+
let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
|
|
29792
|
+
pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
|
|
29793
|
+
}
|
|
29794
|
+
else
|
|
29795
|
+
pic = control.getPIC();
|
|
29791
29796
|
let dispValue = String(value);
|
|
29792
29797
|
let newPic = pic.getUnformattedNumericPic();
|
|
29793
29798
|
let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
|
|
@@ -29888,8 +29893,8 @@ class MagicBridge {
|
|
|
29888
29893
|
static GetControlPictureMask(taskId, controlName) {
|
|
29889
29894
|
return ClientManager.GetControlPictureMask(taskId, controlName);
|
|
29890
29895
|
}
|
|
29891
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
29892
|
-
return ClientManager.GetFormattedValue(taskId, controlName, value);
|
|
29896
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
29897
|
+
return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
|
|
29893
29898
|
}
|
|
29894
29899
|
static GetRangedValue(taskId, controlName, value) {
|
|
29895
29900
|
return ClientManager.GetRangedValue(taskId, controlName, value);
|