@magic-xpa/engine 4.1000.0-dev4100.107 → 4.1000.0-dev4100.109

package/fesm2020/magic-xpa-engine.mjs

@@ -1,6 +1,6 @@
 import { StringBuilder, Int32, NString, ApplicationException, NNumber, List, Debug, Char, RefParam, NumberStyles, HashUtils, DateTime, Dictionary, Stack, NChar, isNullOrUndefined, WebException, Thread, Encoding, Exception, isUndefined, Hashtable, NotImplementedException, Array_Enumerator, ISO_8859_1_Encoding, Int64 } from '@magic-xpa/mscorelib';
 import { XMLConstants, StorageAttribute, ViewRefreshMode, InternalInterface, Logger, StorageAttributeCheck, StrUtil, SubformType, TableBehaviour, MgControlType, ScrollBarThumbType, ForceExit, XmlParser, Misc, Base64, Priority, SyncExecutionHelper, Queue, Constants, DateTimeUtils, Logger_LogLevels, Logger_MessageDirection, MsgInterface, RequestInfo, OSEnvironment, JSON_Utils, UtilDateJpn, UtilStrByteMode, PICInterface, WindowType, BrkScope, RaiseAt, CtrlButtonTypeGui } from '@magic-xpa/utils';
-import { RecordUtils, GuiFieldBase, ExpVal, BlobType, FieldDef, GuiTaskBase, MgControlBase, PropInterface, GuiDataCollection, CommandType, Commands, HtmlProperties, ControlTable, Modifiers, KeyboardItem, TaskDefinitionIdTableSaxHandler, DisplayConvertor, VectorType, PIC, MgTimer, GuiConstants, RuntimeContextBase, UsernamePasswordCredentials, Styles, Manager, NUM_TYPE, GuiExpressionEvaluator, ExpressionInterface, DataModificationTypes, GuiDataViewBase, ObjectReferencesCollection, EMPTY_DCREF, ObjectReferenceBase, PropTable, FieldsTable as FieldsTable$1, DcValuesBuilderBase, MgFormBase, GuiEnvironment, TaskDefinitionId, Events, Helps, FocusManager, EventsProcessor, UIBridge } from '@magic-xpa/gui';
+import { RecordUtils, GuiFieldBase, ExpVal, BlobType, FieldDef, GuiTaskBase, MgControlBase, PropInterface, GuiDataCollection, CommandType, Commands, HtmlProperties, ControlTable, Modifiers, KeyboardItem, TaskDefinitionIdTableSaxHandler, DisplayConvertor, MgTimer, GuiConstants, RuntimeContextBase, UsernamePasswordCredentials, Styles, Manager, NUM_TYPE, VectorType, GuiExpressionEvaluator, ExpressionInterface, PIC, DataModificationTypes, GuiDataViewBase, ObjectReferencesCollection, EMPTY_DCREF, ObjectReferenceBase, PropTable, FieldsTable as FieldsTable$1, DcValuesBuilderBase, MgFormBase, GuiEnvironment, TaskDefinitionId, Events, Helps, FocusManager, EventsProcessor, UIBridge } from '@magic-xpa/gui';
 import { HttpHeaders, HttpErrorResponse } from '@angular/common/http';
 import { timer, Subject } from 'rxjs';
 
@@ -271,7 +271,6 @@ ConstInterface.MG_ATTR_LOCAL_AS400SET = "local_as400set";
 ConstInterface.MG_ATTR_LOCAL_EXTRA_GENGO = "local_extraGengo";
 ConstInterface.MG_ATTR_LOCAL_FLAGS = "local_flags";
 ConstInterface.MG_ATTR_SPEACIAL_ANSI_EXP = "SpecialAnsiExpression";
