@magic-xpa/gui 4.801.3 → 4.801.6

package/fesm2020/magic-xpa-gui.mjs

@@ -1595,7 +1595,7 @@ class Manager {
         return Commands.getValue(ctrl, ctrl.getDisplayLine(true));
     }
     static async SetReadOnlyControl(ctrl, isReadOnly) {
-        if (ctrl.isTextControl() || ctrl.IsRepeatable) {
+        if (ctrl.isTextControl() || ctrl.IsRepeatable || ctrl.isCheckBox() || ctrl.isChoiceControl()) {
             if (UtilStrByteMode.isLocaleDefLangDBCS()) {
                 if (await ctrl.getForm().getTask().checkProp(PropInterface.PROP_TYPE_ALLOW_LOCATE_IN_QUERY, false))
                     return;
@@ -5638,25 +5638,16 @@ class DisplayConvertor {
                 case PICInterface.PIC_YY:
                     {
                         this.int_2_a(outVal, outIdx, 2, breakParams.year, '0');
-                        let yearStr = NString.FromChars(outVal);
-                        year = +yearStr.substr(outIdx);
-                        outIdx += 2;
-                        len -= 2;
-                    }
-                    break;
-                case PICInterface.PIC_YY:
-                    {
-                        this.int_2_a(outVal, outIdx, 2, breakParams.year, '0');
-                        let yearStr = NString.FromChars(outVal);
-                        year = +yearStr.substr(outIdx);
+                        let yearStr = NString.FromChars(outVal, outIdx, 2);
+                        year = +yearStr;
                         outIdx += 2;
                         len -= 2;
                     }
                     break;
                 case PICInterface.PIC_YYYY:
-                    this.int_2_a(outVal, outIdx, 4, year, '0');
-                    let yearStr = NString.FromChars(outVal);
-                    year = +yearStr.substr(outIdx);
+                    this.int_2_a(outVal, outIdx, 4, breakParams.year, '0');
+                    let yearStr = NString.FromChars(outVal, outIdx, 4);
+                    year = +yearStr;
                     outIdx += 4;
                     len -= 4;
                     break;
@@ -13076,6 +13067,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);
         }
@@ -15601,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;
@@ -15758,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;
@@ -15864,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)
@@ -15924,7 +15930,7 @@ class GuiTaskBase {
         return this.GetExpressionStorage(expId);
     }
     async CalculateExpression(expId, resType, length) {
-        return Promise.resolve('');
+        return Promise.resolve("");
     }
     isStarted() {
         return true;