@magic-xpa/engine 4.1000.0-dev4100.9 → 4.1000.0-dev4100.91

package/fesm2020/magic-xpa-engine.mjs

@@ -6722,7 +6722,7 @@ ExpressionDict.expDesc = [
     null,
     new ExpDesc('N', 0, 0, 0, "", false),
     null,
-    new ExpDesc('B', 0, 2, 2, "BN", false),
+    null,
     new ExpDesc('B', 0, 2, 2, "V ", false),
     null,
     null,
@@ -7171,12 +7171,12 @@ ExpressionDict.expDesc = [
     null,
     new ExpDesc('A', 0, 1, 1, "A", false),
     new ExpDesc('N', 0, 2, 2, "AA", false),
-    new ExpDesc('B', 0, -2, -2, "V  ", false),
-    new ExpDesc('B', 0, 1, 1, "N", false),
-    new ExpDesc('B', 0, -2, -2, "V  ", false),
-    new ExpDesc('B', 0, 1, 1, "N", false),
-    new ExpDesc('B', 0, 2, 2, "VB", false),
-    new ExpDesc('B', 0, 1, 1, "N", false),
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
     new ExpDesc('N', 0, 1, 1, "N", false),
     null,
     null,
@@ -7263,48 +7263,6 @@ ExpressionDict.expDesc = [
     new ExpDesc('U', 0, 0, 0, '', false),
 ];
 
-var DataViewCommandType;
-(function (DataViewCommandType) {
-    DataViewCommandType[DataViewCommandType["Init"] = 0] = "Init";
-    DataViewCommandType[DataViewCommandType["Clear"] = 1] = "Clear";
-    DataViewCommandType[DataViewCommandType["Prepare"] = 2] = "Prepare";
-    DataViewCommandType[DataViewCommandType["FirstChunk"] = 3] = "FirstChunk";
-    DataViewCommandType[DataViewCommandType["RecomputeUnit"] = 4] = "RecomputeUnit";
-    DataViewCommandType[DataViewCommandType["ExecuteLocalUpdates"] = 5] = "ExecuteLocalUpdates";
-    DataViewCommandType[DataViewCommandType["InitDataControlViews"] = 6] = "InitDataControlViews";
-    DataViewCommandType[DataViewCommandType["OpenTransaction"] = 7] = "OpenTransaction";
-    DataViewCommandType[DataViewCommandType["CloseTransaction"] = 8] = "CloseTransaction";
-    DataViewCommandType[DataViewCommandType["SetTransactionState"] = 9] = "SetTransactionState";
-    DataViewCommandType[DataViewCommandType["AddUserRange"] = 10] = "AddUserRange";
-    DataViewCommandType[DataViewCommandType["ResetUserRange"] = 11] = "ResetUserRange";
-    DataViewCommandType[DataViewCommandType["DbDisconnect"] = 12] = "DbDisconnect";
-    DataViewCommandType[DataViewCommandType["AddUserLocate"] = 13] = "AddUserLocate";
-    DataViewCommandType[DataViewCommandType["ResetUserLocate"] = 14] = "ResetUserLocate";
-    DataViewCommandType[DataViewCommandType["AddUserSort"] = 15] = "AddUserSort";
-    DataViewCommandType[DataViewCommandType["ResetUserSort"] = 16] = "ResetUserSort";
-    DataViewCommandType[DataViewCommandType["DataViewToDataSource"] = 17] = "DataViewToDataSource";
-    DataViewCommandType[DataViewCommandType["DbDelete"] = 18] = "DbDelete";
-    DataViewCommandType[DataViewCommandType["ControlItemsRefresh"] = 19] = "ControlItemsRefresh";
-    DataViewCommandType[DataViewCommandType["SQLExecute"] = 20] = "SQLExecute";
-})(DataViewCommandType || (DataViewCommandType = {}));
-class DataviewCommand extends ClientOriginatedCommandTaskTag {
-    constructor() {
-        super();
-        this.CommandType = 0;
-        this.TaskTag = null;
-    }
-    get CommandTypeAttribute() {
-        throw new NotImplementedException();
-    }
-    SerializeCommandData() {
-        Debug.Assert(false, "Dataview commands need not be serialized");
-        return null;
-    }
-    get ShouldSerialize() {
-        return false;
-    }
-}
-
 class EventHandlerPosition {
     constructor() {
         this._handlerIdx = 0;
@@ -7501,6 +7459,48 @@ EventHandlerPosition.PHASE_CONTROL_NON_SPECIFIC = 2;
 EventHandlerPosition.PHASE_GLOBAL = 3;
 EventHandlerPosition.PHASE_GLOBAL_SPECIFIC = 4;
 
+var DataViewCommandType;
+(function (DataViewCommandType) {
+    DataViewCommandType[DataViewCommandType["Init"] = 0] = "Init";
+    DataViewCommandType[DataViewCommandType["Clear"] = 1] = "Clear";
+    DataViewCommandType[DataViewCommandType["Prepare"] = 2] = "Prepare";
+    DataViewCommandType[DataViewCommandType["FirstChunk"] = 3] = "FirstChunk";
+    DataViewCommandType[DataViewCommandType["RecomputeUnit"] = 4] = "RecomputeUnit";
+    DataViewCommandType[DataViewCommandType["ExecuteLocalUpdates"] = 5] = "ExecuteLocalUpdates";
+    DataViewCommandType[DataViewCommandType["InitDataControlViews"] = 6] = "InitDataControlViews";
+    DataViewCommandType[DataViewCommandType["OpenTransaction"] = 7] = "OpenTransaction";
+    DataViewCommandType[DataViewCommandType["CloseTransaction"] = 8] = "CloseTransaction";
+    DataViewCommandType[DataViewCommandType["SetTransactionState"] = 9] = "SetTransactionState";
+    DataViewCommandType[DataViewCommandType["AddUserRange"] = 10] = "AddUserRange";
+    DataViewCommandType[DataViewCommandType["ResetUserRange"] = 11] = "ResetUserRange";
+    DataViewCommandType[DataViewCommandType["DbDisconnect"] = 12] = "DbDisconnect";
+    DataViewCommandType[DataViewCommandType["AddUserLocate"] = 13] = "AddUserLocate";
+    DataViewCommandType[DataViewCommandType["ResetUserLocate"] = 14] = "ResetUserLocate";
+    DataViewCommandType[DataViewCommandType["AddUserSort"] = 15] = "AddUserSort";
+    DataViewCommandType[DataViewCommandType["ResetUserSort"] = 16] = "ResetUserSort";
+    DataViewCommandType[DataViewCommandType["DataViewToDataSource"] = 17] = "DataViewToDataSource";
+    DataViewCommandType[DataViewCommandType["DbDelete"] = 18] = "DbDelete";
+    DataViewCommandType[DataViewCommandType["ControlItemsRefresh"] = 19] = "ControlItemsRefresh";
+    DataViewCommandType[DataViewCommandType["SQLExecute"] = 20] = "SQLExecute";
+})(DataViewCommandType || (DataViewCommandType = {}));
+class DataviewCommand extends ClientOriginatedCommandTaskTag {
+    constructor() {
+        super();
+        this.CommandType = 0;
+        this.TaskTag = null;
+    }
+    get CommandTypeAttribute() {
+        throw new NotImplementedException();
+    }
+    SerializeCommandData() {
+        Debug.Assert(false, "Dataview commands need not be serialized");
+        return null;
+    }
+    get ShouldSerialize() {
+        return false;
+    }
+}
+
 class AddUserRangeDataviewCommand extends DataviewCommand {
     constructor() {
         super();
@@ -7899,6 +7899,13 @@ class SelectProgramCommand extends ExecOperCommand {
     }
 }
 
+class ControlItemsRefreshCommand extends DataviewCommand {
+    constructor() {
+        super();
+        this.Control = null;
+    }
+}
+
 class CommandFactory {
     static CreateEventCommand(taskTag, magicEvent) {
         let eventCommand = new EventCommand(magicEvent);
@@ -7917,6 +7924,13 @@ class CommandFactory {
         dataviewCommand.TaskTag = taskId;
         return dataviewCommand;
     }
+    static CreateControlItemsRefreshCommand(taskId, control) {
+        let command = new ControlItemsRefreshCommand();
+        command.CommandType = DataViewCommandType.ControlItemsRefresh;
+        command.TaskTag = taskId;
+        command.Control = control;
+        return command;
+    }
     static CreateAddUserRangeDataviewCommand(taskId, userRange) {
         let addUserRangeDataviewCommand = new AddUserRangeDataviewCommand();
         addUserRangeDataviewCommand.TaskTag = taskId;
@@ -8122,13 +8136,6 @@ class CommandFactory {
     }
 }
 
-class Sort {
-    constructor() {
-        this.fldIdx = 0;
-        this.dir = false;
-    }
-}
-
 var ParamParseResult;
 (function (ParamParseResult) {
     ParamParseResult[ParamParseResult["OK"] = 0] = "OK";
@@ -10850,6 +10857,11 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 this.eval_op_VarDisplayName(resVal, val1);
                 expStrTracker.resetNullResult();
                 break;
+            case ExpressionInterface.EXP_OP_CONTROL_ITEMS_REFRESH:
+                val2 = valStack.pop();
+                val1 = valStack.pop();
+                await this.eval_op_controlItemRefresh(val1, val2, resVal);
+                break;
             case ExpressionInterface.EXP_OP_VARCONTROLID:
                 val1 = valStack.pop();
                 this.eval_op_VarControlID(resVal, val1);
@@ -11238,11 +11250,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 val1 = valStack.pop();
                 this.eval_op_eoy(resVal, val1);
                 break;
-            case ExpressionInterface.EXP_OP_ROLLBACK:
-                val2 = valStack.pop();
-                val1 = valStack.pop();
-                await this.eval_op_rollback(resVal);
-                break;
             case ExpressionInterface.EXP_OP_VARSET:
                 val2 = valStack.pop();
                 val1 = valStack.pop();
@@ -11607,41 +11614,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 val1 = valStack.pop();
                 this.eval_op_taskType(resVal, val1);
                 break;
-            case ExpressionInterface.EXP_OP_RANGE_ADD:
-                nArgs = valStack.pop();
-                if (nArgs > 0) {
-                    Exp_params = new Array(nArgs);
-                    for (j = 0; j < nArgs; j++)
-                        Exp_params[nArgs - 1 - j] = valStack.pop();
-                    await this.eval_op_range_add(resVal, Exp_params);
-                }
-                break;
-            case ExpressionInterface.EXP_OP_RANGE_RESET:
-                val1 = valStack.pop();
-                await this.eval_op_range_reset(resVal, val1);
-                break;
-            case ExpressionInterface.EXP_OP_LOCATE_ADD:
-                nArgs = valStack.pop();
-                if (nArgs > 0) {
-                    Exp_params = new Array(nArgs);
-                    for (j = 0; j < nArgs; j++)
-                        Exp_params[nArgs - 1 - j] = valStack.pop();
-                    await this.eval_op_locate_add(resVal, Exp_params);
-                }
-                break;
-            case ExpressionInterface.EXP_OP_LOCATE_RESET:
-                val1 = valStack.pop();
-                await this.eval_op_locate_reset(resVal, val1);
-                break;
-            case ExpressionInterface.EXP_OP_SORT_ADD:
-                val2 = valStack.pop();
-                val1 = valStack.pop();
-                await this.eval_op_sort_add(resVal, val1, val2);
-                break;
-            case ExpressionInterface.EXP_OP_SORT_RESET:
-                val1 = valStack.pop();
-                await this.eval_op_sort_reset(resVal, val1);
-                break;
             case ExpressionInterface.EXP_OP_TSK_INSTANCE:
                 val1 = valStack.pop();
                 this.eval_op_tsk_instance(resVal, val1);
@@ -12978,6 +12950,23 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 resVal.StrVal = fld.VarDisplayName;
         }
     }
+    async eval_op_controlItemRefresh(val1, val2, resVal) {
+        let success = false;
+        let parent = val2.MgNumVal.NUM_2_LONG();
+        resVal.Attr = StorageAttribute.BOOLEAN;
+        if ((parent >= 0 && parent < (this.ExpTask.getTaskDepth(false))) || parent === ExpressionEvaluator.TRIGGER_TASK) {
+            let tsk = super.GetContextTask(parent);
+            if (tsk != null && tsk.getForm() != null) {
+                let control = tsk.getForm().GetCtrl(val1.StrVal);
+                if (control != null && control.isChoiceControl() && control.isDataCtrl()) {
+                    let command = CommandFactory.CreateControlItemsRefreshCommand(tsk.getTaskTag(), control);
+                    await tsk.DataviewManager.CurrentDataviewManager.Execute(command);
+                    success = true;
+                }
+            }
+        }
+        resVal.BoolVal = success;
+    }
     eval_op_VarControlID(resVal, val1) {
         let ret = 0;
         if (val1.MgNumVal !== null) {
@@ -13263,12 +13252,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         await fld.setValueAndStartRecompute(bufptr, val.IsNull, true, setRecordUpdated, false);
         await fld.updateDisplay();
     }
-    async eval_op_rollback(resVal) {
-        let task = this.ExpTask.GetContextTask() || this.ExpTask;
-        await AccessHelper.eventsManager.handleInternalEventWithTask(task, InternalInterface.MG_ACT_ROLLBACK);
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        resVal.BoolVal = true;
-    }
     eval_op_like(source, maskOrg, resVal) {
         let i;
         let j;
@@ -13825,54 +13808,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         resultStr.Replace('\\@', '@');
         resVal.StrVal = resultStr.ToString();
     }
-    async eval_op_range_add(resVal, Exp_params) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        resVal.BoolVal = await this.add_rt_ranges(Exp_params, false);
-    }
-    async eval_op_range_reset(resVal, parent) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        let iParent = parent.MgNumVal.NUM_2_LONG();
-        if ((iParent >= 0 && iParent < (this.ExpTask.getTaskDepth(false))) || iParent === ExpressionEvaluator.TRIGGER_TASK) {
-            let task = super.GetContextTask(iParent);
-            if (task !== null) {
-                let command = CommandFactory.CreateDataViewCommand(task.getTaskTag(), DataViewCommandType.ResetUserRange);
-                await task.DataviewManager.Execute(command);
-                resVal.BoolVal = true;
-            }
-        }
-    }
-    async eval_op_locate_add(resVal, Exp_params) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        resVal.BoolVal = await this.add_rt_ranges(Exp_params, true);
-    }
-    async eval_op_locate_reset(resVal, parent) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        let iParent = parent.MgNumVal.NUM_2_LONG();
-        if ((iParent >= 0 && iParent < (this.ExpTask.getTaskDepth(false))) || iParent === ExpressionEvaluator.TRIGGER_TASK) {
-            let task = super.GetContextTask(iParent);
-            if (task !== null) {
-                let command = CommandFactory.CreateDataViewCommand(task.getTaskTag(), DataViewCommandType.ResetUserLocate);
-                await task.DataviewManager.Execute(command);
-                resVal.BoolVal = true;
-            }
-        }
-    }
-    async eval_op_sort_add(resVal, varnum, dir) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        resVal.BoolVal = await this.add_sort(varnum, dir);
-    }
-    async eval_op_sort_reset(resVal, parent) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        let iParent = parent.MgNumVal.NUM_2_LONG();
-        if ((iParent >= 0 && iParent < (this.ExpTask.getTaskDepth(false))) || iParent === ExpressionEvaluator.TRIGGER_TASK) {
-            let task = super.GetContextTask(iParent);
-            if (task !== null) {
-                let command = CommandFactory.CreateDataViewCommand(task.getTaskTag(), DataViewCommandType.ResetUserSort);
-                await task.DataviewManager.Execute(command);
-                resVal.BoolVal = true;
-            }
-        }
-    }
     eval_op_tsk_instance(resVal, Parent) {
         let tag = 0;
         let iParent = Parent.MgNumVal.NUM_2_LONG();
@@ -13886,84 +13821,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         resVal.MgNumVal = new NUM_TYPE();
         resVal.MgNumVal.NUM_4_LONG(tag);
     }
-    async add_sort(varnum, dir) {
-        if (varnum.MgNumVal === null)
-            return false;
-        let itm = varnum.MgNumVal.NUM_2_LONG();
-        if (itm === 0)
-            return false;
-        let fld = this.GetFieldOfContextTask(itm);
-        if (fld === null)
-            return false;
-        let task = fld.getTask();
-        let vee_idx = fld.getId() + 1;
-        let expr_64 = new Sort();
-        expr_64.fldIdx = vee_idx;
-        expr_64.dir = dir.BoolVal;
-        let sort = expr_64;
-        let command = CommandFactory.CreateAddUserSortDataviewCommand(task.getTaskTag(), sort);
-        await task.DataviewManager.Execute(command);
-        return true;
-    }
-    async add_rt_ranges(Exp_params, locate) {
-        let varnum = Exp_params[0];
-        let min = Exp_params[1];
-        if (varnum.MgNumVal === null)
-            return false;
-        let itm = varnum.MgNumVal.NUM_2_LONG();
-        if (itm === 0)
-            return false;
-        let fld = this.GetFieldOfContextTask(itm);
-        if (fld === null)
-            return false;
-        let task = fld.getTask();
-        let vee_idx = fld.getId() + 1;
-        let expr_78 = new UserRange();
-        expr_78.veeIdx = vee_idx;
-        let rng = expr_78;
-        if (min.IsNull)
-            rng.nullMin = true;
-        if (!rng.nullMin && (min.Attr === StorageAttribute.ALPHA || min.Attr === StorageAttribute.UNICODE) && min.StrVal.length === 0)
-            rng.discardMin = true;
-        else {
-            if (!rng.nullMin) {
-                if (!StorageAttributeCheck.isTheSameType(fld.getType(), min.Attr))
-                    return false;
-                if (StorageAttributeCheck.StorageFldAlphaUnicodeOrBlob(fld.getType(), min.Attr))
-                    this.ConvertExpVal(min, fld.getType());
-                rng.min = min.ToMgVal();
-            }
-        }
-        if (Exp_params.length === 3) {
-            let max = Exp_params[2];
-            if (max.IsNull)
-                rng.nullMax = true;
-            if (!rng.nullMax && (max.Attr === StorageAttribute.ALPHA || max.Attr === StorageAttribute.UNICODE) && max.StrVal.length === 0)
-                rng.discardMax = true;
-            else {
-                if (!rng.nullMax) {
-                    if (!StorageAttributeCheck.isTheSameType(fld.getType(), max.Attr))
-                        return false;
-                    if (StorageAttributeCheck.StorageFldAlphaUnicodeOrBlob(fld.getType(), max.Attr))
-                        this.ConvertExpVal(max, fld.getType());
-                    rng.max = max.ToMgVal();
-                }
-            }
-        }
-        else
-            rng.discardMax = true;
-        if (!rng.discardMin || !rng.discardMax) {
-            if (locate) {
-                let command = CommandFactory.CreateAddUserLocateDataviewCommand(task.getTaskTag(), rng);
-                await task.DataviewManager.Execute(command);
-            }
-            else {
-                let command2 = CommandFactory.CreateAddUserRangeDataviewCommand(task.getTaskTag(), rng);
-                await task.DataviewManager.Execute(command2);
-            }
-        }
-        return true;
-    }
     eval_op_getParam(resVal, name) {
         Debug.Assert(!name.IsNull && name.StrVal !== null);
         let expVal = GlobalParams.Instance.get(name.StrVal);
@@ -19146,6 +19003,13 @@ class DataviewManager extends DataviewManagerBase {
     }
 }
 
+class Sort {
+    constructor() {
+        this.fldIdx = 0;
+        this.dir = false;
+    }
+}
+
 class SortCollection {
     constructor() {
         this._sortTab = null;
@@ -19374,7 +19238,11 @@ class MgForm extends MgFormBase {
                         this.GetDataview().setTopRecIdxModified(true);
                         try {
                             this._suffixDone = false;
-                            await this.setCurrRowByDisplayLine(this.GetDataview().getCurrRecIdx() + size, true, false);
+                            let newDisplayLine = this.GetDataview().getCurrRecIdx() + size;
+                            if (unit === Constants.MOVE_UNIT_PAGE && this.isLineMode())
+                                if (newDisplayLine > this.GetDataview().getSize() - 1)
+                                    visibleLine -= newDisplayLine - (this.GetDataview().getSize() - 1);
+                            await this.setCurrRowByDisplayLine(newDisplayLine, true, false);
                             this.GetDataview().setTopRecIdxModified(false);
                             await this.RefreshDisplay(Constants.TASK_REFRESH_FORM);
                         }
@@ -29542,7 +29410,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1000.0-dev4100.9';
+let CurrentClientVersion = '4.1000.0-dev4100.91';
 
 class ClientManager {
     constructor() {
@@ -29973,13 +29841,6 @@ class MagicBridge {
     }
 }
 
-class ControlItemsRefreshCommand extends DataviewCommand {
-    constructor() {
-        super();
-        this.Control = null;
-    }
-}
-
 class DataViewOutputCommand extends DataviewCommand {
     constructor(OutputCommandType) {
         super();