From e52bc79f52501e740138e0a2615b4beb0d5658f6 Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 23 Sep 2022 11:20:38 +0800 Subject: [PATCH] Changed Roo/form/BasicForm.jsdocs/json/roodata.jsondocs/src/Roo_form_BasicForm.js.htmldocs/symbols/Roo.form.BasicForm.jsondocs/symbols/Roo.form.Form.jsonroojs-debug.jsroojs-ui-debug.js --- Roo/form/BasicForm.js | 8 +++++++- docs/json/roodata.json | 4 ++-- docs/src/Roo_form_BasicForm.js.html | 2 +- docs/symbols/Roo.form.BasicForm.json | 2 +- docs/symbols/Roo.form.Form.json | 2 +- roojs-debug.js | 2 +- roojs-ui-debug.js | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Roo/form/BasicForm.js b/Roo/form/BasicForm.js index 67472d0d1a..130319acb0 100644 --- a/Roo/form/BasicForm.js +++ b/Roo/form/BasicForm.js @@ -507,6 +507,9 @@ clientValidation Boolean Applies to submit only. Pass true to call fo for(id in values){ if(typeof values[id] != 'function' && (field = this.findField(id))){ + + + if (field.setFromData && field.valueField && field.displayField && @@ -521,6 +524,9 @@ clientValidation Boolean Applies to submit only. Pass true to call fo sd[field.displayField] = typeof(values[field.name]) == 'undefined' ? '' : values[field.name]; field.setFromData(sd); + } else if (field.inputType && field.inputType == 'radio') { + + field.setValue(values[id]); } else { field.setValue(values[id]); } @@ -546,7 +552,7 @@ clientValidation Boolean Applies to submit only. Pass true to call fo /** * Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name * they are returned as an array. - * @param {Boolean} asString (default false) + * @param {Boolean} asString (def) * @return {Object} */ getValues : function(asString) diff --git a/docs/json/roodata.json b/docs/json/roodata.json index 3c8a71cb12..485b3f2ade 100644 --- a/docs/json/roodata.json +++ b/docs/json/roodata.json @@ -216152,7 +216152,7 @@ { "name" : "asString", "type" : "Boolean", - "desc" : "", + "desc" : "(default false)", "isOptional" : false } ], @@ -244914,7 +244914,7 @@ { "name" : "asString", "type" : "Boolean", - "desc" : "", + "desc" : "(default false)", "isOptional" : false } ], diff --git a/docs/src/Roo_form_BasicForm.js.html b/docs/src/Roo_form_BasicForm.js.html index 1210410928..e0a4d541ad 100644 --- a/docs/src/Roo_form_BasicForm.js.html +++ b/docs/src/Roo_form_BasicForm.js.html @@ -546,7 +546,7 @@ clientValidation Boolean Applies to submit only. Pass true to call fo /** * Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name * they are returned as an array. - * @param {Boolean} asString + * @param {Boolean} asString (default false) * @return {Object} */ getValues : function(asString) diff --git a/docs/symbols/Roo.form.BasicForm.json b/docs/symbols/Roo.form.BasicForm.json index f220c778f8..32cc83a2ac 100644 --- a/docs/symbols/Roo.form.BasicForm.json +++ b/docs/symbols/Roo.form.BasicForm.json @@ -286,7 +286,7 @@ { "name" : "asString", "type" : "Boolean", - "desc" : "", + "desc" : "(default false)", "isOptional" : false } ], diff --git a/docs/symbols/Roo.form.Form.json b/docs/symbols/Roo.form.Form.json index 75d14e3f19..4b50cc6c54 100644 --- a/docs/symbols/Roo.form.Form.json +++ b/docs/symbols/Roo.form.Form.json @@ -808,7 +808,7 @@ { "name" : "asString", "type" : "Boolean", - "desc" : "", + "desc" : "(default false)", "isOptional" : false } ], diff --git a/roojs-debug.js b/roojs-debug.js index 0e683fb6a6..beb5f4311c 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -54329,7 +54329,7 @@ clientValidation Boolean Applies to submit only. Pass true to call fo /** * Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name * they are returned as an array. - * @param {Boolean} asString + * @param {Boolean} asString (default false) * @return {Object} */ getValues : function(asString) diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 94e89a3cdd..b0e0a8689a 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -29830,7 +29830,7 @@ clientValidation Boolean Applies to submit only. Pass true to call fo /** * Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name * they are returned as an array. - * @param {Boolean} asString + * @param {Boolean} asString (default false) * @return {Object} */ getValues : function(asString) -- 2.39.2