!491 !481 修复本地时间参数无效、修复 __ 函数的参数传递错误

Merge pull request !491 from Karson/develop

Gruntfile.js

@@ -14,7 +14,7 @@ module.exports = function (grunt) {
             compile: {
                 options: type === 'js' ? {
                     optimizeCss: "standard",
-                    optimize: "none",   //可使用uglify|closure|none
+                    optimize: "uglify",   //可使用uglify|closure|none
                     preserveLicenseComments: true,
                     removeCombined: false,
                     baseUrl: "./public/assets/js/",    //JS文件所在的基础目录
@@ -23,7 +23,7 @@ module.exports = function (grunt) {
                 } : {
                     optimizeCss: "default",
                     optimize: "uglify",   //可使用uglify|closure|none
-                    cssIn: "./public/assets/css/" + module + ".css",    //JS文件所在的基础目录
+                    cssIn: "./public/assets/css/" + module + ".css",    //CSS文件所在的基础目录
                     out: "./public/assets/css/" + module + ".min.css"  //目标文件
                 }
             }
@@ -125,7 +125,8 @@ module.exports = function (grunt) {
         // 兼容bower历史路径文件
         files = [...files,
             {src: nodeModulesDir + "/toastr/build/toastr.min.css", dest: "public/assets/libs/toastr/toastr.min.css"},
-            {src: nodeModulesDir + "/bootstrap-slider/dist/css/bootstrap-slider.css", dest: "public/assets/libs/bootstrap-slider/slider.css"}
+            {src: nodeModulesDir + "/bootstrap-slider/dist/css/bootstrap-slider.css", dest: "public/assets/libs/bootstrap-slider/slider.css"},
+            {expand: true, cwd: nodeModulesDir + "/bootstrap-slider/dist", src: ["*.js"], dest: "public/assets/libs/bootstrap-slider/"}
         ]
 
         grunt.config.set('copy.main.files', files);

public/assets/js/require-table.js

@@ -788,6 +788,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     if (typeof this.custom !== 'undefined') {
                         custom = $.extend(custom, this.custom);
                     }
+                    value = row[this.field] || value;
                     value = value == null || value.length === 0 ? '' : value.toString();
                     var keys = typeof this.searchList === 'object' ? Object.keys(this.searchList) : [];
                     var index = keys.indexOf(value);
@@ -800,6 +801,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     if (!display) {
                         display = __(value.charAt(0).toUpperCase() + value.slice(1));
                     }
+                    value = Fast.api.escape(value);
+                    display = Fast.api.escape(display);
                     var html = '<span class="text-' + color + '">' + (icon ? '<i class="' + icon + '"></i> ' : '') + display + '</span>';
                     if (this.operate != false) {
                         html = '<a href="javascript:;" class="searchit" data-toggle="tooltip" title="' + __('Click to search %s', display) + '" data-field="' + this.field + '" data-value="' + value + '">' + html + '</a>';
@@ -896,6 +899,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                             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));
+                        value = Fast.api.escape(value);
+                        display = Fast.api.escape(display);
                         label = '<span class="label label-' + color + '">' + display + '</span>';
                         if (that.operate) {
                             html.push('<a href="javascript:;" class="searchit" data-toggle="tooltip" title="' + __('Click to search %s', display) + '" data-field="' + field + '" data-value="' + value + '">' + label + '</a>');