@magic-xpa/gui 4.801.4 → 4.900.0-dev490.100

package/fesm2020/magic-xpa-gui.mjs

@@ -11567,7 +11567,6 @@ class MgControlBase extends GuiControlPropertyAdapter {
         this._firstRefreshProperties = true;
         this._form = null;
         this._hasValidItmAndDispVal = false;
-        this._id = -1;
         this._controlIsn = -1;
         this._linkedParentDitIdx = -1;
         this._orgChoiceDisps = null;
@@ -11610,9 +11609,6 @@ class MgControlBase extends GuiControlPropertyAdapter {
     get Form() {
         return this._form;
     }
-    get Id() {
-        return this._id;
-    }
     get ControlIsn() {
         return this._controlIsn;
     }
@@ -11834,9 +11830,6 @@ class MgControlBase extends GuiControlPropertyAdapter {
             case XMLConstants.MG_ATTR_CONTAINER:
                 this.setContainer(XmlParser.getInt(valueStr));
                 break;
-            case XMLConstants.MG_ATTR_ID:
-                this._id = XmlParser.getInt(valueStr);
-                break;
             case XMLConstants.MG_ATTR_CONTROL_ISN:
                 this._controlIsn = XmlParser.getInt(valueStr);
                 break;
@@ -12049,7 +12042,7 @@ class MgControlBase extends GuiControlPropertyAdapter {
     }
     getRangedValue(newVal) {
         let vd;
-        vd = this.buildCopyPicture(this.Value, newVal);
+        vd = this.buildPicture(this.Value, newVal);
         vd.evaluate();
         this.ModifiedByUser = true;
         let val = vd.getDispValue();
@@ -12059,7 +12052,7 @@ class MgControlBase extends GuiControlPropertyAdapter {
         let vd;
         let modified = this.ModifiedByUser;
         this.ModifiedByUser = true;
-        vd = this.buildCopyPicture(this.Value, newVal);
+        vd = this.buildPicture(this.Value, newVal);
         vd.evaluate();
         this.ModifiedByUser = modified;
         if (vd.ValidationFailed)
@@ -13067,6 +13060,11 @@ class MgControlBase extends GuiControlPropertyAdapter {
                 if (prevMustInput !== await this.checkProp(PropInterface.PROP_TYPE_MUST_INPUT, false))
                     Commands.addOperationWithLine(CommandType.SET_PROPERTY, this, this.getDisplayLine(false), HtmlProperties.MustInput, !prevMustInput);
             }
+            else if (mustInputProperty != null) {
+                let mustInputVal = this.GetComputedBooleanProperty(PropInterface.PROP_TYPE_MUST_INPUT, false);
+                if (mustInputVal)
+                    Commands.addOperationWithLine(CommandType.SET_PROPERTY, this, this.getDisplayLine(false), HtmlProperties.MustInput, mustInputVal);
+            }
             if (!this.GetComputedBooleanProperty(PropInterface.PROP_TYPE_TAB_IN, true))
                 Commands.addOperationWithLine(CommandType.SET_PROPERTY, this, this.getDisplayLine(false), HtmlProperties.TabIndex, -1);
         }
@@ -15430,9 +15428,16 @@ class Helps {
     initInnerObjects(foundTagName, parser) {
         if (foundTagName === null)
             return false;
-        if (foundTagName === XMLConstants.MG_TAG_HELPTABLE)
+        if (foundTagName === XMLConstants.MG_TAG_HELPTABLE) {
+            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);
             parser.setCurrIndex(parser.getXMLdata().indexOf(XMLConstants.TAG_CLOSE, parser.getCurrIndex()) +
                 1);
+        }
         else if (foundTagName === XMLConstants.MG_TAG_HELPITEM) {
             let endContext = parser.getXMLdata().indexOf(XMLConstants.TAG_TERM, parser.getCurrIndex());
             if (endContext !== -1 && endContext < parser.getXMLdata().length) {
@@ -15592,16 +15597,17 @@ class GuiTaskBase {
     constructor() {
         this._flowMonitor = null;
         this._keyboardMappingState = 0xFFFF0000;
-        this._refreshType = 'T';
+        this._refreshType = "T";
         this._lastParkedCtrl = null;
         this._brkLevel = null;
         this._brkLevelIndex = -1;
         this._mainLevel = null;
-        this._level = '\0';
+        this._level = "\0";
         this._enteredRecLevel = false;
         this._currParkedFld = null;
         this.isInRecompute = false;
         this.CurrentEditingControl = null;
+        this.shouldResumeSubformLayout = true;
         this.ApplicationGuid = null;
         this.ProgramIsn = 0;
         this.TaskIsn = 0;
@@ -15749,7 +15755,7 @@ class GuiTaskBase {
             return this._helpTab.getHelp(idx);
     }
     setProp(propId, val) {
-        this._propTab.setProp(propId, val, this, 'T');
+        this._propTab.setProp(propId, val, this, "T");
     }
     setBrkLevel(cBrkLevel, NewBrkLevelIndex) {
         this._brkLevel = cBrkLevel;
@@ -15855,6 +15861,15 @@ class GuiTaskBase {
             this.Form.InInitForm = false;
         }
     }
+    ResumeSubformLayout() {
+        if (this.Form !== null) {
+            let subFormCtrl = this.Form.getSubFormCtrl();
+            if (subFormCtrl !== null && this.shouldResumeSubformLayout) {
+                Commands.addOperationWithLine(CommandType.SET_PROPERTY, subFormCtrl, 0, HtmlProperties.Visible, subFormCtrl.isVisible());
+                this.shouldResumeSubformLayout = false;
+            }
+        }
+    }
     GetLastParkedCtrlName(depth) {
         let ancestor = this.GetTaskAncestor(depth);
         if (ancestor === null || ancestor._lastParkedCtrl === null)
@@ -15915,7 +15930,7 @@ class GuiTaskBase {
         return this.GetExpressionStorage(expId);
     }
     async CalculateExpression(expId, resType, length) {
-        return Promise.resolve('');
+        return Promise.resolve("");
     }
     isStarted() {
         return true;
@@ -16002,7 +16017,8 @@ class GuiTaskBase {
                 this.IsParallel = XmlParser.getBoolean(valueStr);
                 break;
             case XMLConstants.MG_ATTR_ROUTER_PATH:
-                this.routerPath = valueStr;
+                if (valueStr.trim() != "")
+                    this.routerPath = valueStr;
                 break;
             case XMLConstants.MG_ATTR_IN_DEFAULT_ROUTER_OUTLET:
                 this.inDefaultRouterOutlet = XmlParser.getBoolean(valueStr);