@magic-xpa/engine 4.900.0-dev491.6 → 4.900.0

package/fesm2020/magic-xpa-engine.mjs

@@ -1205,7 +1205,8 @@ class MgControl extends MgControlBase {
         if (!isTagProcessed) {
             switch (attribute) {
                 case ConstInterface.MG_ATTR_SUBFORM_TASK:
-                    this._subformTaskId = valueStr;
+                    if (valueStr.trim() != "")
+                        this._subformTaskId = valueStr;
                     break;
                 case ConstInterface.MG_ATTR_REFRESHON:
                     this.refreshOnString = valueStr.trim();
@@ -4132,9 +4133,10 @@ class Scrambler {
         if (high > (sqrt / 2))
             high = Math.floor(sqrt / 2);
         delta = (Math.random() * (high - low)) + low;
+        delta = Math.floor(delta);
         if (delta === Scrambler.XML_ILLEGAL_RANDOM)
             delta++;
-        return Math.floor(delta);
+        return delta;
     }
     static UnScramble(inVal, beginOffSet, endOffSet) {
         if (!Scrambler.ScramblingEnabled) {
@@ -6124,17 +6126,22 @@ class LanguageData {
                 if (this._mlsContent.length > 0) {
                     let linePairs = 0;
                     let srcLine = this._mlsContent + 3;
+                    let transLine;
                     this._mlsStrings = new Hashtable();
-                    let linesStr = this._mlsContent.substring(this._mlsContent.length - MLS_EOF_CHARS_TO_READ, 8);
+                    let linesStr = this._mlsContent.substr(this._mlsContent.length - MLS_EOF_CHARS_TO_READ, 8);
                     linePairs = parseInt(linesStr.toString(), 16);
                     let tokens = StrUtil.tokenize(srcLine.toString(), "\n");
-                    for (let line = 0; line < linePairs * 2; line += 2) {
-                        if (this._mlsStrings.get_Item(tokens[line].toString()) == null)
-                            this._mlsStrings.set_Item(tokens[line].toString(), tokens[line + 1].toString());
+                    for (let pairNum = 0; pairNum < linePairs * 2; pairNum += 2) {
+                        srcLine = tokens[pairNum].substr(0, tokens[pairNum].length - 1);
+                        transLine = tokens[pairNum + 1].substr(0, tokens[pairNum + 1].length - 1);
+                        if (this._mlsStrings.get_Item(srcLine.toString()) == null)
+                            this._mlsStrings.set_Item(srcLine.toString(), transLine);
                     }
                 }
             }
             else if (this._mlsFileUrl != null) {
+                if (this._mlsFileUrl.startsWith("./"))
+                    this._mlsFileUrl = NString.Replace(this._mlsFileUrl, './', './assets/cache/');
                 let contentStr = await CommandsProcessorManager.GetContent(this._mlsFileUrl, true);
                 let buffer = contentStr;
                 if (buffer != null && buffer.length > 0) {
@@ -9261,8 +9268,8 @@ class Operation {
                                     if (rtEvnt !== null) {
                                         this._routeParams = rtEvnt.getRouteParamList();
                                         if ((await rtEvnt.getArgList().getArg(0).getValue(StorageAttribute.ALPHA, 0)).trim() === this._routerPath &&
-                                            ((rtEvnt.getArgList().getArg(1).skipArg()) ||
-                                                (await rtEvnt.getArgList().getArg(1).getValue(StorageAttribute.ALPHA, 0)).trim() === this._originalRouterOutletName))
+                                            ((rtEvnt.getArgList().getArg(1).skipArg() && destSubForm === this._task.getForm().DefaultRouterOutlet) ||
+                                                (!rtEvnt.getArgList().getArg(1).skipArg() && (await rtEvnt.getArgList().getArg(1).getValue(StorageAttribute.ALPHA, 0)).trim() === this._originalRouterOutletName)))
                                             canRoute = true;
                                         if (!canRoute)
                                             return false;
@@ -10125,7 +10132,7 @@ class CookieService {
             var cookie = cookies[i];
             var eqPos = cookie.indexOf('=');
             var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
-            if (cookieName === decodeURI(name)) {
+            if (cookieName === NString.TrimStart(decodeURI(name))) {
                 document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
                 return true;
             }
@@ -14195,7 +14202,7 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         }
         path = args[3];
         domain = args[4];
-        resVal.BoolVal = CookieService.setCookie(cookieName, args[0], nativeDt, path, domain, secure, sameSite);
+        resVal.BoolVal = CookieService.setCookie(cookieName, (args[0] != null ? args[0].toString() : ""), nativeDt, path, domain, secure, sameSite);
     }
     eval_op_get_cookie(cookieName, resVal) {
         resVal.StrVal = CookieService.getCookie(cookieName);
@@ -16261,7 +16268,8 @@ class Field extends FieldBase {
                     }
                     break;
                 case ConstInterface.MG_ATTR_CHACHED_FLD_ID:
-                    this.CacheTableFldIdx = NNumber.Parse(data[1]);
+                    if (data[0] != "")
+                        this.CacheTableFldIdx = NNumber.Parse(data[1]);
                     break;
                 case ConstInterface.MG_ATTR_LOCATE:
                     this.Locate = new Boundary(this.getTask(), NNumber.Parse(data[1]), NNumber.Parse(data[0]), this.getType(), this.getSize(), this.CacheTableFldIdx);
@@ -20442,8 +20450,8 @@ class RemoteTaskService extends TaskServiceBase {
             OwnerTransactionTask = task.DataviewManager.RemoteDataviewManager.Transaction.OwnerTask;
         return OwnerTransactionTask;
     }
-    static PreparePropMainDisplay(task) {
-        task.ComputeMainDisplay();
+    static async PreparePropMainDisplay(task) {
+        await task.ComputeMainDisplay();
         return task.FormIsLegal() ? ReturnResult.SuccessfulResult : new ReturnResult(MsgInterface.BRKTAB_STR_ERR_FORM);
     }
 }
@@ -20843,15 +20851,18 @@ class RemoteDataviewHeader extends DataviewHeaderBase {
     setAttribute(attribute, valueStr) {
         switch (attribute) {
             case ConstInterface.MG_ATTR_CACHED_TABLE:
-                if (TableCacheManager.Instance.TableExists(valueStr))
-                    this._table = TableCacheManager.Instance.GetTableById(valueStr);
-                else {
-                    this._table = new TableCache(valueStr);
-                    TableCacheManager.Instance.InsertTable(this._table);
+                if (valueStr != "") {
+                    if (TableCacheManager.Instance.TableExists(valueStr))
+                        this._table = TableCacheManager.Instance.GetTableById(valueStr);
+                    else {
+                        this._table = new TableCache(valueStr);
+                        TableCacheManager.Instance.InsertTable(this._table);
+                    }
                 }
                 break;
             case ConstInterface.MG_ATTR_IDENT:
-                this._table.SetTableIdent(valueStr);
+                if (valueStr != "")
+                    this._table.SetTableIdent(valueStr);
                 break;
             default:
                 super.setAttribute(attribute, valueStr);
@@ -21945,9 +21956,17 @@ class RecomputeTable {
             this.fillData_1(task.DataView, task, parser);
         }
         else
-            throw new ApplicationException("in RecomputeTable.fillData() invalid task id: ");
+            parser.setCurrIndex(parser.getXMLdata().indexOf(XMLConstants.TAG_CLOSE, parser.getCurrIndex()) + 1);
     }
     fillData_1(dataView, task, parser) {
+        if (parser.getNextTag() == XMLConstants.MG_TAG_RECOMPUTE) {
+            let currrentIndex = parser.getCurrIndex();
+            let encoded = parser.ReadContentOfCurrentElement().trim();
+            let decoded = Base64.decode(encoded.substr(0, encoded.length).trim());
+            let newXmlData = parser.getXMLdata().replace(encoded.trim(), decoded);
+            parser.setXMLdata(newXmlData);
+            parser.setCurrIndex(currrentIndex);
+        }
         while (this.initInnerObjects(parser, parser.getNextTag(), dataView, task)) {
         }
     }
@@ -22693,10 +22712,12 @@ class Task extends TaskBase {
                         this.setDescriptor(valueStr);
                     break;
                 case ConstInterface.MG_ATTR_HAS_LOCATE:
-                    this.hasLocate = true;
+                    if (+valueStr == 1)
+                        this.hasLocate = true;
                     break;
                 case ConstInterface.MG_ATTR_AS_PARENT:
-                    this.ModeAsParent = true;
+                    if (+valueStr == 1)
+                        this.ModeAsParent = true;
                     break;
                 case ConstInterface.MG_ATTR_TASK_UNIQUE_SORT:
                     this.UniqueSort = valueStr[0];
@@ -23023,6 +23044,7 @@ class Task extends TaskBase {
             result = await this.DataviewManager.Execute(dataViewCommand);
             if (!result.Success)
                 return null;
+            this.ResumeSubformLayout();
         }
         nonInteractiveTask = await this.StartSubTasks(moveToFirstControl, nonInteractiveTask, callByDestSubForm);
         this.InStartProcess = false;
@@ -24646,16 +24668,16 @@ class Task extends TaskBase {
             }
         }
     }
-    ComputeMainDisplay() {
+    async ComputeMainDisplay() {
         let propMainDisplay = this.getProp(PropInterface.PROP_TYPE_MAIN_DISPLAY);
-        let mainDisplayIndex = propMainDisplay.GetComputedValueInteger();
+        let mainDisplayIndex = await propMainDisplay.getValueInt();
         mainDisplayIndex = this.GetRealMainDisplayIndexOnCurrentTask(mainDisplayIndex);
         this._forms.InitFormFromXmlString(mainDisplayIndex);
         this.EnsureValidForm();
     }
     async PrepareTaskForm() {
         await TaskServiceBase.PreparePropOpenTaskWindow(this);
-        return RemoteTaskService.PreparePropMainDisplay(this);
+        return await RemoteTaskService.PreparePropMainDisplay(this);
     }
     FormIsLegal() {
         let isFormIsLegal = super.isMainProg();
@@ -24724,7 +24746,12 @@ class Task extends TaskBase {
         let tokensVector = XmlParser.getTokens(RuntimeContextBase.Instance.Parser.getXMLsubstring(endTaskUrlIdx), XMLConstants.XML_ATTR_DELIM);
         let taskCacheURL = tokensVector.get_Item(1);
         let refListStr = tokensVector.get_Item(3);
-        let taskContentOriginal = await Task.CommandsProcessor.GetContent(taskCacheURL, true);
+        let taskContentOriginal = "";
+        if (taskCacheURL.trim() != "") {
+            if (taskCacheURL.startsWith("./"))
+                taskCacheURL = NString.Replace(taskCacheURL, './', './assets/cache/');
+            taskContentOriginal = await Task.CommandsProcessor.GetContent(taskCacheURL, true);
+        }
         let taskContentFinal = new StringBuilder(xmlData.substr(0, RuntimeContextBase.Instance.Parser.getCurrIndex() - (ConstInterface.MG_TAG_TASKURL.length + 1)), taskContentOriginal.length);
         let reflist = this.getReflist(refListStr, ';', true, -1);
         let refListIdx = 0;
@@ -26924,7 +26951,7 @@ class EventsManager {
                         val = Manager.GetCtrlVal(ctrl);
                         task.CurrentEditingControl = null;
                         if (!task.cancelWasRaised() &&
-                            (ctrl.Type !== MgControlType.CTRL_TYPE_BROWSER && (!isNullOrUndefined(ctrl._field) && ctrl._field.getType() === StorageAttribute.DATE || val !== null) && typeof val != 'undefined' &&
+                            (ctrl.Type !== MgControlType.CTRL_TYPE_BROWSER && (!isNullOrUndefined(ctrl._field) && (ctrl._field.getType() === StorageAttribute.DATE || ctrl._field.getType() == StorageAttribute.NUMERIC) || val !== null) && typeof val != 'undefined' &&
                                 !await ctrl.validateAndSetValue(val, true))) {
                             this.setStopExecution(true);
                             return false;
@@ -29516,7 +29543,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.900.0-dev491.6';
+let CurrentClientVersion = '4.900.0';
 
 class ClientManager {
     constructor() {
@@ -29777,15 +29804,20 @@ class ClientManager {
         }
         return pic;
     }
-    static GetFormattedValue(taskId, controlName, value) {
+    static GetFormattedValue(taskId, controlName, value, rowId) {
         let pic = null;
         let task = MGDataCollection.Instance.GetTaskByID(taskId);
         let control = null;
         let newValue = value;
-        if (controlName !== null)
+        if (controlName !== null && task !== null)
             control = task.getForm().GetCtrl(controlName);
         if (control != null && control.DataType == StorageAttribute.NUMERIC) {
-            pic = control.getPIC();
+            if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
+                let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
+                pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
+            }
+            else
+                pic = control.getPIC();
             let dispValue = String(value);
             let newPic = pic.getUnformattedNumericPic();
             let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
@@ -29886,8 +29918,8 @@ class MagicBridge {
     static GetControlPictureMask(taskId, controlName) {
         return ClientManager.GetControlPictureMask(taskId, controlName);
     }
-    static GetFormattedValue(taskId, controlName, value) {
-        return ClientManager.GetFormattedValue(taskId, controlName, value);
+    static GetFormattedValue(taskId, controlName, value, rowId) {
+        return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
     }
     static GetRangedValue(taskId, controlName, value) {
         return ClientManager.GetRangedValue(taskId, controlName, value);