Browse Source

Update `serializeFormToObject` method.

Fix #11809
pull/11811/head
maliming 5 years ago
parent
commit
ae4a1a6fec
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 34
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js

34
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js

@ -35,7 +35,7 @@
//change text //change text
if ($buttonInnerSpan.length && $button.attr('data-busy-text')) { if ($buttonInnerSpan.length && $button.attr('data-busy-text')) {
$button.data('buttonOriginalText', $buttonInnerSpan.html()); $button.data('buttonOriginalText', $buttonInnerSpan.html());
if ($button.data('busy-text-is-html')) { if ($button.data('busy-text-is-html')) {
$buttonInnerSpan.html($button.attr('data-busy-text')); $buttonInnerSpan.html($button.attr('data-busy-text'));
} else { } else {
@ -118,12 +118,9 @@
}); });
//map to object //map to object
var obj = {};
if (camelCase !== undefined ? camelCase : true) { var getVarName = function (v) {
data.forEach(function (d) { return v.toString().replace(/\(\)\s?=\>\s?/, '');
d.name = toCamelCase(d.name);
});
} }
var getNames = function (index, variable) { var getNames = function (index, variable) {
@ -138,16 +135,29 @@
return name; return name;
} }
var obj = {};
var objName = getVarName(() => obj);
if (camelCase !== undefined ? camelCase : true) {
data.forEach(function (d) {
d.name = toCamelCase(d.name);
});
}
data.map(function (x) { data.map(function (x) {
var names = x.name.split("."); var names = x.name.split(".");
for (var i = 0; i < names.length; i++) { var xName = getVarName(() => x);
if (eval('!obj[' + getNames(i, 'names') + ']')) { var namesName = getVarName(() => names);
eval('obj[' + getNames(i, 'names') + '] = {}');
var i = obj ? 0 : 1;
for (i = 0; i < names.length; i++) {
if (eval('!' + objName + '[' + getNames(i, '' + namesName + '') + ']')) {
eval('' + objName + '[' + getNames(i, '' + namesName + '') + '] = {}');
} }
} }
if ($.isEmptyObject(eval('obj[' + getNames(names.length - 1, 'names') + ']'))) { if ($.isEmptyObject(eval('' + objName + '[' + getNames(names.length - 1, '' + namesName + '') + ']'))) {
eval('obj[' + getNames(names.length - 1, 'names') + '] = x.value'); eval('' + objName + '[' + getNames(names.length - 1, '' + namesName + '') + '] = ' + xName + '.value');
} }
}); });
@ -190,4 +200,4 @@
}); });
}; };
})(jQuery); })(jQuery);

Loading…
Cancel
Save