@magic-xpa/gui 4.900.0-dev491.7 → 4.900.0

package/fesm2015/magic-xpa-gui.mjs

@@ -1599,7 +1599,7 @@ class Manager {
     }
     static SetReadOnlyControl(ctrl, isReadOnly) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (ctrl.isTextControl() || ctrl.IsRepeatable) {
+            if (ctrl.isTextControl() || ctrl.IsRepeatable || ctrl.isComboBox() || ctrl.isListBox() || ctrl.isCheckBox() || ctrl.isRadio()) {
                 if (UtilStrByteMode.isLocaleDefLangDBCS()) {
                     if (yield ctrl.getForm().getTask().checkProp(PropInterface.PROP_TYPE_ALLOW_LOCATE_IN_QUERY, false))
                         return;
@@ -2030,6 +2030,7 @@ class PIC {
         this._maskChars = 0;
         this._maskSize = 0;
         this._mixed = false;
+        this._formatExp = false;
         this._msk = null;
         this._needLength = false;
         this._negative = false;
@@ -2117,6 +2118,12 @@ class PIC {
     decInFirstPos() {
         return this._decPointIsFirst;
     }
+    setFormatExp(val) {
+        this._formatExp = val;
+    }
+    isFormatExp() {
+        return this._formatExp;
+    }
     getPosPref_() {
         return this._posPref.ToString();
     }
@@ -5645,25 +5652,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;
@@ -9848,7 +9846,7 @@ class Property {
         return __awaiter(this, void 0, void 0, function* () {
             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) {
@@ -10439,7 +10437,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;
@@ -11635,7 +11633,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;
@@ -11678,9 +11675,6 @@ class MgControlBase extends GuiControlPropertyAdapter {
     get Form() {
         return this._form;
     }
-    get Id() {
-        return this._id;
-    }
     get ControlIsn() {
         return this._controlIsn;
     }
@@ -11906,9 +11900,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;
@@ -12043,6 +12034,8 @@ class MgControlBase extends GuiControlPropertyAdapter {
         }
     }
     getPIC() {
+        if (this._picExpExists)
+            this._pic.setFormatExp(this._picExpExists);
         return this._pic;
     }
     getParent() {
@@ -12121,7 +12114,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();
@@ -12131,7 +12124,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)
@@ -13205,6 +13198,11 @@ class MgControlBase extends GuiControlPropertyAdapter {
                     if (prevMustInput !== (yield 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);
             }
@@ -13553,15 +13551,17 @@ class MgControlBase extends GuiControlPropertyAdapter {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isTextControl() && this.checkIfExistProp(PropInterface.PROP_TYPE_CONNECTED_ZOOM_CONTROL)) {
                 let connectedButton = this.Form.CtrlTab.GetControlByIsn((yield (yield this.getProp(PropInterface.PROP_TYPE_CONNECTED_ZOOM_CONTROL)).getValueInt()));
-                let imageFileName = null;
-                if (connectedButton.IsImageButton() && connectedButton.PropertyExists(PropInterface.PROP_TYPE_IMAGE_FILENAME)) {
-                    imageFileName = yield (yield 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 = yield (yield 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;
             }
         });
     }
@@ -14123,13 +14123,8 @@ class MgFormBase extends GuiFormPropertyAdapter {
         if (idx >= 0 && idx < this.Rows.length)
             this.Rows.set_Item(idx, new Row(false, false));
     }
-    SelectRow(sendAlwaysOrRowIdx, sendAlways) {
-        if (arguments.length === 0)
-            this.SelectRow_0();
-        else if (arguments.length === 1)
-            this.SelectRow_1(sendAlwaysOrRowIdx);
-        else
-            this.SelectRow_2(sendAlwaysOrRowIdx, sendAlways);
+    SelectRow() {
+        this.SelectRowByIdx(this.DisplayLine);
     }
     getRowsInPage() {
         return this._rowsInPage;
@@ -14369,19 +14364,13 @@ class MgFormBase extends GuiFormPropertyAdapter {
             this.Rows.SetSize(idx + 1);
         this.Rows.set_Item(idx, new Row(true, true));
     }
-    SelectRow_0() {
-        this.SelectRow(false);
-    }
-    SelectRow_1(sendAlways) {
-        this.SelectRow(this.DisplayLine, sendAlways);
-    }
-    SelectRow_2(rowIdx, sendAlways) {
+    SelectRowByIdx(rowIdx) {
         let mainControl = this.getMainControl();
         if (mainControl !== null && this.RefreshRepeatableAllowed) {
             let index = rowIdx;
             if (this._task.DataView.isEmptyDataview())
                 index = GuiConstants.NO_ROW_SELECTED;
-            if (sendAlways || index !== this._prevSelIndex) {
+            if (index !== this._prevSelIndex) {
                 this._prevSelIndex = index;
                 Commands.addOperationWithLine(CommandType.SET_PROPERTY, mainControl, 0, HtmlProperties.SelectedRow, index);
             }
@@ -15615,9 +15604,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) {
@@ -15777,16 +15773,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;
@@ -15936,7 +15933,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;
@@ -16044,6 +16041,15 @@ class GuiTaskBase {
             }
         });
     }
+    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)
@@ -16107,7 +16113,7 @@ class GuiTaskBase {
     }
     CalculateExpression(expId, resType, length) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Promise.resolve('');
+            return Promise.resolve("");
         });
     }
     isStarted() {
@@ -16195,7 +16201,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);