-ConstInterface.MG_ATTR_SPECIAL_IMMEDIATE_HANDLER_END = "SpecialImmediateHandlerEnd";
 ConstInterface.MG_ATTR_SPECIAL_SHOW_STATUSBAR_PANES = "SpecialShowStatusBarPanes";
 ConstInterface.MG_ATTR_SPECIAL_ROUTE_TO_ROOT_PROG_ON_CONTEXT_RECREATION = "SpecialRouteToRootProgramOnContextRecreation";
 ConstInterface.MG_ATTR_SPECIAL_SPECIAL_EDIT_LEFT_ALIGN = "SpecialEditLeftAlign";
@@ -476,7 +475,6 @@ ConstInterface.RC_TOKEN_DATA = "DATA=";
 ConstInterface.WEBCLIENT_REINITIALIZE_REQUEST = "WCREINITIALIZEREQUEST=Y";
 ConstInterface.MAIN_PROG_VIEW = "MainProgramsDataView";
 ConstInterface.GLOBAL_PARAM_LIST = "GlobalParamList";
-ConstInterface.ENV_VAR_LIST = "EnvVarList";
 ConstInterface.LAST_EXCEPTION = "LastException";
 ConstInterface.CTX_REMOVED_FROM_SRVR = "CtxRemovedFromSrvr";
 ConstInterface.LAST_ROUTE_EVENT = "LastRouteEvent";
