diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 3556bd4e..fbeff7cd 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -131,7 +131,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table return __('Common search'); }, formatCommonSubmitButton: function () { - return __('Submit'); + return __('Search'); }, formatCommonResetButton: function () { return __('Reset'); @@ -764,7 +764,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(value); suffix = suffix ? suffix[1] : 'file'; url = Fast.api.fixurl("ajax/icon?suffix=" + suffix); - html.push(''); + html.push(''); }); return html.join(' '); }, @@ -892,7 +892,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table var color, display, label; $.each(arr, function (i, value) { value = value == null || value.length === 0 ? '' : value.toString(); - if (value == '') + if (value === '') return true; color = value && typeof colorArr[value] !== 'undefined' ? colorArr[value] : 'primary'; display = typeof that.searchList !== 'undefined' && typeof that.searchList[value] !== 'undefined' ? that.searchList[value] : __(value.charAt(0).toUpperCase() + value.slice(1));