@magic-xpa/engine 4.1000.0-dev4100.6 → 4.1000.0-dev4100.64

package/fesm2015/magic-xpa-engine.mjs

@@ -8095,6 +8095,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);
@@ -8113,6 +8120,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;
@@ -11090,6 +11104,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();
+                    yield this.eval_op_controlItemRefresh(val1, val2, resVal);
+                    break;
                 case ExpressionInterface.EXP_OP_VARCONTROLID:
                     val1 = valStack.pop();
                     this.eval_op_VarControlID(resVal, val1);
@@ -13234,6 +13253,28 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 resVal.StrVal = fld.VarDisplayName;
         }
     }
+    eval_op_controlItemRefresh(val1, val2, resVal) {
+        const _super = Object.create(null, {
+            GetContextTask: { get: () => super.GetContextTask }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            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.call(this, 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);
+                        yield tsk.DataviewManager.CurrentDataviewManager.Execute(command);
+                        success = true;
+                    }
+                }
+            }
+            resVal.BoolVal = success;
+        });
+    }
     eval_op_VarControlID(resVal, val1) {
         let ret = 0;
         if (val1.MgNumVal !== null) {
@@ -19830,7 +19871,11 @@ class MgForm extends MgFormBase {
                             this.GetDataview().setTopRecIdxModified(true);
                             try {
                                 this._suffixDone = false;
-                                yield 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);
+                                yield this.setCurrRowByDisplayLine(newDisplayLine, true, false);
                                 this.GetDataview().setTopRecIdxModified(false);
                                 yield this.RefreshDisplay(Constants.TASK_REFRESH_FORM);
                             }
@@ -30387,7 +30432,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1000.0-dev4100.6';
+let CurrentClientVersion = '4.1000.0-dev4100.64';
 
 class ClientManager {
     constructor() {
@@ -30828,13 +30873,6 @@ class MagicBridge {
     }
 }
 
-class ControlItemsRefreshCommand extends DataviewCommand {
-    constructor() {
-        super();
-        this.Control = null;
-    }
-}
-
 class DataViewOutputCommand extends DataviewCommand {
     constructor(OutputCommandType) {
         super();