@@ -3531,17 +3529,7 @@ class FlowMonitorQueue {
         this._isRecompute = false;
         this._isTask = false;
         this._isTaskFlow = false;
-        this._isDataView = false;
         this.ShouldSerialize = false;
-        this.padRight = (string, length, character = ' ') => {
-            let result = "";
-            let totalLength = length - string.length;
-            for (let i = 0; i < totalLength; i++) {
-                result = character + result;
-            }
-            result = result + string;
-            return result;
-        };
     }
     static get Instance() {
         if (FlowMonitorQueue._instance === null)
@@ -3599,9 +3587,6 @@ class FlowMonitorQueue {
                 case ConstInterface.MG_ATTR_TASKFLW:
                     this._isTaskFlow = XmlParser.getBoolean(valueStr);
                     break;
-                case ConstInterface.MG_TAG_DATAVIEW:
-                    this._isDataView = XmlParser.getBoolean(valueStr);
-                    break;
                 case ConstInterface.MG_ATTR_RECOMP:
                     this._isRecompute = XmlParser.getBoolean(valueStr);
                     break;
@@ -3659,92 +3644,6 @@ class FlowMonitorQueue {
             Logger.Instance.WriteSupportToLog(taskInfo + ": " + info, true);
         }
     }
-    appendVirtualsAndParameters(currentValues) {
-        let act = new ActivityItem(this, FlowMonitorQueue.ACT_TASK_FLW, InternalInterface.MG_ACT_REC_PREFIX);
-        act.setInfo(currentValues);
-        this._queue.put(act);
-    }
-    addDataViewFlow(task) {
-        if (this._isDataView) {
-            let fldTab = task.DataView.GetFieldsTab();
-            let preparedDisplayString = "";
-            let finaldisplayData = "\n";
-            let fldValue;
-            let data = "";
-            for (let i = 0; i < fldTab.getSize(); i++) {
-                let fldDef = fldTab.getField(i);
-                if (!fldDef.IsEventHandlerField && (fldDef.IsVirtual && !fldDef.VirAsReal) || fldDef.isParam()) {
-                    fldValue = fldDef.isNull() ? fldDef.getNullValue() : fldDef.getValue(true);
-                    data = this.getFieldData(fldDef.getType(), fldValue, fldDef.getPicture(), fldDef.getCellsType(), task);
-                    preparedDisplayString = this.PrepareDisplayString(fldDef.isParam(), fldDef.getVarName(), data, true);
-                    finaldisplayData = finaldisplayData + preparedDisplayString + "\n";
-                }
-            }
-            this.appendVirtualsAndParameters(finaldisplayData);
-        }
-    }
-    getFieldData(Storagetype, data, picture, vecCellType, task) {
-        switch (Storagetype) {
-            case StorageAttribute.DOTNET:
-                data = FlowMonitorQueue.UNPRINTABLE_STR_LOG;
-                break;
-            case StorageAttribute.BLOB:
-                {
-                    let contentType = BlobType.getContentType(data);
-                    if (contentType == BlobType.CONTENT_TYPE_ANSI || contentType == BlobType.CONTENT_TYPE_UNICODE)
-                        data = data != null ? BlobType.getString(data) : "";
-                    else
-                        data = FlowMonitorQueue.UNPRINTABLE_STR_LOG;
-                }
-                break;
-            case StorageAttribute.NUMERIC:
-            case StorageAttribute.DATE:
-            case StorageAttribute.TIME:
-                let conv = DisplayConvertor.Instance;
-                data = conv.mg2disp(data, " ", new PIC(picture, Storagetype, task.getCompIdx()), false, task.getCompIdx(), false);
-                break;
-            case StorageAttribute.BLOB_VECTOR:
-                let vecOutData;
-                if (data == null) {
-                    vecOutData = "[]";
-                }
-                else {
-                    let cellAtt = vecCellType;
-                    let vector = new VectorType(data);
-                    if (cellAtt == StorageAttribute.BLOB && !VectorType.validateBlobContents(data))
-                        vecOutData = "[]";
-                    else {
-                        let vecSize = VectorType.getVecSize(data);
-                        let cellPicture = (cellAtt == StorageAttribute.NUMERIC || cellAtt == StorageAttribute.DATE || cellAtt == StorageAttribute.TIME) ? PIC.buildPicture(cellAtt, vector.getVecCell(1), task.getCompIdx(), true).getFormat() : picture;
-                        vecOutData = "[";
-                        for (let i = 0; i < vecSize; i++) {
-                            vecOutData += this.getFieldData(cellAtt, vector.getVecCell(i + 1), cellPicture, vecCellType, task);
-                            vecOutData += i < vecSize - 1 ? "," : "]";
-                        }
-                    }
-                }
-                data = vecOutData;
-                break;
-            case StorageAttribute.BOOLEAN:
-                data = data == "1" ? "TRUE" : "FALSE";
-                break;
-        }
-        return data;
-    }
-    PrepareDisplayString(mode, name, valueContent, addDoubleQuotes) {
-        let str = "";
-        let finalStringToDisplay = "";
-        if (addDoubleQuotes)
-            finalStringToDisplay = finalStringToDisplay + "\"";
-        finalStringToDisplay = finalStringToDisplay + name;
-        if (addDoubleQuotes)
-            finalStringToDisplay = finalStringToDisplay + "\"";
-        let paddedName = this.padRight(name, 34);
-        let formatOfStringVirtual = `Virtual`;
-        let formatOfStringParameter = `Parameter`;
-        str = (mode ? formatOfStringParameter : formatOfStringVirtual) + " : " + `${paddedName}` + " : " + `${valueContent}`;
-        return str;
-    }
     addTaskFlowRec(id, state, taskInfo) {
         if (this._enabled && this._isTaskFlow) {
             let info;
@@ -3909,7 +3808,6 @@ class FlowMonitorQueue {
     }
 }
 FlowMonitorQueue._instance = null;
-FlowMonitorQueue.UNPRINTABLE_STR_LOG = "#UNPRINTABLE#";
 FlowMonitorQueue.S_EVENT_STR1 = ">>Starts ";
 FlowMonitorQueue.S_EVENT_STR2 = " Event";
 FlowMonitorQueue.S_EVENT_PROPAGATED = "Event was propagated";
@@ -5225,12 +5123,10 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
     async StoreSessionReInitializingDataOnLocalStorage() {
         let mainPrgViewStringForServer = await this.BuildXMLForMainProgramDataView();
         let globalParamsString = AccessHelper.globalParams.mirrorAllToXML();
-        let changedEnvVarList = AccessHelper.envParamsTable.mirrorAllToXML();
         let dataStorage = window.localStorage;
         dataStorage.setItem(ConstInterface.IS_SESSION_REINITIALIZING, "true");
         dataStorage.setItem(ConstInterface.MAIN_PROG_VIEW, mainPrgViewStringForServer.toString());
         dataStorage.setItem(ConstInterface.GLOBAL_PARAM_LIST, globalParamsString);
-        dataStorage.setItem(ConstInterface.ENV_VAR_LIST, changedEnvVarList);
         dataStorage.setItem(ConstInterface.LAST_EXCEPTION, RemoteCommandsProcessor.lastExceptionMessage);
         if (RuntimeContextBase.Instance.RemovedContextFromServer)
             dataStorage.setItem(ConstInterface.CTX_REMOVED_FROM_SRVR, "1");
@@ -5457,7 +5353,6 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
         let reqBuf;
         let isInitialCall = sessionStage === CommandsProcessorBase_SessionStage.INITIAL;
         let globalParamsString = null;
-        let envVarsString = null;
         if (this.DelayCommandExecution)
             return;
         if (Logger.Instance.LogLevel == Logger_LogLevels.RequestInfo && !isInitialCall)
@@ -5483,16 +5378,12 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
                 let buffer = new StringBuilder();
                 if (!RemoteCommandsProcessor.IsSessionReInitializing)
                     buffer.Append(reqBuf);
-                if (RemoteCommandsProcessor.IsSessionReInitializing) {
+                if (RemoteCommandsProcessor.IsSessionReInitializing)
                     globalParamsString = this.RestoreSessionReInitializingDataFromLocalStorage(ConstInterface.GLOBAL_PARAM_LIST);
-                    envVarsString = this.RestoreSessionReInitializingDataFromLocalStorage(ConstInterface.ENV_VAR_LIST);
-                }
-                else {
+                else
                     globalParamsString = AccessHelper.globalParams.mirrorToXML();
-                    envVarsString = AccessHelper.envParamsTable.mirrorToXML();
-                }
                 changes.Append(globalParamsString);
-                changes.Append(envVarsString);
+                changes.Append(AccessHelper.envParamsTable.mirrorToXML());
                 if (changes.Length > 0) {
                     changes.Insert(0, "<" + ConstInterface.MG_TAG_ENV_CHANGES + ">");
                     changes.Append("</" + ConstInterface.MG_TAG_ENV_CHANGES + ">");
@@ -5531,15 +5422,13 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
                 dataStorage.removeItem(ConstInterface.IS_SESSION_REINITIALIZING);
                 dataStorage.removeItem(ConstInterface.MAIN_PROG_VIEW);
                 dataStorage.removeItem(ConstInterface.GLOBAL_PARAM_LIST);
-                dataStorage.removeItem(ConstInterface.ENV_VAR_LIST);
                 dataStorage.removeItem(ConstInterface.LAST_EXCEPTION);
             }
         }
         FlowMonitorQueue.Instance.enable(false);
         await this.ProcessResponse(respBuf, AccessHelper.mgDataTable.currMgdID, null, res);
         if (RemoteCommandsProcessor.IsSessionReInitializing) {
-            AccessHelper.globalParams.RestoreParams(globalParamsString);
-            AccessHelper.envParamsTable.RestoreParams(envVarsString);
+            AccessHelper.globalParams.RestoreGlobalParams(globalParamsString);
             let dataStorage = window.localStorage;
             let ctxRemoved = dataStorage.getItem(ConstInterface.CTX_REMOVED_FROM_SRVR);
             if (ctxRemoved === "1") {
@@ -7430,9 +7319,6 @@ class EventHandlerPosition {
                 case InternalInterface.MG_ACT_REC_SUFFIX:
                 case InternalInterface.MG_ACT_CTRL_PREFIX:
                 case InternalInterface.MG_ACT_CTRL_SUFFIX: {
-                    if (this._rtEvt.getInternalCode() == InternalInterface.MG_ACT_REC_PREFIX) {
-                        FlowMonitorQueue.Instance.addDataViewFlow(this._task);
-                    }
                     if (this._handlerIdx === -1) {
                         for (this._handlerIdx = this._handlersTab.getSize() - 1; this._handlerIdx >= 0; this._handlerIdx--) {
                             let handler = this._handlersTab.getHandler(this._handlerIdx);
@@ -8355,7 +8241,7 @@ class MirrorPrmMap extends PrmMap {
         while (this.mirrorFromXML(parser.getNextTag(), parser)) {
         }
     }
-    RestoreParams(xml) {
+    RestoreGlobalParams(xml) {
         let parser = new XmlParser(xml);
         while (this.mirrorFromXML(parser.getNextTag(), parser)) {
         }
@@ -8430,7 +8316,6 @@ class Environment {
         this._debugMode = 0;
         this._significantNumSize = 0;
         this._specialAnsiExpression = false;
-        this._specialImmediatehandlerEnd = false;
         this._specialShowStatusBarPanes = false;
         this._specialRouteToRootProgOnContextRecreation = false;
         this._specialCancelOnCreate = false;
@@ -8584,9 +8469,6 @@ class Environment {
                 case ConstInterface.MG_ATTR_LOCAL_FLAGS:
                     this._localFlags = valueStr;
                     break;
-                case ConstInterface.MG_ATTR_SPECIAL_IMMEDIATE_HANDLER_END:
-                    this._specialImmediatehandlerEnd = XmlParser.getBoolean(valueStr);
-                    break;
                 case ConstInterface.MG_ATTR_SPEACIAL_ANSI_EXP:
                     this._specialAnsiExpression = XmlParser.getBoolean(valueStr);
                     break;
@@ -8791,9 +8673,6 @@ class Environment {
     GetLocalFlag(f) {
         return this._localFlags !== null && this._localFlags.indexOf(f) >= 0;
     }
-    getSpecialImmediateHandlerEnd() {
-        return this._specialImmediatehandlerEnd;
-    }
     getSpecialAnsiExpression() {
         return this._specialAnsiExpression;
     }
@@ -9804,7 +9683,8 @@ class MirrorString {
         this._reserved = false;
     }
     mirrorToXML() {
-        return ConstInterface.MG_ATTR_ENV_VALUE + "=\"" + XmlParser.escape(this._value) + "\"";
+        return ConstInterface.MG_ATTR_ENV_VALUE + "=\"" + XmlParser.escape(this._value) + "\" " +
+            ConstInterface.MG_ATTR_ENV_WRITEINI + "=F";
     }
     init(name, xmlParser) {
         let valueStart, valueEnd, reserveStart, paramEnd;
@@ -19358,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);
                         }
@@ -19398,7 +19282,6 @@ class MgForm extends MgFormBase {
                                         try {
                                             await this.RefreshDisplay(Constants.TASK_REFRESH_FORM);
                                             await this.setCurrRowByDisplayLine(this.GetDataview().getTopRecIdx() + this.getLastValidRow(), false, true);
-                                            visibleLine = this.getLastValidRow();
                                         }
                                         catch (Exception) {
                                         }
@@ -21471,10 +21354,8 @@ class EventHandler {
                     continue;
                 else if (this._operationTab.getOperation(oper.getBlockEnd()).getServerId() < nextOperIdx)
                     continue;
-            if (!taskEnd) {
-                if (await this._task.evalEndCond(ConstInterface.END_COND_EVAL_IMMIDIATE) && Environment.Instance.getSpecialImmediateHandlerEnd())
-                    break;
-            }
+            if (!taskEnd)
+                await this._task.evalEndCond(ConstInterface.END_COND_EVAL_IMMIDIATE);
             if (this._taskMgdID !== mgdID)
                 isChangedCurrWndRef.value = true;
             if (!this._task.isMainProg() && this._task.isOpenWin())
@@ -29529,7 +29410,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1000.0-dev4100.107';
+let CurrentClientVersion = '4.1000.0-dev4100.109';
 
 class ClientManager {
     constructor() {