gd-sprest-bs 9.5.3 → 9.5.6

package/build/components/listForm/index.js

@@ -282,6 +282,7 @@ exports.ListForm.renderDisplayForm = function (props) {
 };
 // Render the edit form
 exports.ListForm.renderEditForm = function (props) {
+    var customControls = [];
     var mapper = {};
     var rows = [];
     var value = {};
@@ -762,10 +763,60 @@ exports.ListForm.renderEditForm = function (props) {
     };
     // Create the form object
     var formObj = {
-        appendControls: function (controls) { form.appendControls(controls); },
-        appendRows: function (rows) { form.appendRows(rows); },
+        appendControls: function (controls) {
+            // Append the controls
+            form.appendControls(controls);
+            // Wait for the controls to be loaded
+            setTimeout(function () {
+                // Parse the new controls
+                for (var i = 0; i < controls.length; i++) {
+                    var control = controls[i].name ? form.getControl(controls[i].name) : null;
+                    if (control) {
+                        // Append the control
+                        customControls.push(control);
+                    }
+                }
+            }, 10);
+        },
+        appendRows: function (rows) {
+            // Append the controls
+            form.appendRows(rows);
+            // Wait for the controls to be loaded
+            setTimeout(function () {
+                // Parse the rows
+                for (var i = 0; i < rows.length; i++) {
+                    // Parse the columns
+                    var columns = rows[i].columns;
+                    for (var j = 0; j < columns.length; j++) {
+                        // Get the control
+                        var control = columns[j].control && columns[j].control.name ? form.getControl(columns[j].control.name) : null;
+                        if (control) {
+                            // Append the control
+                            customControls.push(control);
+                        }
+                    }
+                }
+            }, 10);
+        },
         el: form.el,
-        getControl: function (fieldName) { return mapper[fieldName] ? mapper[fieldName].control : null; },
+        getControl: function (fieldName) {
+            // See if it's in the mapper
+            if (mapper[fieldName]) {
+                // Return the control
+                return mapper[fieldName].control;
+            }
+            // Parse the custom controls
+            for (var i = 0; i < customControls.length; i++) {
+                var control = customControls[i];
+                // See if this is the target control
+                if (control.props.name == fieldName) {
+                    // Return the control
+                    return control;
+                }
+            }
+            // Not found
+            return null;
+        },
         getItem: function () { return props.info.item; },
         getValues: getValues,
         isValid: function () {
@@ -781,6 +832,12 @@ exports.ListForm.renderEditForm = function (props) {
                 var controlIsValid = formField.isValid();
                 isValid = isValid && controlIsValid;
             }
+            // Parse the custom controls
+            for (var i = 0; i < customControls.length; i++) {
+                // Validate the form field and update the status flag
+                var controlIsValid = customControls[i].isValid;
+                isValid = isValid && controlIsValid;
+            }
             // Return the flag
             return isValid;
         },