@magic-xpa/engine 4.801.4 → 4.801.7
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 +2 -1
- package/fesm2015/magic-xpa-engine.mjs +11 -5
- package/fesm2015/magic-xpa-engine.mjs.map +1 -1
- package/fesm2020/magic-xpa-engine.mjs +11 -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
|
@@ -23622,6 +23622,7 @@ class Task extends TaskBase {
|
|
|
23622
23622
|
result = yield this.DataviewManager.Execute(dataViewCommand);
|
|
23623
23623
|
if (!result.Success)
|
|
23624
23624
|
return null;
|
|
23625
|
+
this.ResumeSubformLayout();
|
|
23625
23626
|
}
|
|
23626
23627
|
nonInteractiveTask = yield this.StartSubTasks(moveToFirstControl, nonInteractiveTask, callByDestSubForm);
|
|
23627
23628
|
this.InStartProcess = false;
|
|
@@ -30358,7 +30359,7 @@ class CommandsTable {
|
|
|
30358
30359
|
}
|
|
30359
30360
|
}
|
|
30360
30361
|
|
|
30361
|
-
let CurrentClientVersion = '4.801.
|
|
30362
|
+
let CurrentClientVersion = '4.801.7';
|
|
30362
30363
|
|
|
30363
30364
|
class ClientManager {
|
|
30364
30365
|
constructor() {
|
|
@@ -30627,7 +30628,7 @@ class ClientManager {
|
|
|
30627
30628
|
}
|
|
30628
30629
|
return pic;
|
|
30629
30630
|
}
|
|
30630
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
30631
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
30631
30632
|
let pic = null;
|
|
30632
30633
|
let task = MGDataCollection.Instance.GetTaskByID(taskId);
|
|
30633
30634
|
let control = null;
|
|
@@ -30635,7 +30636,12 @@ class ClientManager {
|
|
|
30635
30636
|
if (controlName !== null && task !== null)
|
|
30636
30637
|
control = task.getForm().GetCtrl(controlName);
|
|
30637
30638
|
if (control != null && control.DataType == StorageAttribute.NUMERIC) {
|
|
30638
|
-
|
|
30639
|
+
if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
|
|
30640
|
+
let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
|
|
30641
|
+
pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
|
|
30642
|
+
}
|
|
30643
|
+
else
|
|
30644
|
+
pic = control.getPIC();
|
|
30639
30645
|
let dispValue = String(value);
|
|
30640
30646
|
let newPic = pic.getUnformattedNumericPic();
|
|
30641
30647
|
let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
|
|
@@ -30738,8 +30744,8 @@ class MagicBridge {
|
|
|
30738
30744
|
static GetControlPictureMask(taskId, controlName) {
|
|
30739
30745
|
return ClientManager.GetControlPictureMask(taskId, controlName);
|
|
30740
30746
|
}
|
|
30741
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
30742
|
-
return ClientManager.GetFormattedValue(taskId, controlName, value);
|
|
30747
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
30748
|
+
return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
|
|
30743
30749
|
}
|
|
30744
30750
|
static GetRangedValue(taskId, controlName, value) {
|
|
30745
30751
|
return ClientManager.GetRangedValue(taskId, controlName, value);
|