mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化fieldlist键名排序 

优化上传预览
优化cdnurl
pull/445/MERGE
Karson 2023-06-09 15:06:54 +08:00
parent 5e6c32e04c
commit 3c32166b3b
5 changed files with 125 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/js/fast.js
View File

@ -103,8 +103,10 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
//获取修复后可访问的cdn链接 //获取修复后可访问的cdn链接
cdnurl: function (url, domain) { cdnurl: function (url, domain) {
var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i"); var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i");
if(typeof domain === 'undefined'){
var cdnurl = Config.upload.cdnurl; var cdnurl = Config.upload.cdnurl;
url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url; url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url;
}
if (domain && !rule.test(url)) { if (domain && !rule.test(url)) {
domain = typeof domain === 'string' ? domain : location.origin; domain = typeof domain === 'string' ? domain : location.origin;
url = domain + url; url = domain + url;

69
public/assets/js/require-backend.min.js vendored
View File

@ -776,8 +776,10 @@ define('fast',['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, u
//获取修复后可访问的cdn链接 //获取修复后可访问的cdn链接
cdnurl: function (url, domain) { cdnurl: function (url, domain) {
var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i"); var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i");
if(typeof domain === 'undefined'){
var cdnurl = Config.upload.cdnurl; var cdnurl = Config.upload.cdnurl;
url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url; url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url;
}
if (domain && !rule.test(url)) { if (domain && !rule.test(url)) {
domain = typeof domain === 'string' ? domain : location.origin; domain = typeof domain === 'string' ? domain : location.origin;
url = domain + url; url = domain + url;
@ -7686,9 +7688,10 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
$(document.body).on("keyup change", "#" + input_id, function (e) { $(document.body).on("keyup change", "#" + input_id, function (e) {
var inputStr = $("#" + input_id).val(); var inputStr = $("#" + input_id).val();
var inputArr = inputStr.split(/\,/); var inputArr = inputStr.split(/\,/);
$("#" + preview_id).empty(); var previewObj = $("#" + preview_id);
var tpl = $("#" + preview_id).data("template") ? $("#" + preview_id).data("template") : ""; previewObj.empty();
var extend = $("#" + preview_id).next().is("textarea") ? $("#" + preview_id).next("textarea").val() : "{}"; var tpl = previewObj.data("template") ? previewObj.data("template") : "";
var extend = previewObj.next().is("textarea") ? previewObj.next("textarea").val() : "{}";
var json = {}; var json = {};
try { try {
json = JSON.parse(extend); json = JSON.parse(extend);
@ -7700,13 +7703,15 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
} }
var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j); var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j);
suffix = suffix ? suffix[1] : 'file'; suffix = suffix ? suffix[1] : 'file';
j = Config.upload.fullmode ? Fast.api.cdnurl(j) : j; var btnData = $(that).data();
var fullurl = typeof btnData.cdnurl!=='undefined' ? Fast.api.cdnurl(j, btnData.cdnurl) : Fast.api.cdnurl(j);
j = Config.upload.fullmode ? fullurl : j;
var value = (json && typeof json[i] !== 'undefined' ? json[i] : null); var value = (json && typeof json[i] !== 'undefined' ? json[i] : null);
var data = {url: j, fullurl: Fast.api.cdnurl(j), data: $(that).data(), key: i, index: i, value: value, row: value, suffix: suffix}; var data = {url: j, fullurl: fullurl, data: btnData, key: i, index: i, value: value, row: value, suffix: suffix};
var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data); var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data);
$("#" + preview_id).append(html); previewObj.append(html);
}); });
refresh($("#" + preview_id).data("name")); refresh(previewObj.data("name"));
}); });
$("#" + input_id).trigger("change"); $("#" + input_id).trigger("change");
} }
@ -10186,6 +10191,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
//绑定select元素事件 //绑定select元素事件
if ($(".selectpicker", form).length > 0) { if ($(".selectpicker", form).length > 0) {
require(['bootstrap-select', 'bootstrap-select-lang'], function () { require(['bootstrap-select', 'bootstrap-select-lang'], function () {
$.fn.selectpicker.Constructor.BootstrapVersion = '3';
$('.selectpicker', form).selectpicker(); $('.selectpicker', form).selectpicker();
$(form).on("reset", function () { $(form).on("reset", function () {
setTimeout(function () { setTimeout(function () {
@ -10298,7 +10304,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
}; };
var origincallback = function (start, end) { var origincallback = function (start, end) {
$(this.element).val(start.format(this.locale.format) + " - " + end.format(this.locale.format)); $(this.element).val(start.format(this.locale.format) + " - " + end.format(this.locale.format));
$(this.element).trigger('blur'); $(this.element).trigger('change');
}; };
$(".datetimerange", form).each(function () { $(".datetimerange", form).each(function () {
var callback = typeof $(this).data('callback') == 'function' ? $(this).data('callback') : origincallback; var callback = typeof $(this).data('callback') == 'function' ? $(this).data('callback') : origincallback;
@ -10306,7 +10312,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
callback.call(picker, picker.startDate, picker.endDate); callback.call(picker, picker.startDate, picker.endDate);
}); });
$(this).on('cancel.daterangepicker', function (ev, picker) { $(this).on('cancel.daterangepicker', function (ev, picker) {
$(this).val('').trigger('blur'); $(this).val('').trigger('change');
}); });
$(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {})); $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {}));
}); });
@ -10405,15 +10411,15 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
$.each(data, function (i, j) { $.each(data, function (i, j) {
if (j) { if (j) {
if (!template) { if (!template) {
if (j.key != '') { if (j.key !== '') {
result[j.key] = j.value; result['__PLACEHOLDKEY__' + j.key] = j.value;
} }
} else { } else {
result.push(j); result.push(j);
} }
} }
}); });
textarea.val(JSON.stringify(result)); textarea.val(JSON.stringify(result).replace(/__PLACEHOLDKEY__/g, ''));
}; };
//追加一行数据 //追加一行数据
var append = function (container, row, initial) { var append = function (container, row, initial) {
@ -10481,11 +10487,12 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
$("[fieldlist-item]", container).remove(); $("[fieldlist-item]", container).remove();
var json = {}; var json = {};
try { try {
json = JSON.parse(textarea.val()); var val = textarea.val().replace(/"(\d+)"\:/g, "\"__PLACEHOLDERKEY__$1\":");
json = JSON.parse(val);
} catch (e) { } catch (e) {
} }
$.each(json, function (i, j) { $.each(json, function (i, j) {
append(container, {key: i, value: j}, true); append(container, {key: i.toString().replace("__PLACEHOLDERKEY__", ""), value: j}, true);
}); });
}); });
//拖拽排序 //拖拽排序
@ -10824,7 +10831,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
setTimeout(function () { setTimeout(function () {
that.onCommonSearch(); that.onCommonSearch();
}, 0); }, 10);
}); });
}; };
@ -10989,13 +10996,23 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
} else { } else {
value = process ? process(obj.val()) : obj.val(); value = process ? process(obj.val()) : obj.val();
} }
if (removeempty && (value == '' || value == null || ($.isArray(value) && value.length == 0)) && !sym.match(/null/i)) { if (removeempty && (value === '' || value == null || ($.isArray(value) && value.length === 0)) && !sym.match(/null/i)) {
return true; return true;
} }
op[name] = sym; op[name] = sym;
filter[name] = value; filter[name] = value;
}); });
if (that.options.searchCountTips) {
var count = 0;
$.each(filter, function (key, value) {
if ((value === '' || value == null || ($.isArray(value) && value.length === 0))) {
return true;
}
count++;
});
that.$toolbar.find(".btn-commonsearch > span").text(count).toggleClass("hidden", count === 0);
}
return {op: op, filter: filter}; return {op: op, filter: filter};
}; };
@ -11025,6 +11042,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
actionForm: "", actionForm: "",
searchFormTemplate: "", searchFormTemplate: "",
searchFormVisible: true, searchFormVisible: true,
searchCountTips: true,
searchClass: 'searchit', searchClass: 'searchit',
showSearch: true, showSearch: true,
renderDefault: true, renderDefault: true,
@ -11049,7 +11067,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
return "Common search"; return "Common search";
}, },
formatCommonSubmitButton: function () { formatCommonSubmitButton: function () {
return "Submit"; return "Search";
}, },
formatCommonResetButton: function () { formatCommonResetButton: function () {
return "Reset"; return "Reset";
@ -11092,8 +11110,11 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
html = []; html = [];
if (that.options.showSearch) { if (that.options.showSearch) {
html.push(sprintf('<div class="columns-%s pull-%s" style="margin-top:10px;margin-bottom:10px;">', this.options.buttonsAlign, this.options.buttonsAlign)); html.push(sprintf('<div class="columns-%s pull-%s" style="margin-top:10px;margin-bottom:10px;">', this.options.buttonsAlign, this.options.buttonsAlign));
html.push(sprintf('<button class="btn btn-default%s' + '" type="button" name="commonSearch" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatCommonSearch())); html.push(sprintf('<button class="btn btn-default btn-commonsearch %s' + '" type="button" name="commonSearch" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatCommonSearch()));
html.push(sprintf('<i class="%s %s"></i>', that.options.iconsPrefix, that.options.icons.commonSearchIcon)) if (that.options.searchCountTips) {
html.push(sprintf('<span class="label label-danger hidden">0</span>'));
}
html.push(sprintf('<i class="%s %s"></i>', that.options.iconsPrefix, that.options.icons.commonSearchIcon));
html.push('</button></div>'); html.push('</button></div>');
} }
if (that.$toolbar.find(".pull-right").length > 0) { if (that.$toolbar.find(".pull-right").length > 0) {
@ -11934,7 +11955,7 @@ define('table',['jquery', 'bootstrap'], function ($, undefined) {
return __('Common search'); return __('Common search');
}, },
formatCommonSubmitButton: function () { formatCommonSubmitButton: function () {
return __('Submit'); return __('Search');
}, },
formatCommonResetButton: function () { formatCommonResetButton: function () {
return __('Reset'); return __('Reset');
@ -13344,7 +13365,7 @@ define("drop", function(){});
} }
} }
} }
localStorage.setItem("addtabs", $(this).prop('outerHTML')); // localStorage.setItem("addtabs", $(this).prop('outerHTML'));
//激活TAB //激活TAB
tabitem.addClass('active'); tabitem.addClass('active');
conitem.addClass("active"); conitem.addClass("active");
@ -14009,9 +14030,11 @@ define("addtabs", function(){});
hidden_id = input_id; hidden_id = input_id;
//switch the id and name attributes of input/hidden element //switch the id and name attributes of input/hidden element
elem.hidden = $('<input type="hidden" class="sp_hidden" />').attr({ elem.hidden = elem.combo_input.clone().attr({
name: hidden_name, name: hidden_name,
id: hidden_id id: hidden_id,
type: 'hidden',
class: 'sp_hidden'
}).val(''); }).val('');
elem.combo_input.attr({ elem.combo_input.attr({
name: typeof input.data('name') !== 'undefined' ? input.data('name') : input_name + namePrefix, name: typeof input.data('name') !== 'undefined' ? input.data('name') : input_name + namePrefix,

16
public/assets/js/require-form.js
View File

@ -102,6 +102,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
//绑定select元素事件 //绑定select元素事件
if ($(".selectpicker", form).length > 0) { if ($(".selectpicker", form).length > 0) {
require(['bootstrap-select', 'bootstrap-select-lang'], function () { require(['bootstrap-select', 'bootstrap-select-lang'], function () {
$.fn.selectpicker.Constructor.BootstrapVersion = '3';
$('.selectpicker', form).selectpicker(); $('.selectpicker', form).selectpicker();
$(form).on("reset", function () { $(form).on("reset", function () {
setTimeout(function () { setTimeout(function () {
@ -214,7 +215,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
}; };
var origincallback = function (start, end) { var origincallback = function (start, end) {
$(this.element).val(start.format(this.locale.format) + " - " + end.format(this.locale.format)); $(this.element).val(start.format(this.locale.format) + " - " + end.format(this.locale.format));
$(this.element).trigger('blur'); $(this.element).trigger('change');
}; };
$(".datetimerange", form).each(function () { $(".datetimerange", form).each(function () {
var callback = typeof $(this).data('callback') == 'function' ? $(this).data('callback') : origincallback; var callback = typeof $(this).data('callback') == 'function' ? $(this).data('callback') : origincallback;
@ -222,7 +223,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
callback.call(picker, picker.startDate, picker.endDate); callback.call(picker, picker.startDate, picker.endDate);
}); });
$(this).on('cancel.daterangepicker', function (ev, picker) { $(this).on('cancel.daterangepicker', function (ev, picker) {
$(this).val('').trigger('blur'); $(this).val('').trigger('change');
}); });
$(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {})); $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {}));
}); });
@ -321,15 +322,15 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
$.each(data, function (i, j) { $.each(data, function (i, j) {
if (j) { if (j) {
if (!template) { if (!template) {
if (j.key != '') { if (j.key !== '') {
result[j.key] = j.value; result['__PLACEHOLDKEY__' + j.key] = j.value;
} }
} else { } else {
result.push(j); result.push(j);
} }
} }
}); });
textarea.val(JSON.stringify(result)); textarea.val(JSON.stringify(result).replace(/__PLACEHOLDKEY__/g, ''));
}; };
//追加一行数据 //追加一行数据
var append = function (container, row, initial) { var append = function (container, row, initial) {
@ -397,11 +398,12 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
$("[fieldlist-item]", container).remove(); $("[fieldlist-item]", container).remove();
var json = {}; var json = {};
try { try {
json = JSON.parse(textarea.val()); var val = textarea.val().replace(/"(\d+)"\:/g, "\"__PLACEHOLDERKEY__$1\":");
json = JSON.parse(val);
} catch (e) { } catch (e) {
} }
$.each(json, function (i, j) { $.each(json, function (i, j) {
append(container, {key: i, value: j}, true); append(container, {key: i.toString().replace("__PLACEHOLDERKEY__", ""), value: j}, true);
}); });
}); });
//拖拽排序 //拖拽排序

67
public/assets/js/require-frontend.min.js vendored
View File

@ -302,8 +302,10 @@ define('fast',['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, u
//获取修复后可访问的cdn链接 //获取修复后可访问的cdn链接
cdnurl: function (url, domain) { cdnurl: function (url, domain) {
var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i"); var rule = new RegExp("^((?:[a-z]+:)?\\/\\/|data:image\\/)", "i");
if(typeof domain === 'undefined'){
var cdnurl = Config.upload.cdnurl; var cdnurl = Config.upload.cdnurl;
url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url; url = rule.test(url) || (cdnurl && url.indexOf(cdnurl) === 0) ? url : cdnurl + url;
}
if (domain && !rule.test(url)) { if (domain && !rule.test(url)) {
domain = typeof domain === 'string' ? domain : location.origin; domain = typeof domain === 'string' ? domain : location.origin;
url = domain + url; url = domain + url;
@ -6969,9 +6971,10 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
$(document.body).on("keyup change", "#" + input_id, function (e) { $(document.body).on("keyup change", "#" + input_id, function (e) {
var inputStr = $("#" + input_id).val(); var inputStr = $("#" + input_id).val();
var inputArr = inputStr.split(/\,/); var inputArr = inputStr.split(/\,/);
$("#" + preview_id).empty(); var previewObj = $("#" + preview_id);
var tpl = $("#" + preview_id).data("template") ? $("#" + preview_id).data("template") : ""; previewObj.empty();
var extend = $("#" + preview_id).next().is("textarea") ? $("#" + preview_id).next("textarea").val() : "{}"; var tpl = previewObj.data("template") ? previewObj.data("template") : "";
var extend = previewObj.next().is("textarea") ? previewObj.next("textarea").val() : "{}";
var json = {}; var json = {};
try { try {
json = JSON.parse(extend); json = JSON.parse(extend);
@ -6983,13 +6986,15 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
} }
var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j); var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j);
suffix = suffix ? suffix[1] : 'file'; suffix = suffix ? suffix[1] : 'file';
j = Config.upload.fullmode ? Fast.api.cdnurl(j) : j; var btnData = $(that).data();
var fullurl = typeof btnData.cdnurl!=='undefined' ? Fast.api.cdnurl(j, btnData.cdnurl) : Fast.api.cdnurl(j);
j = Config.upload.fullmode ? fullurl : j;
var value = (json && typeof json[i] !== 'undefined' ? json[i] : null); var value = (json && typeof json[i] !== 'undefined' ? json[i] : null);
var data = {url: j, fullurl: Fast.api.cdnurl(j), data: $(that).data(), key: i, index: i, value: value, row: value, suffix: suffix}; var data = {url: j, fullurl: fullurl, data: btnData, key: i, index: i, value: value, row: value, suffix: suffix};
var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data); var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data);
$("#" + preview_id).append(html); previewObj.append(html);
}); });
refresh($("#" + preview_id).data("name")); refresh(previewObj.data("name"));
}); });
$("#" + input_id).trigger("change"); $("#" + input_id).trigger("change");
} }
@ -9469,6 +9474,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
//绑定select元素事件 //绑定select元素事件
if ($(".selectpicker", form).length > 0) { if ($(".selectpicker", form).length > 0) {
require(['bootstrap-select', 'bootstrap-select-lang'], function () { require(['bootstrap-select', 'bootstrap-select-lang'], function () {
$.fn.selectpicker.Constructor.BootstrapVersion = '3';
$('.selectpicker', form).selectpicker(); $('.selectpicker', form).selectpicker();
$(form).on("reset", function () { $(form).on("reset", function () {
setTimeout(function () { setTimeout(function () {
@ -9581,7 +9587,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
}; };
var origincallback = function (start, end) { var origincallback = function (start, end) {
$(this.element).val(start.format(this.locale.format) + " - " + end.format(this.locale.format)); $(this.element).val(start.format(this.locale.format) + " - " + end.format(this.locale.format));
$(this.element).trigger('blur'); $(this.element).trigger('change');
}; };
$(".datetimerange", form).each(function () { $(".datetimerange", form).each(function () {
var callback = typeof $(this).data('callback') == 'function' ? $(this).data('callback') : origincallback; var callback = typeof $(this).data('callback') == 'function' ? $(this).data('callback') : origincallback;
@ -9589,7 +9595,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
callback.call(picker, picker.startDate, picker.endDate); callback.call(picker, picker.startDate, picker.endDate);
}); });
$(this).on('cancel.daterangepicker', function (ev, picker) { $(this).on('cancel.daterangepicker', function (ev, picker) {
$(this).val('').trigger('blur'); $(this).val('').trigger('change');
}); });
$(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {})); $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {}));
}); });
@ -9688,15 +9694,15 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
$.each(data, function (i, j) { $.each(data, function (i, j) {
if (j) { if (j) {
if (!template) { if (!template) {
if (j.key != '') { if (j.key !== '') {
result[j.key] = j.value; result['__PLACEHOLDKEY__' + j.key] = j.value;
} }
} else { } else {
result.push(j); result.push(j);
} }
} }
}); });
textarea.val(JSON.stringify(result)); textarea.val(JSON.stringify(result).replace(/__PLACEHOLDKEY__/g, ''));
}; };
//追加一行数据 //追加一行数据
var append = function (container, row, initial) { var append = function (container, row, initial) {
@ -9764,11 +9770,12 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
$("[fieldlist-item]", container).remove(); $("[fieldlist-item]", container).remove();
var json = {}; var json = {};
try { try {
json = JSON.parse(textarea.val()); var val = textarea.val().replace(/"(\d+)"\:/g, "\"__PLACEHOLDERKEY__$1\":");
json = JSON.parse(val);
} catch (e) { } catch (e) {
} }
$.each(json, function (i, j) { $.each(json, function (i, j) {
append(container, {key: i, value: j}, true); append(container, {key: i.toString().replace("__PLACEHOLDERKEY__", ""), value: j}, true);
}); });
}); });
//拖拽排序 //拖拽排序
@ -10107,7 +10114,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
setTimeout(function () { setTimeout(function () {
that.onCommonSearch(); that.onCommonSearch();
}, 0); }, 10);
}); });
}; };
@ -10272,13 +10279,23 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
} else { } else {
value = process ? process(obj.val()) : obj.val(); value = process ? process(obj.val()) : obj.val();
} }
if (removeempty && (value == '' || value == null || ($.isArray(value) && value.length == 0)) && !sym.match(/null/i)) { if (removeempty && (value === '' || value == null || ($.isArray(value) && value.length === 0)) && !sym.match(/null/i)) {
return true; return true;
} }
op[name] = sym; op[name] = sym;
filter[name] = value; filter[name] = value;
}); });
if (that.options.searchCountTips) {
var count = 0;
$.each(filter, function (key, value) {
if ((value === '' || value == null || ($.isArray(value) && value.length === 0))) {
return true;
}
count++;
});
that.$toolbar.find(".btn-commonsearch > span").text(count).toggleClass("hidden", count === 0);
}
return {op: op, filter: filter}; return {op: op, filter: filter};
}; };
@ -10308,6 +10325,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
actionForm: "", actionForm: "",
searchFormTemplate: "", searchFormTemplate: "",
searchFormVisible: true, searchFormVisible: true,
searchCountTips: true,
searchClass: 'searchit', searchClass: 'searchit',
showSearch: true, showSearch: true,
renderDefault: true, renderDefault: true,
@ -10332,7 +10350,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
return "Common search"; return "Common search";
}, },
formatCommonSubmitButton: function () { formatCommonSubmitButton: function () {
return "Submit"; return "Search";
}, },
formatCommonResetButton: function () { formatCommonResetButton: function () {
return "Reset"; return "Reset";
@ -10375,8 +10393,11 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
html = []; html = [];
if (that.options.showSearch) { if (that.options.showSearch) {
html.push(sprintf('<div class="columns-%s pull-%s" style="margin-top:10px;margin-bottom:10px;">', this.options.buttonsAlign, this.options.buttonsAlign)); html.push(sprintf('<div class="columns-%s pull-%s" style="margin-top:10px;margin-bottom:10px;">', this.options.buttonsAlign, this.options.buttonsAlign));
html.push(sprintf('<button class="btn btn-default%s' + '" type="button" name="commonSearch" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatCommonSearch())); html.push(sprintf('<button class="btn btn-default btn-commonsearch %s' + '" type="button" name="commonSearch" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatCommonSearch()));
html.push(sprintf('<i class="%s %s"></i>', that.options.iconsPrefix, that.options.icons.commonSearchIcon)) if (that.options.searchCountTips) {
html.push(sprintf('<span class="label label-danger hidden">0</span>'));
}
html.push(sprintf('<i class="%s %s"></i>', that.options.iconsPrefix, that.options.icons.commonSearchIcon));
html.push('</button></div>'); html.push('</button></div>');
} }
if (that.$toolbar.find(".pull-right").length > 0) { if (that.$toolbar.find(".pull-right").length > 0) {
@ -11217,7 +11238,7 @@ define('table',['jquery', 'bootstrap'], function ($, undefined) {
return __('Common search'); return __('Common search');
}, },
formatCommonSubmitButton: function () { formatCommonSubmitButton: function () {
return __('Submit'); return __('Search');
}, },
formatCommonResetButton: function () { formatCommonResetButton: function () {
return __('Reset'); return __('Reset');
@ -13043,9 +13064,11 @@ define("drop", function(){});
hidden_id = input_id; hidden_id = input_id;
//switch the id and name attributes of input/hidden element //switch the id and name attributes of input/hidden element
elem.hidden = $('<input type="hidden" class="sp_hidden" />').attr({ elem.hidden = elem.combo_input.clone().attr({
name: hidden_name, name: hidden_name,
id: hidden_id id: hidden_id,
type: 'hidden',
class: 'sp_hidden'
}).val(''); }).val('');
elem.combo_input.attr({ elem.combo_input.attr({
name: typeof input.data('name') !== 'undefined' ? input.data('name') : input_name + namePrefix, name: typeof input.data('name') !== 'undefined' ? input.data('name') : input_name + namePrefix,

17
public/assets/js/require-upload.js
View File

@ -348,9 +348,10 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
$(document.body).on("keyup change", "#" + input_id, function (e) { $(document.body).on("keyup change", "#" + input_id, function (e) {
var inputStr = $("#" + input_id).val(); var inputStr = $("#" + input_id).val();
var inputArr = inputStr.split(/\,/); var inputArr = inputStr.split(/\,/);
$("#" + preview_id).empty(); var previewObj = $("#" + preview_id);
var tpl = $("#" + preview_id).data("template") ? $("#" + preview_id).data("template") : ""; previewObj.empty();
var extend = $("#" + preview_id).next().is("textarea") ? $("#" + preview_id).next("textarea").val() : "{}"; var tpl = previewObj.data("template") ? previewObj.data("template") : "";
var extend = previewObj.next().is("textarea") ? previewObj.next("textarea").val() : "{}";
var json = {}; var json = {};
try { try {
json = JSON.parse(extend); json = JSON.parse(extend);
@ -362,13 +363,15 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
} }
var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j); var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j);
suffix = suffix ? suffix[1] : 'file'; suffix = suffix ? suffix[1] : 'file';
j = Config.upload.fullmode ? Fast.api.cdnurl(j) : j; var btnData = $(that).data();
var fullurl = typeof btnData.cdnurl!=='undefined' ? Fast.api.cdnurl(j, btnData.cdnurl) : Fast.api.cdnurl(j);
j = Config.upload.fullmode ? fullurl : j;
var value = (json && typeof json[i] !== 'undefined' ? json[i] : null); var value = (json && typeof json[i] !== 'undefined' ? json[i] : null);
var data = {url: j, fullurl: Fast.api.cdnurl(j), data: $(that).data(), key: i, index: i, value: value, row: value, suffix: suffix}; var data = {url: j, fullurl: fullurl, data: btnData, key: i, index: i, value: value, row: value, suffix: suffix};
var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data); var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data);
$("#" + preview_id).append(html); previewObj.append(html);
}); });
refresh($("#" + preview_id).data("name")); refresh(previewObj.data("name"));
}); });
$("#" + input_id).trigger("change"); $("#" + input_id).trigger("change");
} }