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

新增默认支持LIKE %...%中*表示任意字符的功能 

修正调试模式下的version值
修复附件管理链接错误的BUG
修复普通搜索在多表格显示下错误渲染的BUG
pull/323483/MERGE
Karson 2017-06-05 10:00:04 +08:00
parent 7f8e899948
commit 84c394aad2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/common/behavior/Common.php
View File

@ -26,7 +26,7 @@ class Common
Config::set('upload.cdnurl', $cdnurl);
}
// 如果是调试模式将version置为当前的时间戳可避免缓存
if (!Config::get('app_debug'))
if (Config::get('app_debug'))
{
Config::set('site.version', time());
}

2
public/assets/js/backend/general/attachment.js
View File

@ -119,7 +119,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
}
},
url: function (value, row, index) {
return '<a href="' + Backend.api.cdnurl(value) + '" target="_blank" class="label bg-green">' + value + '</a>';
return '<a href="' + row.fullurl + '" target="_blank" class="label bg-green">' + value + '</a>';
},
}
}

4
public/assets/js/bootstrap-table-commonsearch.js
View File

@ -18,7 +18,7 @@
var vModal = sprintf("<div id=\"commonSearchContent_%s\" class=\"common-search-table %s\">", that.options.idTable, that.options.searchFormVisible ? "" : "hidden");
vModal += vFormCommon.join('');
vModal += "</div>";
$("#myTabContent").before($(vModal));
that.$container.prepend($(vModal));
var form = $("#commonSearchForm" + "_" + that.options.idTable);
@ -181,7 +181,7 @@
var value = $("[name='" + name + "']:checked").val();
}
} else {
var value = (typeof vObjCol.process === 'function') ? vObjCol.process(obj.val()) : obj.val();
var value = (typeof vObjCol.process === 'function') ? vObjCol.process(obj.val()) : (sym == 'LIKE %...%' ? obj.val().replace(/\*/g, '%') : obj.val());
}
if (value == '' && sym.indexOf("NULL") == -1) {
return true;