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

新增Api和Index模块下指定URL前缀不匹配路由。 

修复后台图片预览一处BUG
pull/184/MERGE
Karson 2020-05-01 23:02:32 +08:00
parent 1a81c45317
commit b06d963a4a
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,16 @@ use think\Loader;
class Common
{
public function appDispatch(&$dispatch)
{
$pathinfoArr = explode('/', request()->pathinfo());
if (!Config::get('url_domain_deploy') && $pathinfoArr && in_array($pathinfoArr[0], ['index', 'api'])) {
//如果是以index或api开始的URL则关闭路由检测
\think\App::route(false);
}
}
public function moduleInit(&$request)
{
// 设置mbstring字符编码

4
application/tags.php
View File

@ -15,6 +15,10 @@ return [
'app_init' => [],
// 应用开始
'app_begin' => [],
// 应用调度
'app_dispatch' => [
'app\\common\\behavior\\Common',
],
// 模块初始化
'module_init' => [
'app\\common\\behavior\\Common',

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

File diff suppressed because one or more lines are too long

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

@ -4,7 +4,7 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
config: {
container: document.body,
classname: '.plupload:not([initialized])',
previewtpl: '<li class="col-xs-3"><a href="<%=fullurl%>" data-url="<%=url%>" target="_blank" class="thumbnail"><img src="<%=fullurl%>" onerror="this.src=\'' + Fast.api.fixurl("ajax/icon") + '?suffix=\'+\'<%=fullurl%>\'.split(\'.\').pop();this.onerror=null;" class="img-responsive"></a><a href="javascript:;" class="btn btn-danger btn-xs btn-trash"><i class="fa fa-trash"></i></a></li>',
previewtpl: '<li class="col-xs-3"><a href="<%=fullurl%>" data-url="<%=url%>" target="_blank" class="thumbnail"><img src="<%=fullurl%>" onerror="this.src=\'' + Fast.api.fixurl("ajax/icon") + '?suffix=<%=suffix%>\';this.onerror=null;" class="img-responsive"></a><a href="javascript:;" class="btn btn-danger btn-xs btn-trash"><i class="fa fa-trash"></i></a></li>',
},
events: {
onInit: function (up) {
@ -303,7 +303,9 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
if (!j) {
return true;
}
var data = {url: j, fullurl: Fast.api.cdnurl(j), data: $(that).data(), key: i, index: i, value: (json && typeof json[i] !== 'undefined' ? json[i] : null)};
var suffix = /[\.]?([a-zA-Z0-9]+)$/.exec(j);
suffix = suffix ? suffix[1] : 'file';
var data = {url: j, fullurl: Fast.api.cdnurl(j), data: $(that).data(), key: i, index: i, value: (json && typeof json[i] !== 'undefined' ? json[i] : null), suffix: suffix};
var html = tpl ? Template(tpl, data) : Template.render(Upload.config.previewtpl, data);
$("#" + preview_id).append(html);
});