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

统一修改文件换行符 

修复后台提示两次的BUG
修复上传不能传xls和xlsx文件的BUG
pull/18/head
Karson 2017-11-07 23:15:14 +08:00
parent 65a3080da9
commit a0eca04ae9
54 changed files with 5682 additions and 5620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/common.php
View File

@ -114,7 +114,7 @@ function build_toolbar($btns = NULL, $attr = [])
continue; continue;
} }
list($href, $class, $icon, $text, $title) = $btnAttr[$v]; list($href, $class, $icon, $text, $title) = $btnAttr[$v];
$extend = $v == 'import' ? 'id="btn-import-' . \fast\Random::alpha() . '" data-url="ajax/upload" data-mimetype="csv,xsl,xslx" data-multiple="false"' : ''; $extend = $v == 'import' ? 'id="btn-import-' . \fast\Random::alpha() . '" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"' : '';
$html[] = '<a href="' . $href . '" class="' . $class . '" title="' . $title . '" ' . $extend . '><i class="' . $icon . '"></i> ' . $text . '</a>'; $html[] = '<a href="' . $href . '" class="' . $class . '" title="' . $title . '" ' . $extend . '><i class="' . $icon . '"></i> ' . $text . '</a>';
} }
return implode(' ', $html); return implode(' ', $html);

2
public/assets/css/backend.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -44,6 +44,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
parent.$(".btn-refresh").trigger("click"); parent.$(".btn-refresh").trigger("click");
var index = parent.Layer.getFrameIndex(window.name); var index = parent.Layer.getFrameIndex(window.name);
parent.Layer.close(index); parent.Layer.close(index);
return false;
}, function (data, ret) { }, function (data, ret) {
that.holdSubmit(false); that.holdSubmit(false);
submitBtn.removeClass("disabled"); submitBtn.removeClass("disabled");