@magic-xpa/engine 4.900.0-dev491.7 → 4.1000.0-dev000.0
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 +46 -5
- package/esm2020/src/ConstInterface.mjs +1 -2
- package/esm2020/src/CurrentClientVersion.mjs +2 -2
- package/esm2020/src/bridge/MagicBridge.mjs +3 -3
- package/esm2020/src/commands/ClientToServer/CommandFactory.mjs +10 -2
- package/esm2020/src/data/Field.mjs +3 -2
- package/esm2020/src/env/LanguageData.mjs +10 -5
- package/esm2020/src/event/EventsManager.mjs +2 -2
- package/esm2020/src/exp/ExpressionEvaluator.mjs +24 -2
- package/esm2020/src/gui/MgControl.mjs +3 -2
- package/esm2020/src/gui/MgForm.mjs +6 -2
- package/esm2020/src/rt/Operation.mjs +3 -3
- package/esm2020/src/rt/RecomputeTable.mjs +12 -4
- package/esm2020/src/rt/RemoteDataviewHeader.mjs +10 -7
- package/esm2020/src/tasks/RemoteTaskService.mjs +3 -3
- package/esm2020/src/tasks/Task.mjs +15 -7
- package/esm2020/src/util/Scrambler.mjs +3 -2
- package/esm2020/src/util/cookie.service.mjs +2 -2
- package/fesm2015/magic-xpa-engine.mjs +154 -45
- package/fesm2015/magic-xpa-engine.mjs.map +1 -1
- package/fesm2020/magic-xpa-engine.mjs +142 -42
- package/fesm2020/magic-xpa-engine.mjs.map +1 -1
- package/package.json +4 -4
- package/src/ClientManager.d.ts +2 -1
- package/src/ConstInterface.d.ts +0 -1
- package/src/bridge/MagicBridge.d.ts +1 -1
- package/src/commands/ClientToServer/CommandFactory.d.ts +3 -0
- package/src/exp/ExpressionEvaluator.d.ts +1 -0
- package/src/tasks/RemoteTaskService.d.ts +1 -1
- package/src/tasks/Task.d.ts +1 -1
|
@@ -38,9 +38,10 @@ export class Scrambler {
|
|
|
38
38
|
if (high > (sqrt / 2))
|
|
39
39
|
high = Math.floor(sqrt / 2);
|
|
40
40
|
delta = (Math.random() * (high - low)) + low;
|
|
41
|
+
delta = Math.floor(delta);
|
|
41
42
|
if (delta === Scrambler.XML_ILLEGAL_RANDOM)
|
|
42
43
|
delta++;
|
|
43
|
-
return
|
|
44
|
+
return delta;
|
|
44
45
|
}
|
|
45
46
|
static UnScramble(inVal, beginOffSet, endOffSet) {
|
|
46
47
|
if (!Scrambler.ScramblingEnabled) {
|
|
@@ -85,4 +86,4 @@ Scrambler.ScramblingEnabled = true;
|
|
|
85
86
|
Scrambler.XML_MIN_RANDOM = -48;
|
|
86
87
|
Scrambler.XML_MAX_RANDOM = 47;
|
|
87
88
|
Scrambler.XML_ILLEGAL_RANDOM = -21;
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scrambler.js","sourceRoot":"","sources":["../../../../../../projects/engine/src/util/Scrambler.ts"],"names":[],"mappings":"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","sourcesContent":["import {NChar, NString, StringBuilder} from \"@magic-xpa/mscorelib\";\r\n\r\nexport class Scrambler {\r\n  static ScramblingEnabled: boolean = true; // Disable scrambling\r\n  private static XML_MIN_RANDOM: number = -48;\r\n  private static XML_MAX_RANDOM: number = 47;\r\n  private static XML_ILLEGAL_RANDOM: number = -21;\r\n\r\n  /// <summary>scramble string</summary>\r\n  /// <param name=\"inVal\">string to scramble</param>\r\n  /// <returns> scrambled string</returns>\r\n  static Scramble(inVal: string): string {\r\n    if (!this.ScramblingEnabled)\r\n      return inVal;\r\n\r\n    let curr: number = 0;\r\n    let currChr: string;\r\n    let length: number = inVal.length;\r\n    let random: number = Scrambler.RandomScramble(length);\r\n    let key: number = Math.floor(Math.sqrt(length)) + random;\r\n    let outVal: StringBuilder = new StringBuilder(length + 1);\r\n\r\n    // The first char in the scrambled string is a random modifier to the default key\r\n    outVal.Append(String.fromCharCode(random + 81));\r\n\r\n    for (let i: number = 0; i < key; i++) {\r\n      curr = i;\r\n\r\n      while (curr < length) {\r\n        currChr = inVal[curr];\r\n        outVal.Append(currChr);\r\n        curr += key;\r\n      }\r\n    }\r\n\r\n    // The last char in the scrambled string is a padding readable char.\r\n    outVal.Append('_')/*'_'*/;\r\n    return outVal.ToString();\r\n  }\r\n\r\n  /// <summary>delete first character of scrambled text and makes left trim to the string</summary>\r\n  private static LocateScramble(inVal: string, from: number): number {\r\n    let i: number = from;\r\n    while (i < inVal.length && NChar.IsWhiteSpace(inVal.charAt(i))) {\r\n      i = i + 1;\r\n    }\r\n    return i + 1;\r\n  }\r\n\r\n  /// <summary> Choose a random modifier to the key on which we base the scrambling process.\r\n  /// The random factor cannot be just any number we choose. Since the scramble key\r\n  /// determines the amount of 'jumps' we perform on the text to be scrambled, then\r\n  /// the random number we add to it must not be too big, nor too small. As a rule,\r\n  /// the random modifier can range from SQRT(len)/2' to '-SQRT(len)/2', and since we\r\n  /// pass the selected number as a character within the XML, the whole range cannot\r\n  /// exceed the number of the printable characters (95), thus the range is limited\r\n  /// between (-48) to (47), so we cap the allowed range according to these limits.\r\n  /// Last, the value XML_ILLEGAL_RANDOM, since it will result in adding the char '<'\r\n  /// to the beginning of the XML. This will make the client confused, since it will\r\n  /// think the XML is not scrambled.\r\n  /// </summary>\r\n  /// <param name=\"len\">of outgoing String</param>\r\n  /// <returns> random modifier</returns>\r\n  private static RandomScramble(len: number): number {\r\n    let delta: number;\r\n    let sqrt: number = Math.sqrt(len);\r\n    let low: number = Scrambler.XML_MIN_RANDOM;\r\n    let high: number = Scrambler.XML_MAX_RANDOM;\r\n\r\n    if (low < (((-1) * sqrt) / 2))\r\n      low = Math.floor(((-1) * sqrt) / 2);\r\n\r\n    if (high > (sqrt / 2))\r\n      high = Math.floor(sqrt / 2);\r\n\r\n    delta = (Math.random() * (high - low)) + low;\r\n    if (delta === Scrambler.XML_ILLEGAL_RANDOM)\r\n      delta++;\r\n\r\n    return Math.floor(delta);\r\n  }\r\n\r\n  /// <summary>make unscrambling to string inside upper and down border</summary>\r\n  /// <param name=\"inVal\">scrambled string to build unscrambled string from it</param>\r\n  /// <param name=\"beginOffSet\">offset where the scrambled string begins</param>\r\n  /// <param name=\"endOffSet\">offset of the last char in the scrambled string.</param>\r\n  /// <returns> unscrambled string</returns>\r\n  static UnScramble(inVal: string, beginOffSet: number, endOffSet: number): string {\r\n    if (!Scrambler.ScramblingEnabled) {\r\n      let outVal: string = inVal.substr(beginOffSet, endOffSet - beginOffSet + 1);\r\n      return outVal;\r\n    }\r\n    else {\r\n      let currOut: number, currIn: number, i: number;\r\n      let length: number;\r\n      let key: number;\r\n      let outVal: string[];\r\n      let currBlk: number;\r\n      let blockSize: number;\r\n      let reminder: number;\r\n      let start: number;\r\n      let randomChr: string;\r\n\r\n      // ignore the last char in the input, it's just a padding character.\r\n      endOffSet = endOffSet - 1;\r\n\r\n      // skip over the first char in the input, it only contains a random modifier to the key.\r\n      // it is not part of the data.\r\n      start = this.LocateScramble(inVal, beginOffSet);\r\n      randomChr = inVal[start - 1];\r\n\r\n      length = endOffSet - start + 1;\r\n      key = (randomChr.charCodeAt(0) - 81) + Math.floor(Math.sqrt(length));\r\n      outVal = new Array(length);\r\n      blockSize = Math.floor(length / key);\r\n      reminder = length % key;\r\n\r\n      for (i = currOut = 0; currOut < length; i++) {\r\n        currIn = i;\r\n        currBlk = 1;\r\n\r\n        while (currIn < length && currOut < length) {\r\n          outVal[currOut] = inVal[currIn + start];\r\n          currIn += blockSize;\r\n          if (currBlk <= reminder)\r\n            currIn++;\r\n          currOut++;\r\n          currBlk++;\r\n        }\r\n      }\r\n\r\n      return NString.FromChars(outVal);\r\n    }\r\n  }\r\n}\r\n"]}
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Scrambler.js","sourceRoot":"","sources":["../../../../../../projects/engine/src/util/Scrambler.ts"],"names":[],"mappings":"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","sourcesContent":["import {NChar, NString, StringBuilder} from \"@magic-xpa/mscorelib\";\r\n\r\nexport class Scrambler {\r\n  static ScramblingEnabled: boolean = true; // Disable scrambling\r\n  private static XML_MIN_RANDOM: number = -48;\r\n  private static XML_MAX_RANDOM: number = 47;\r\n  private static XML_ILLEGAL_RANDOM: number = -21;\r\n\r\n  /// <summary>scramble string</summary>\r\n  /// <param name=\"inVal\">string to scramble</param>\r\n  /// <returns> scrambled string</returns>\r\n  static Scramble(inVal: string): string {\r\n    if (!this.ScramblingEnabled)\r\n      return inVal;\r\n\r\n    let curr: number = 0;\r\n    let currChr: string;\r\n    let length: number = inVal.length;\r\n    let random: number = Scrambler.RandomScramble(length);\r\n    let key: number = Math.floor(Math.sqrt(length)) + random;\r\n    let outVal: StringBuilder = new StringBuilder(length + 1);\r\n\r\n    // The first char in the scrambled string is a random modifier to the default key\r\n    outVal.Append(String.fromCharCode(random + 81));\r\n\r\n    for (let i: number = 0; i < key; i++) {\r\n      curr = i;\r\n\r\n      while (curr < length) {\r\n        currChr = inVal[curr];\r\n        outVal.Append(currChr);\r\n        curr += key;\r\n      }\r\n    }\r\n\r\n    // The last char in the scrambled string is a padding readable char.\r\n    outVal.Append('_')/*'_'*/;\r\n    return outVal.ToString();\r\n  }\r\n\r\n  /// <summary>delete first character of scrambled text and makes left trim to the string</summary>\r\n  private static LocateScramble(inVal: string, from: number): number {\r\n    let i: number = from;\r\n    while (i < inVal.length && NChar.IsWhiteSpace(inVal.charAt(i))) {\r\n      i = i + 1;\r\n    }\r\n    return i + 1;\r\n  }\r\n\r\n  /// <summary> Choose a random modifier to the key on which we base the scrambling process.\r\n  /// The random factor cannot be just any number we choose. Since the scramble key\r\n  /// determines the amount of 'jumps' we perform on the text to be scrambled, then\r\n  /// the random number we add to it must not be too big, nor too small. As a rule,\r\n  /// the random modifier can range from SQRT(len)/2' to '-SQRT(len)/2', and since we\r\n  /// pass the selected number as a character within the XML, the whole range cannot\r\n  /// exceed the number of the printable characters (95), thus the range is limited\r\n  /// between (-48) to (47), so we cap the allowed range according to these limits.\r\n  /// Last, the value XML_ILLEGAL_RANDOM, since it will result in adding the char '<'\r\n  /// to the beginning of the XML. This will make the client confused, since it will\r\n  /// think the XML is not scrambled.\r\n  /// </summary>\r\n  /// <param name=\"len\">of outgoing String</param>\r\n  /// <returns> random modifier</returns>\r\n  private static RandomScramble(len: number): number {\r\n    let delta: number;\r\n    let sqrt: number = Math.sqrt(len);\r\n    let low: number = Scrambler.XML_MIN_RANDOM;\r\n    let high: number = Scrambler.XML_MAX_RANDOM;\r\n\r\n    if (low < (((-1) * sqrt) / 2))\r\n      low = Math.floor(((-1) * sqrt) / 2);\r\n\r\n    if (high > (sqrt / 2))\r\n      high = Math.floor(sqrt / 2);\r\n\r\n    delta = (Math.random() * (high - low)) + low;\r\n    delta = Math.floor(delta);\r\n    if (delta === Scrambler.XML_ILLEGAL_RANDOM)\r\n      delta++;\r\n\r\n    return delta;\r\n  }\r\n\r\n  /// <summary>make unscrambling to string inside upper and down border</summary>\r\n  /// <param name=\"inVal\">scrambled string to build unscrambled string from it</param>\r\n  /// <param name=\"beginOffSet\">offset where the scrambled string begins</param>\r\n  /// <param name=\"endOffSet\">offset of the last char in the scrambled string.</param>\r\n  /// <returns> unscrambled string</returns>\r\n  static UnScramble(inVal: string, beginOffSet: number, endOffSet: number): string {\r\n    if (!Scrambler.ScramblingEnabled) {\r\n      let outVal: string = inVal.substr(beginOffSet, endOffSet - beginOffSet + 1);\r\n      return outVal;\r\n    }\r\n    else {\r\n      let currOut: number, currIn: number, i: number;\r\n      let length: number;\r\n      let key: number;\r\n      let outVal: string[];\r\n      let currBlk: number;\r\n      let blockSize: number;\r\n      let reminder: number;\r\n      let start: number;\r\n      let randomChr: string;\r\n\r\n      // ignore the last char in the input, it's just a padding character.\r\n      endOffSet = endOffSet - 1;\r\n\r\n      // skip over the first char in the input, it only contains a random modifier to the key.\r\n      // it is not part of the data.\r\n      start = this.LocateScramble(inVal, beginOffSet);\r\n      randomChr = inVal[start - 1];\r\n\r\n      length = endOffSet - start + 1;\r\n      key = (randomChr.charCodeAt(0) - 81) + Math.floor(Math.sqrt(length));\r\n      outVal = new Array(length);\r\n      blockSize = Math.floor(length / key);\r\n      reminder = length % key;\r\n\r\n      for (i = currOut = 0; currOut < length; i++) {\r\n        currIn = i;\r\n        currBlk = 1;\r\n\r\n        while (currIn < length && currOut < length) {\r\n          outVal[currOut] = inVal[currIn + start];\r\n          currIn += blockSize;\r\n          if (currBlk <= reminder)\r\n            currIn++;\r\n          currOut++;\r\n          currBlk++;\r\n        }\r\n      }\r\n\r\n      return NString.FromChars(outVal);\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -81,7 +81,7 @@ export class CookieService {
|
|
|
81
81
|
var cookie = cookies[i];
|
|
82
82
|
var eqPos = cookie.indexOf('=');
|
|
83
83
|
var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
|
|
84
|
-
if (cookieName === decodeURI(name)) {
|
|
84
|
+
if (cookieName === NString.TrimStart(decodeURI(name))) {
|
|
85
85
|
document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
|
|
86
86
|
return true;
|
|
87
87
|
}
|
|
@@ -89,4 +89,4 @@ export class CookieService {
|
|
|
89
89
|
return false;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cookie.service.js","sourceRoot":"","sources":["../../../../../../projects/engine/src/util/cookie.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { NString } from '@magic-xpa/mscorelib';\n\nexport class CookieService {\n\n  public static getCookies(cookieName: string) {\n\n    if (cookieName == '*')\n      return document.cookie;\n\n    return this.getCookie(cookieName);\n  }\n\n  public static setCookie(name: string, value: string, expires?: number | Date, path?, domain ?, secure?, sameSite?): boolean {\n    let cookieString: string = encodeURIComponent(name) + '=' + encodeURIComponent(CookieService.encode_cookie(value)) + ';';\n    if (expires) {\n      if (typeof expires === 'number') {\n        const dateExpires: Date = new Date(expires);\n\n        cookieString += 'expires=' + dateExpires.toUTCString() + ';';\n      }\n      else if((typeof expires === 'string'))\n      {\n        const dateExpires: Date = new Date(expires);\n\n        cookieString += 'expires=' + dateExpires.toUTCString() + ';';\n      }\n      else {\n        cookieString += 'expires=' + expires.toUTCString() + ';';\n      }\n    }\n\n    if (path) {\n      cookieString += 'path=' + path + ';';\n    }\n\n    if (domain) {\n      cookieString += 'domain=' + domain + ';';\n    }\n\n    if (secure === false && sameSite === 'None') {\n      secure = true;\n      console.warn(\n        `cookie ${name} was forced with secure flag because sameSite=None.`\n      );\n    }\n    if (secure) {\n      cookieString += 'secure;';\n    }\n\n    if (!sameSite) {\n      sameSite = 'Lax';\n    }\n\n    cookieString += 'sameSite=' + sameSite + ';';\n\n    document.cookie = cookieString;\n\n    return this.getCookie(name);\n  }\n\n  static encode_cookie(cookie_value) {\n\n    cookie_value = cookie_value.trim();\n    //This variable holds the encoded cookie characters\n    var coded_string = '';\n\n    // Run through each character in the cookie value\n    for (var counter = 0; counter < cookie_value.length; counter++) {\n\n      // Add the character's numeric code to the string\n      coded_string += cookie_value.charCodeAt(counter);\n\n      // Separate each code with a plus sign (+)\n      if (counter < cookie_value.length - 1) {\n        coded_string += '+';\n      }\n    }\n    return coded_string;\n  }\n\n  static decode_cookie(coded_string) {\n    // This variable holds the decoded cookie value\n    var cookie_value = '';\n\n    // Use + to split the coded string into an array\n    var code_array = coded_string.split('+');\n\n    // Loop through the array\n    for (var counter = 0; counter < code_array.length; counter++) {\n\n      // Convert the code into a character and\n      // add it to the cookie value string\n      cookie_value += String.fromCharCode(code_array[counter]);\n    }\n    // return coded_string;\n\n    return cookie_value;\n  }\n\n  static getCookie(cookieName): any {\n    let name = NString.TrimStart(cookieName + '=');\n    let decodedCookie = decodeURIComponent(document.cookie);\n    let ca = decodedCookie.split(';');\n    for (let i = 0; i < ca.length; i++) {\n      let c = ca[i];\n      while (c.charAt(0) == ' ') {\n        c = c.substring(1);\n      }\n      if (c.indexOf(name) >= 0) {\n        let decode = CookieService.decode_cookie(c.substring(name.length, c.length));\n        return decode;\n      }\n    }\n    return '';\n  }\n\n  static deleteCookie(cookieName): boolean {\n    var cookies = document.cookie.split(';');\n\n    for (var i = 0; i < cookies.length; i++) {\n      var cookie = cookies[i];\n      var eqPos = cookie.indexOf('=');\n      var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;\n      if (cookieName === NString.TrimStart(decodeURI(name))) {\n        document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';\n        return true;\n      }\n    }\n    return false;\n  }\n\n}\n"]}
|
|
@@ -39,7 +39,6 @@ var ClientTargetedCommandType;
|
|
|
39
39
|
})(ClientTargetedCommandType || (ClientTargetedCommandType = {}));
|
|
40
40
|
|
|
41
41
|
class ConstInterface {
|
|
42
|
-
;
|
|
43
42
|
}
|
|
44
43
|
ConstInterface.MG_TAG_CONTEXT = "context";
|
|
45
44
|
ConstInterface.MG_TAG_ENV = "env";
|
|
@@ -1241,7 +1240,8 @@ class MgControl extends MgControlBase {
|
|
|
1241
1240
|
if (!isTagProcessed) {
|
|
1242
1241
|
switch (attribute) {
|
|
1243
1242
|
case ConstInterface.MG_ATTR_SUBFORM_TASK:
|
|
1244
|
-
|
|
1243
|
+
if (valueStr.trim() != "")
|
|
1244
|
+
this._subformTaskId = valueStr;
|
|
1245
1245
|
break;
|
|
1246
1246
|
case ConstInterface.MG_ATTR_REFRESHON:
|
|
1247
1247
|
this.refreshOnString = valueStr.trim();
|
|
@@ -4242,9 +4242,10 @@ class Scrambler {
|
|
|
4242
4242
|
if (high > (sqrt / 2))
|
|
4243
4243
|
high = Math.floor(sqrt / 2);
|
|
4244
4244
|
delta = (Math.random() * (high - low)) + low;
|
|
4245
|
+
delta = Math.floor(delta);
|
|
4245
4246
|
if (delta === Scrambler.XML_ILLEGAL_RANDOM)
|
|
4246
4247
|
delta++;
|
|
4247
|
-
return
|
|
4248
|
+
return delta;
|
|
4248
4249
|
}
|
|
4249
4250
|
static UnScramble(inVal, beginOffSet, endOffSet) {
|
|
4250
4251
|
if (!Scrambler.ScramblingEnabled) {
|
|
@@ -6311,17 +6312,22 @@ class LanguageData {
|
|
|
6311
6312
|
if (this._mlsContent.length > 0) {
|
|
6312
6313
|
let linePairs = 0;
|
|
6313
6314
|
let srcLine = this._mlsContent + 3;
|
|
6315
|
+
let transLine;
|
|
6314
6316
|
this._mlsStrings = new Hashtable();
|
|
6315
|
-
let linesStr = this._mlsContent.
|
|
6317
|
+
let linesStr = this._mlsContent.substr(this._mlsContent.length - MLS_EOF_CHARS_TO_READ, 8);
|
|
6316
6318
|
linePairs = parseInt(linesStr.toString(), 16);
|
|
6317
6319
|
let tokens = StrUtil.tokenize(srcLine.toString(), "\n");
|
|
6318
|
-
for (let
|
|
6319
|
-
|
|
6320
|
-
|
|
6320
|
+
for (let pairNum = 0; pairNum < linePairs * 2; pairNum += 2) {
|
|
6321
|
+
srcLine = tokens[pairNum].substr(0, tokens[pairNum].length - 1);
|
|
6322
|
+
transLine = tokens[pairNum + 1].substr(0, tokens[pairNum + 1].length - 1);
|
|
6323
|
+
if (this._mlsStrings.get_Item(srcLine.toString()) == null)
|
|
6324
|
+
this._mlsStrings.set_Item(srcLine.toString(), transLine);
|
|
6321
6325
|
}
|
|
6322
6326
|
}
|
|
6323
6327
|
}
|
|
6324
6328
|
else if (this._mlsFileUrl != null) {
|
|
6329
|
+
if (this._mlsFileUrl.startsWith("./"))
|
|
6330
|
+
this._mlsFileUrl = NString.Replace(this._mlsFileUrl, './', './assets/cache/');
|
|
6325
6331
|
let contentStr = yield CommandsProcessorManager.GetContent(this._mlsFileUrl, true);
|
|
6326
6332
|
let buffer = contentStr;
|
|
6327
6333
|
if (buffer != null && buffer.length > 0) {
|
|
@@ -8089,6 +8095,13 @@ class SelectProgramCommand extends ExecOperCommand {
|
|
|
8089
8095
|
}
|
|
8090
8096
|
}
|
|
8091
8097
|
|
|
8098
|
+
class ControlItemsRefreshCommand extends DataviewCommand {
|
|
8099
|
+
constructor() {
|
|
8100
|
+
super();
|
|
8101
|
+
this.Control = null;
|
|
8102
|
+
}
|
|
8103
|
+
}
|
|
8104
|
+
|
|
8092
8105
|
class CommandFactory {
|
|
8093
8106
|
static CreateEventCommand(taskTag, magicEvent) {
|
|
8094
8107
|
let eventCommand = new EventCommand(magicEvent);
|
|
@@ -8107,6 +8120,13 @@ class CommandFactory {
|
|
|
8107
8120
|
dataviewCommand.TaskTag = taskId;
|
|
8108
8121
|
return dataviewCommand;
|
|
8109
8122
|
}
|
|
8123
|
+
static CreateControlItemsRefreshCommand(taskId, control) {
|
|
8124
|
+
let command = new ControlItemsRefreshCommand();
|
|
8125
|
+
command.CommandType = DataViewCommandType.ControlItemsRefresh;
|
|
8126
|
+
command.TaskTag = taskId;
|
|
8127
|
+
command.Control = control;
|
|
8128
|
+
return command;
|
|
8129
|
+
}
|
|
8110
8130
|
static CreateAddUserRangeDataviewCommand(taskId, userRange) {
|
|
8111
8131
|
let addUserRangeDataviewCommand = new AddUserRangeDataviewCommand();
|
|
8112
8132
|
addUserRangeDataviewCommand.TaskTag = taskId;
|
|
@@ -9468,8 +9488,8 @@ class Operation {
|
|
|
9468
9488
|
if (rtEvnt !== null) {
|
|
9469
9489
|
this._routeParams = rtEvnt.getRouteParamList();
|
|
9470
9490
|
if ((yield rtEvnt.getArgList().getArg(0).getValue(StorageAttribute.ALPHA, 0)).trim() === this._routerPath &&
|
|
9471
|
-
((rtEvnt.getArgList().getArg(1).skipArg()) ||
|
|
9472
|
-
(yield rtEvnt.getArgList().getArg(1).getValue(StorageAttribute.ALPHA, 0)).trim() === this._originalRouterOutletName))
|
|
9491
|
+
((rtEvnt.getArgList().getArg(1).skipArg() && destSubForm === this._task.getForm().DefaultRouterOutlet) ||
|
|
9492
|
+
(!rtEvnt.getArgList().getArg(1).skipArg() && (yield rtEvnt.getArgList().getArg(1).getValue(StorageAttribute.ALPHA, 0)).trim() === this._originalRouterOutletName)))
|
|
9473
9493
|
canRoute = true;
|
|
9474
9494
|
if (!canRoute)
|
|
9475
9495
|
return false;
|
|
@@ -10361,7 +10381,7 @@ class CookieService {
|
|
|
10361
10381
|
var cookie = cookies[i];
|
|
10362
10382
|
var eqPos = cookie.indexOf('=');
|
|
10363
10383
|
var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
|
|
10364
|
-
if (cookieName === decodeURI(name)) {
|
|
10384
|
+
if (cookieName === NString.TrimStart(decodeURI(name))) {
|
|
10365
10385
|
document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
|
|
10366
10386
|
return true;
|
|
10367
10387
|
}
|
|
@@ -11084,6 +11104,11 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
|
|
|
11084
11104
|
this.eval_op_VarDisplayName(resVal, val1);
|
|
11085
11105
|
expStrTracker.resetNullResult();
|
|
11086
11106
|
break;
|
|
11107
|
+
case ExpressionInterface.EXP_OP_CONTROL_ITEMS_REFRESH:
|
|
11108
|
+
val2 = valStack.pop();
|
|
11109
|
+
val1 = valStack.pop();
|
|
11110
|
+
yield this.eval_op_controlItemRefresh(val1, val2, resVal);
|
|
11111
|
+
break;
|
|
11087
11112
|
case ExpressionInterface.EXP_OP_VARCONTROLID:
|
|
11088
11113
|
val1 = valStack.pop();
|
|
11089
11114
|
this.eval_op_VarControlID(resVal, val1);
|
|
@@ -13228,6 +13253,28 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
|
|
|
13228
13253
|
resVal.StrVal = fld.VarDisplayName;
|
|
13229
13254
|
}
|
|
13230
13255
|
}
|
|
13256
|
+
eval_op_controlItemRefresh(val1, val2, resVal) {
|
|
13257
|
+
const _super = Object.create(null, {
|
|
13258
|
+
GetContextTask: { get: () => super.GetContextTask }
|
|
13259
|
+
});
|
|
13260
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
13261
|
+
let success = false;
|
|
13262
|
+
let parent = val2.MgNumVal.NUM_2_LONG();
|
|
13263
|
+
resVal.Attr = StorageAttribute.BOOLEAN;
|
|
13264
|
+
if ((parent >= 0 && parent < (this.ExpTask.getTaskDepth(false))) || parent === ExpressionEvaluator.TRIGGER_TASK) {
|
|
13265
|
+
let tsk = _super.GetContextTask.call(this, parent);
|
|
13266
|
+
if (tsk != null && tsk.getForm() != null) {
|
|
13267
|
+
let control = tsk.getForm().GetCtrl(val1.StrVal);
|
|
13268
|
+
if (control != null && control.isChoiceControl() && control.isDataCtrl()) {
|
|
13269
|
+
let command = CommandFactory.CreateControlItemsRefreshCommand(tsk.getTaskTag(), control);
|
|
13270
|
+
yield tsk.DataviewManager.CurrentDataviewManager.Execute(command);
|
|
13271
|
+
success = true;
|
|
13272
|
+
}
|
|
13273
|
+
}
|
|
13274
|
+
}
|
|
13275
|
+
resVal.BoolVal = success;
|
|
13276
|
+
});
|
|
13277
|
+
}
|
|
13231
13278
|
eval_op_VarControlID(resVal, val1) {
|
|
13232
13279
|
let ret = 0;
|
|
13233
13280
|
if (val1.MgNumVal !== null) {
|
|
@@ -14497,7 +14544,7 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
|
|
|
14497
14544
|
}
|
|
14498
14545
|
path = args[3];
|
|
14499
14546
|
domain = args[4];
|
|
14500
|
-
resVal.BoolVal = CookieService.setCookie(cookieName, args[0], nativeDt, path, domain, secure, sameSite);
|
|
14547
|
+
resVal.BoolVal = CookieService.setCookie(cookieName, (args[0] != null ? args[0].toString() : ""), nativeDt, path, domain, secure, sameSite);
|
|
14501
14548
|
}
|
|
14502
14549
|
eval_op_get_cookie(cookieName, resVal) {
|
|
14503
14550
|
resVal.StrVal = CookieService.getCookie(cookieName);
|
|
@@ -16585,7 +16632,8 @@ class Field extends FieldBase {
|
|
|
16585
16632
|
}
|
|
16586
16633
|
break;
|
|
16587
16634
|
case ConstInterface.MG_ATTR_CHACHED_FLD_ID:
|
|
16588
|
-
|
|
16635
|
+
if (data[0] != "")
|
|
16636
|
+
this.CacheTableFldIdx = NNumber.Parse(data[1]);
|
|
16589
16637
|
break;
|
|
16590
16638
|
case ConstInterface.MG_ATTR_LOCATE:
|
|
16591
16639
|
this.Locate = new Boundary(this.getTask(), NNumber.Parse(data[1]), NNumber.Parse(data[0]), this.getType(), this.getSize(), this.CacheTableFldIdx);
|
|
@@ -19823,7 +19871,11 @@ class MgForm extends MgFormBase {
|
|
|
19823
19871
|
this.GetDataview().setTopRecIdxModified(true);
|
|
19824
19872
|
try {
|
|
19825
19873
|
this._suffixDone = false;
|
|
19826
|
-
|
|
19874
|
+
let newDisplayLine = this.GetDataview().getCurrRecIdx() + size;
|
|
19875
|
+
if (unit === Constants.MOVE_UNIT_PAGE && this.isLineMode())
|
|
19876
|
+
if (newDisplayLine > this.GetDataview().getSize() - 1)
|
|
19877
|
+
visibleLine -= newDisplayLine - (this.GetDataview().getSize() - 1);
|
|
19878
|
+
yield this.setCurrRowByDisplayLine(newDisplayLine, true, false);
|
|
19827
19879
|
this.GetDataview().setTopRecIdxModified(false);
|
|
19828
19880
|
yield this.RefreshDisplay(Constants.TASK_REFRESH_FORM);
|
|
19829
19881
|
}
|
|
@@ -20987,8 +21039,10 @@ class RemoteTaskService extends TaskServiceBase {
|
|
|
20987
21039
|
return OwnerTransactionTask;
|
|
20988
21040
|
}
|
|
20989
21041
|
static PreparePropMainDisplay(task) {
|
|
20990
|
-
|
|
20991
|
-
|
|
21042
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
21043
|
+
yield task.ComputeMainDisplay();
|
|
21044
|
+
return task.FormIsLegal() ? ReturnResult.SuccessfulResult : new ReturnResult(MsgInterface.BRKTAB_STR_ERR_FORM);
|
|
21045
|
+
});
|
|
20992
21046
|
}
|
|
20993
21047
|
}
|
|
20994
21048
|
|
|
@@ -21393,15 +21447,18 @@ class RemoteDataviewHeader extends DataviewHeaderBase {
|
|
|
21393
21447
|
setAttribute(attribute, valueStr) {
|
|
21394
21448
|
switch (attribute) {
|
|
21395
21449
|
case ConstInterface.MG_ATTR_CACHED_TABLE:
|
|
21396
|
-
if (
|
|
21397
|
-
|
|
21398
|
-
|
|
21399
|
-
|
|
21400
|
-
|
|
21450
|
+
if (valueStr != "") {
|
|
21451
|
+
if (TableCacheManager.Instance.TableExists(valueStr))
|
|
21452
|
+
this._table = TableCacheManager.Instance.GetTableById(valueStr);
|
|
21453
|
+
else {
|
|
21454
|
+
this._table = new TableCache(valueStr);
|
|
21455
|
+
TableCacheManager.Instance.InsertTable(this._table);
|
|
21456
|
+
}
|
|
21401
21457
|
}
|
|
21402
21458
|
break;
|
|
21403
21459
|
case ConstInterface.MG_ATTR_IDENT:
|
|
21404
|
-
|
|
21460
|
+
if (valueStr != "")
|
|
21461
|
+
this._table.SetTableIdent(valueStr);
|
|
21405
21462
|
break;
|
|
21406
21463
|
default:
|
|
21407
21464
|
super.setAttribute(attribute, valueStr);
|
|
@@ -22515,9 +22572,17 @@ class RecomputeTable {
|
|
|
22515
22572
|
this.fillData_1(task.DataView, task, parser);
|
|
22516
22573
|
}
|
|
22517
22574
|
else
|
|
22518
|
-
|
|
22575
|
+
parser.setCurrIndex(parser.getXMLdata().indexOf(XMLConstants.TAG_CLOSE, parser.getCurrIndex()) + 1);
|
|
22519
22576
|
}
|
|
22520
22577
|
fillData_1(dataView, task, parser) {
|
|
22578
|
+
if (parser.getNextTag() == XMLConstants.MG_TAG_RECOMPUTE) {
|
|
22579
|
+
let currrentIndex = parser.getCurrIndex();
|
|
22580
|
+
let encoded = parser.ReadContentOfCurrentElement().trim();
|
|
22581
|
+
let decoded = Base64.decode(encoded.substr(0, encoded.length).trim());
|
|
22582
|
+
let newXmlData = parser.getXMLdata().replace(encoded.trim(), decoded);
|
|
22583
|
+
parser.setXMLdata(newXmlData);
|
|
22584
|
+
parser.setCurrIndex(currrentIndex);
|
|
22585
|
+
}
|
|
22521
22586
|
while (this.initInnerObjects(parser, parser.getNextTag(), dataView, task)) {
|
|
22522
22587
|
}
|
|
22523
22588
|
}
|
|
@@ -23282,10 +23347,12 @@ class Task extends TaskBase {
|
|
|
23282
23347
|
this.setDescriptor(valueStr);
|
|
23283
23348
|
break;
|
|
23284
23349
|
case ConstInterface.MG_ATTR_HAS_LOCATE:
|
|
23285
|
-
|
|
23350
|
+
if (+valueStr == 1)
|
|
23351
|
+
this.hasLocate = true;
|
|
23286
23352
|
break;
|
|
23287
23353
|
case ConstInterface.MG_ATTR_AS_PARENT:
|
|
23288
|
-
|
|
23354
|
+
if (+valueStr == 1)
|
|
23355
|
+
this.ModeAsParent = true;
|
|
23289
23356
|
break;
|
|
23290
23357
|
case ConstInterface.MG_ATTR_TASK_UNIQUE_SORT:
|
|
23291
23358
|
this.UniqueSort = valueStr[0];
|
|
@@ -23621,6 +23688,7 @@ class Task extends TaskBase {
|
|
|
23621
23688
|
result = yield this.DataviewManager.Execute(dataViewCommand);
|
|
23622
23689
|
if (!result.Success)
|
|
23623
23690
|
return null;
|
|
23691
|
+
this.ResumeSubformLayout();
|
|
23624
23692
|
}
|
|
23625
23693
|
nonInteractiveTask = yield this.StartSubTasks(moveToFirstControl, nonInteractiveTask, callByDestSubForm);
|
|
23626
23694
|
this.InStartProcess = false;
|
|
@@ -25314,16 +25382,18 @@ class Task extends TaskBase {
|
|
|
25314
25382
|
}
|
|
25315
25383
|
}
|
|
25316
25384
|
ComputeMainDisplay() {
|
|
25317
|
-
|
|
25318
|
-
|
|
25319
|
-
|
|
25320
|
-
|
|
25321
|
-
|
|
25385
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
25386
|
+
let propMainDisplay = this.getProp(PropInterface.PROP_TYPE_MAIN_DISPLAY);
|
|
25387
|
+
let mainDisplayIndex = yield propMainDisplay.getValueInt();
|
|
25388
|
+
mainDisplayIndex = this.GetRealMainDisplayIndexOnCurrentTask(mainDisplayIndex);
|
|
25389
|
+
this._forms.InitFormFromXmlString(mainDisplayIndex);
|
|
25390
|
+
this.EnsureValidForm();
|
|
25391
|
+
});
|
|
25322
25392
|
}
|
|
25323
25393
|
PrepareTaskForm() {
|
|
25324
25394
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25325
25395
|
yield TaskServiceBase.PreparePropOpenTaskWindow(this);
|
|
25326
|
-
return RemoteTaskService.PreparePropMainDisplay(this);
|
|
25396
|
+
return yield RemoteTaskService.PreparePropMainDisplay(this);
|
|
25327
25397
|
});
|
|
25328
25398
|
}
|
|
25329
25399
|
FormIsLegal() {
|
|
@@ -25394,7 +25464,12 @@ class Task extends TaskBase {
|
|
|
25394
25464
|
let tokensVector = XmlParser.getTokens(RuntimeContextBase.Instance.Parser.getXMLsubstring(endTaskUrlIdx), XMLConstants.XML_ATTR_DELIM);
|
|
25395
25465
|
let taskCacheURL = tokensVector.get_Item(1);
|
|
25396
25466
|
let refListStr = tokensVector.get_Item(3);
|
|
25397
|
-
let taskContentOriginal =
|
|
25467
|
+
let taskContentOriginal = "";
|
|
25468
|
+
if (taskCacheURL.trim() != "") {
|
|
25469
|
+
if (taskCacheURL.startsWith("./"))
|
|
25470
|
+
taskCacheURL = NString.Replace(taskCacheURL, './', './assets/cache/');
|
|
25471
|
+
taskContentOriginal = yield Task.CommandsProcessor.GetContent(taskCacheURL, true);
|
|
25472
|
+
}
|
|
25398
25473
|
let taskContentFinal = new StringBuilder(xmlData.substr(0, RuntimeContextBase.Instance.Parser.getCurrIndex() - (ConstInterface.MG_TAG_TASKURL.length + 1)), taskContentOriginal.length);
|
|
25399
25474
|
let reflist = this.getReflist(refListStr, ';', true, -1);
|
|
25400
25475
|
let refListIdx = 0;
|
|
@@ -27684,7 +27759,7 @@ class EventsManager {
|
|
|
27684
27759
|
val = Manager.GetCtrlVal(ctrl);
|
|
27685
27760
|
task.CurrentEditingControl = null;
|
|
27686
27761
|
if (!task.cancelWasRaised() &&
|
|
27687
|
-
(ctrl.Type !== MgControlType.CTRL_TYPE_BROWSER && (!isNullOrUndefined(ctrl._field) && ctrl._field.getType() === StorageAttribute.DATE || val !== null) && typeof val != 'undefined' &&
|
|
27762
|
+
(ctrl.Type !== MgControlType.CTRL_TYPE_BROWSER && (!isNullOrUndefined(ctrl._field) && (ctrl._field.getType() === StorageAttribute.DATE || ctrl._field.getType() == StorageAttribute.NUMERIC) || val !== null) && typeof val != 'undefined' &&
|
|
27688
27763
|
!(yield ctrl.validateAndSetValue(val, true)))) {
|
|
27689
27764
|
this.setStopExecution(true);
|
|
27690
27765
|
return false;
|
|
@@ -30357,7 +30432,7 @@ class CommandsTable {
|
|
|
30357
30432
|
}
|
|
30358
30433
|
}
|
|
30359
30434
|
|
|
30360
|
-
let CurrentClientVersion = '4.
|
|
30435
|
+
let CurrentClientVersion = '4.1000.0-dev000.0';
|
|
30361
30436
|
|
|
30362
30437
|
class ClientManager {
|
|
30363
30438
|
constructor() {
|
|
@@ -30448,6 +30523,10 @@ class ClientManager {
|
|
|
30448
30523
|
EventsManager.Instance.addGuiTriggeredEventWithTaskAndCodeAndLine(task, InternalInterface.MG_ACT_REC_PREFIX, dvRowIdx);
|
|
30449
30524
|
}
|
|
30450
30525
|
break;
|
|
30526
|
+
case "navigateInTable":
|
|
30527
|
+
if (guiEvent.ControlName === "magicRow")
|
|
30528
|
+
this.handleNavigateInRowEvent(task, guiEvent.Value);
|
|
30529
|
+
break;
|
|
30451
30530
|
case "close":
|
|
30452
30531
|
if (task.IsRoute())
|
|
30453
30532
|
EventsManager.Instance.AddRouterClosedEvent(task);
|
|
@@ -30482,6 +30561,38 @@ class ClientManager {
|
|
|
30482
30561
|
break;
|
|
30483
30562
|
}
|
|
30484
30563
|
}
|
|
30564
|
+
handleNavigateInRowEvent(task, evt) {
|
|
30565
|
+
let internalEvt = InternalInterface.MG_ACT_NONE;
|
|
30566
|
+
evt = evt.toLowerCase();
|
|
30567
|
+
switch (evt) {
|
|
30568
|
+
case "begin-page":
|
|
30569
|
+
internalEvt = InternalInterface.MG_ACT_TBL_BEGPAGE;
|
|
30570
|
+
break;
|
|
30571
|
+
case "previous-page":
|
|
30572
|
+
internalEvt = InternalInterface.MG_ACT_TBL_PRVPAGE;
|
|
30573
|
+
break;
|
|
30574
|
+
case "end-page":
|
|
30575
|
+
internalEvt = InternalInterface.MG_ACT_TBL_ENDPAGE;
|
|
30576
|
+
break;
|
|
30577
|
+
case "next-page":
|
|
30578
|
+
internalEvt = InternalInterface.MG_ACT_TBL_NXTPAGE;
|
|
30579
|
+
break;
|
|
30580
|
+
case "previous-line":
|
|
30581
|
+
internalEvt = InternalInterface.MG_ACT_TBL_PRVLINE;
|
|
30582
|
+
break;
|
|
30583
|
+
case "next-line":
|
|
30584
|
+
internalEvt = InternalInterface.MG_ACT_TBL_NXTLINE;
|
|
30585
|
+
break;
|
|
30586
|
+
case "begin-table":
|
|
30587
|
+
internalEvt = InternalInterface.MG_ACT_TBL_BEGTBL;
|
|
30588
|
+
break;
|
|
30589
|
+
case "end-table":
|
|
30590
|
+
internalEvt = InternalInterface.MG_ACT_TBL_ENDTBL;
|
|
30591
|
+
break;
|
|
30592
|
+
}
|
|
30593
|
+
if (internalEvt != InternalInterface.MG_ACT_NONE)
|
|
30594
|
+
EventsManager.Instance.addGuiTriggeredEventWithTaskAndCode(task, internalEvt);
|
|
30595
|
+
}
|
|
30485
30596
|
ConfirmationClosed(res) {
|
|
30486
30597
|
Commands.ResolvePromise(res);
|
|
30487
30598
|
}
|
|
@@ -30626,15 +30737,20 @@ class ClientManager {
|
|
|
30626
30737
|
}
|
|
30627
30738
|
return pic;
|
|
30628
30739
|
}
|
|
30629
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
30740
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
30630
30741
|
let pic = null;
|
|
30631
30742
|
let task = MGDataCollection.Instance.GetTaskByID(taskId);
|
|
30632
30743
|
let control = null;
|
|
30633
30744
|
let newValue = value;
|
|
30634
|
-
if (controlName !== null)
|
|
30745
|
+
if (controlName !== null && task !== null)
|
|
30635
30746
|
control = task.getForm().GetCtrl(controlName);
|
|
30636
30747
|
if (control != null && control.DataType == StorageAttribute.NUMERIC) {
|
|
30637
|
-
|
|
30748
|
+
if (control.isRepeatable() && control.getProp(PropInterface.PROP_TYPE_FORMAT).isExpression()) {
|
|
30749
|
+
let picval = control.getProp(PropInterface.PROP_TYPE_FORMAT).getPrevValue(+rowId);
|
|
30750
|
+
pic = new PIC(picval, StorageAttribute.NUMERIC, control.getForm().getTask().getCompIdx());
|
|
30751
|
+
}
|
|
30752
|
+
else
|
|
30753
|
+
pic = control.getPIC();
|
|
30638
30754
|
let dispValue = String(value);
|
|
30639
30755
|
let newPic = pic.getUnformattedNumericPic();
|
|
30640
30756
|
let num = DisplayConvertor.Instance.toNum(dispValue, newPic, 0);
|
|
@@ -30737,8 +30853,8 @@ class MagicBridge {
|
|
|
30737
30853
|
static GetControlPictureMask(taskId, controlName) {
|
|
30738
30854
|
return ClientManager.GetControlPictureMask(taskId, controlName);
|
|
30739
30855
|
}
|
|
30740
|
-
static GetFormattedValue(taskId, controlName, value) {
|
|
30741
|
-
return ClientManager.GetFormattedValue(taskId, controlName, value);
|
|
30856
|
+
static GetFormattedValue(taskId, controlName, value, rowId) {
|
|
30857
|
+
return ClientManager.GetFormattedValue(taskId, controlName, value, rowId);
|
|
30742
30858
|
}
|
|
30743
30859
|
static GetRangedValue(taskId, controlName, value) {
|
|
30744
30860
|
return ClientManager.GetRangedValue(taskId, controlName, value);
|
|
@@ -30757,13 +30873,6 @@ class MagicBridge {
|
|
|
30757
30873
|
}
|
|
30758
30874
|
}
|
|
30759
30875
|
|
|
30760
|
-
class ControlItemsRefreshCommand extends DataviewCommand {
|
|
30761
|
-
constructor() {
|
|
30762
|
-
super();
|
|
30763
|
-
this.Control = null;
|
|
30764
|
-
}
|
|
30765
|
-
}
|
|
30766
|
-
|
|
30767
30876
|
class DataViewOutputCommand extends DataviewCommand {
|
|
30768
30877
|
constructor(OutputCommandType) {
|
|
30769
30878
|
super();
|