|
@@ -31,7 +31,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
target: function (input) {
|
|
|
var target = $(input).data("target");
|
|
|
- if (target && $(target).size() > 0) {
|
|
|
+ if (target && $(target).length > 0) {
|
|
|
return $(target);
|
|
|
}
|
|
|
var $formitem = $(input).closest('.form-group'),
|
|
@@ -96,7 +96,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
selectpicker: function (form) {
|
|
|
//绑定select元素事件
|
|
|
- if ($(".selectpicker", form).size() > 0) {
|
|
|
+ if ($(".selectpicker", form).length > 0) {
|
|
|
require(['bootstrap-select', 'bootstrap-select-lang'], function () {
|
|
|
$('.selectpicker', form).selectpicker();
|
|
|
$(form).on("reset", function () {
|
|
@@ -109,7 +109,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
selectpage: function (form) {
|
|
|
//绑定selectpage元素事件
|
|
|
- if ($(".selectpage", form).size() > 0) {
|
|
|
+ if ($(".selectpage", form).length > 0) {
|
|
|
require(['selectpage'], function () {
|
|
|
$('.selectpage', form).selectPage({
|
|
|
eAjaxSuccess: function (data) {
|
|
@@ -135,7 +135,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
cxselect: function (form) {
|
|
|
//绑定cxselect元素事件
|
|
|
- if ($("[data-toggle='cxselect']", form).size() > 0) {
|
|
|
+ if ($("[data-toggle='cxselect']", form).length > 0) {
|
|
|
require(['cxselect'], function () {
|
|
|
$.cxSelect.defaults.jsonName = 'name';
|
|
|
$.cxSelect.defaults.jsonValue = 'value';
|
|
@@ -146,7 +146,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
citypicker: function (form) {
|
|
|
//绑定城市远程插件
|
|
|
- if ($("[data-toggle='city-picker']", form).size() > 0) {
|
|
|
+ if ($("[data-toggle='city-picker']", form).length > 0) {
|
|
|
require(['citypicker'], function () {
|
|
|
$(form).on("reset", function () {
|
|
|
setTimeout(function () {
|
|
@@ -158,7 +158,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
datetimepicker: function (form) {
|
|
|
//绑定日期时间元素事件
|
|
|
- if ($(".datetimepicker", form).size() > 0) {
|
|
|
+ if ($(".datetimepicker", form).length > 0) {
|
|
|
require(['bootstrap-datetimepicker'], function () {
|
|
|
var options = {
|
|
|
format: 'YYYY-MM-DD HH:mm:ss',
|
|
@@ -185,7 +185,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
daterangepicker: function (form) {
|
|
|
//绑定日期时间元素事件
|
|
|
- if ($(".datetimerange", form).size() > 0) {
|
|
|
+ if ($(".datetimerange", form).length > 0) {
|
|
|
require(['bootstrap-daterangepicker'], function () {
|
|
|
var ranges = {};
|
|
|
ranges[__('Today')] = [Moment().startOf('day'), Moment().endOf('day')];
|
|
@@ -239,13 +239,13 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
*/
|
|
|
faupload: function (form) {
|
|
|
//绑定上传元素事件
|
|
|
- if ($(".plupload,.faupload", form).size() > 0) {
|
|
|
+ if ($(".plupload,.faupload", form).length > 0) {
|
|
|
Upload.api.upload($(".plupload,.faupload", form));
|
|
|
}
|
|
|
},
|
|
|
faselect: function (form) {
|
|
|
//绑定fachoose选择附件事件
|
|
|
- if ($(".faselect,.fachoose", form).size() > 0) {
|
|
|
+ if ($(".faselect,.fachoose", form).length > 0) {
|
|
|
$(".faselect,.fachoose", form).off('click').on('click', function () {
|
|
|
var that = this;
|
|
|
var multiple = $(this).data("multiple") ? $(this).data("multiple") : false;
|
|
@@ -294,7 +294,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
fieldlist: function (form) {
|
|
|
//绑定fieldlist
|
|
|
- if ($(".fieldlist", form).size() > 0) {
|
|
|
+ if ($(".fieldlist", form).length > 0) {
|
|
|
require(['dragsort', 'template'], function (undefined, Template) {
|
|
|
//刷新隐藏textarea的值
|
|
|
var refresh = function (container) {
|
|
@@ -432,7 +432,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
var switcher = $.proxy(function () {
|
|
|
var input = $(this).prev("input");
|
|
|
input = $(this).data("input-id") ? $("#" + $(this).data("input-id")) : input;
|
|
|
- if (input.size() > 0) {
|
|
|
+ if (input.length > 0) {
|
|
|
var yes = $(this).data("yes");
|
|
|
var no = $(this).data("no");
|
|
|
if (input.val() == yes) {
|
|
@@ -461,7 +461,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
|
|
|
},
|
|
|
slider: function (form) {
|
|
|
- if ($(".slider", form).size() > 0) {
|
|
|
+ if ($(".slider", form).length > 0) {
|
|
|
require(['bootstrap-slider'], function () {
|
|
|
$('.slider').removeClass('hidden').css('width', function (index, value) {
|
|
|
return $(this).parents('.form-control').width();
|
|
@@ -475,14 +475,14 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
}
|
|
|
},
|
|
|
tagsinput: function (form) {
|
|
|
- if ($("[data-role='tagsinput']", form).size() > 0) {
|
|
|
+ if ($("[data-role='tagsinput']", form).length > 0) {
|
|
|
require(['tagsinput', 'autocomplete'], function () {
|
|
|
$("[data-role='tagsinput']").tagsinput();
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
autocomplete: function (form) {
|
|
|
- if ($("[data-role='autocomplete']", form).size() > 0) {
|
|
|
+ if ($("[data-role='autocomplete']", form).length > 0) {
|
|
|
require(['autocomplete'], function () {
|
|
|
$("[data-role='autocomplete']").autocomplete();
|
|
|
});
|
|
@@ -512,9 +512,12 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
}
|
|
|
};
|
|
|
// @formatter:on
|
|
|
- var dataArr = form.serializeArray(), dataObj = {};
|
|
|
+ var dataArr = form.serializeArray(), dataObj = {}, fieldName, fieldValue;
|
|
|
$(dataArr).each(function (i, field) {
|
|
|
- dataObj[field.name] = field.value;
|
|
|
+ fieldName = field.name;
|
|
|
+ fieldValue = field.value;
|
|
|
+ fieldName = fieldName.substr(-2) === '[]' ? fieldName.substr(0, fieldName.length - 2) : fieldName;
|
|
|
+ dataObj[fieldName] = typeof dataObj[fieldName] !== 'undefined' ? [dataObj[fieldName], fieldValue].join(',') : fieldValue;
|
|
|
});
|
|
|
|
|
|
$.each(conditionArr, function (i, item) {
|
|
@@ -536,6 +539,9 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
return false;
|
|
|
}
|
|
|
var objvalue = dataObj[chkname];
|
|
|
+ if ($.isArray(objvalue)) {
|
|
|
+ objvalue = dataObj[chkname].join(",");
|
|
|
+ }
|
|
|
if (['>', '>=', '<', '<='].indexOf(operator) > -1) {
|
|
|
objvalue = parseFloat(objvalue);
|
|
|
value = parseFloat(value);
|
|
@@ -574,7 +580,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
},
|
|
|
api: {
|
|
|
submit: function (form, success, error, submit) {
|
|
|
- if (form.size() === 0) {
|
|
|
+ if (form.length === 0) {
|
|
|
Toastr.error("表单未初始化完成,无法提交");
|
|
|
return false;
|
|
|
}
|
|
@@ -590,7 +596,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
|
|
//修复当存在多选项元素时提交的BUG
|
|
|
var params = {};
|
|
|
var multipleList = $("[name$='[]']", form);
|
|
|
- if (multipleList.size() > 0) {
|
|
|
+ if (multipleList.length > 0) {
|
|
|
var postFields = form.serializeArray().map(function (obj) {
|
|
|
return $(obj).prop("name");
|
|
|
});
|