@magic-xpa/gui 4.900.0-dev490.21 → 4.900.0-dev490.210

package/fesm2020/magic-xpa-gui.mjs

@@ -1235,13 +1235,11 @@ class Commands {
         guiCommand.number = num;
         GuiCommandQueue.getInstance().addCommand(guiCommand);
     }
-    static addValueWithLine(commandType, obj, line, value, reset = false) {
+    static addValueWithLine(commandType, obj, line, value) {
         let guiCommand = new GuiCommand(obj, commandType);
         guiCommand.value = value;
         guiCommand.line = line;
         if (commandType === CommandType.SET_VALUE) {
-            if (reset)
-                guiCommand.Bool1 = reset;
             if (obj instanceof GuiMgControl && obj.isChoiceControl()) {
                 if (value < 0)
                     guiCommand.value = '';
@@ -1597,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.isComboBox() || ctrl.isListBox() || ctrl.isCheckBox() || ctrl.isRadio()) {
             if (UtilStrByteMode.isLocaleDefLangDBCS()) {
                 if (await ctrl.getForm().getTask().checkProp(PropInterface.PROP_TYPE_ALLOW_LOCATE_IN_QUERY, false))
                     return;
@@ -5640,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;
@@ -9812,7 +9801,7 @@ class Property {
     async onModifiable() {
         if (this._parentType === GuiConstants.PARENT_TYPE_CONTROL) {
             let ctrl = this._parentObj;
-            if (ctrl.isTextControl()) {
+            if (ctrl.isTextControl() || ctrl.isChoiceControl() || ctrl.isCheckBox()) {
                 let task = this.GetTaskByParentObject();
                 let readOnlyValue = !this.GetComputedValueBoolean();
                 if ((readOnlyValue || task.getMode() !== Constants.TASK_MODE_QUERY) && ctrl.GetCurrReadOnly() !== readOnlyValue) {
@@ -10388,7 +10377,7 @@ class FieldValidator {
             return valDet;
         }
         if (ctrl.DataType !== StorageAttribute.ALPHA && ctrl.DataType !== StorageAttribute.UNICODE && ctrl.DataType !== StorageAttribute.BLOB) {
-            if ((typeof this._newvalue === 'string' && this._newvalue.trim().length === 0) || (ctrl.DataType === StorageAttribute.DATE && (ctrl.isDateZero(this._newvalue) || this.isNullDisplayVal()))) {
+            if ((typeof this._newvalue === 'string' && this._newvalue.trim().length === 0) || (ctrl.DataType == StorageAttribute.NUMERIC && this._newvalue == null) || (ctrl.DataType === StorageAttribute.DATE && (ctrl.isDateZero(this._newvalue) || this.isNullDisplayVal()))) {
                 let field = ctrl.getField();
                 let defaultValue = field.getDefaultValue();
                 let text = null;
@@ -11578,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;
@@ -11621,9 +11609,6 @@ class MgControlBase extends GuiControlPropertyAdapter {
     get Form() {
         return this._form;
     }
-    get Id() {
-        return this._id;
-    }
     get ControlIsn() {
         return this._controlIsn;
     }
@@ -11845,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;
@@ -12060,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();
@@ -12070,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)
@@ -12386,12 +12368,8 @@ class MgControlBase extends GuiControlPropertyAdapter {
         if (super.isButton()) {
             mlsTranslatedValue = Events.Translate(this.Value);
         }
-        if (this.isTextControl() || this.isButton()) {
-            if (this.isTextControl() && this.getForm().inRefreshDisplay() && this.DataType == StorageAttribute.NUMERIC)
-                Commands.addValueWithLine(CommandType.SET_VALUE, this, displayLine, mlsTranslatedValue, true);
-            else
-                Commands.addValueWithLine(CommandType.SET_VALUE, this, displayLine, mlsTranslatedValue);
-        }
+        if (this.isTextControl() || this.isButton())
+            Commands.addValueWithLine(CommandType.SET_VALUE, this, displayLine, mlsTranslatedValue);
         else
             Commands.addOperationWithLine(CommandType.SET_PROPERTY, this, displayLine, HtmlProperties.Text, mlsTranslatedValue);
     }
@@ -13082,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);
         }
@@ -13398,15 +13381,17 @@ class MgControlBase extends GuiControlPropertyAdapter {
     async ZoomButtonInitialization() {
         if (this.isTextControl() && this.checkIfExistProp(PropInterface.PROP_TYPE_CONNECTED_ZOOM_CONTROL)) {
             let connectedButton = this.Form.CtrlTab.GetControlByIsn((await (await this.getProp(PropInterface.PROP_TYPE_CONNECTED_ZOOM_CONTROL)).getValueInt()));
-            let imageFileName = null;
-            if (connectedButton.IsImageButton() && connectedButton.PropertyExists(PropInterface.PROP_TYPE_IMAGE_FILENAME)) {
-                imageFileName = await (await connectedButton.getProp(PropInterface.PROP_TYPE_IMAGE_FILENAME)).getValue();
-                if (!Misc.IsWebUrl(imageFileName))
-                    imageFileName = "./assets/images/" + imageFileName;
-                Commands.addOperationWithLine(CommandType.SET_STYLE, this, 0, MagicProperties.ImageFile, imageFileName);
+            if (connectedButton) {
+                let imageFileName = null;
+                if (connectedButton.IsImageButton() && connectedButton.PropertyExists(PropInterface.PROP_TYPE_IMAGE_FILENAME)) {
+                    imageFileName = await (await connectedButton.getProp(PropInterface.PROP_TYPE_IMAGE_FILENAME)).getValue();
+                    if (!Misc.IsWebUrl(imageFileName))
+                        imageFileName = "./assets/images/" + imageFileName;
+                    Commands.addOperationWithLine(CommandType.SET_STYLE, this, 0, MagicProperties.ImageFile, imageFileName);
+                }
+                this.ConnectedControl = connectedButton;
+                connectedButton.ConnectedControl = this;
             }
-            this.ConnectedControl = connectedButton;
-            connectedButton.ConnectedControl = this;
         }
     }
 }
@@ -15445,9 +15430,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) {
@@ -15607,16 +15599,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;
@@ -15764,7 +15757,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;
@@ -15870,6 +15863,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)
@@ -15930,7 +15932,7 @@ class GuiTaskBase {
         return this.GetExpressionStorage(expId);
     }
     async CalculateExpression(expId, resType, length) {
-        return Promise.resolve('');
+        return Promise.resolve("");
     }
     isStarted() {
         return true;
@@ -16017,7 +16019,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);