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

修复通过JS刷新彩色角标不工作的BUG 

优化后台修改用户名和密码的autocomplete
pull/27/head
Karson 2017-12-01 17:00:48 +08:00
parent 02759ae2f8
commit c156a472cc
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/library/Auth.php
View File

@ -393,7 +393,7 @@ class Auth extends \fast\Auth
} }
// 构造菜单数据 // 构造菜单数据
Tree::instance()->init($ruleList); Tree::instance()->init($ruleList);
$menu = Tree::instance()->getTreeMenu(0, '<li class="@class"><a href="@url" addtabs="@id" url="@url" py="@py" pinyin="@pinyin"><i class="@icon"></i> <span>@title</span> <span class="pull-right-container">@caret @badge</span></a> @childlist</li>', $select_id, '', 'ul', 'class="treeview-menu"'); $menu = Tree::instance()->getTreeMenu(0, '<li class="@class"><a href="@url@addtabs" addtabs="@id" url="@url" py="@py" pinyin="@pinyin"><i class="@icon"></i> <span>@title</span> <span class="pull-right-container">@caret @badge</span></a> @childlist</li>', $select_id, '', 'ul', 'class="treeview-menu"');
return $menu; return $menu;
} }

4
application/admin/view/auth/admin/add.html
View File

@ -20,13 +20,13 @@
<div class="form-group"> <div class="form-group">
<label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label> <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input type="text" class="form-control" id="nickname" name="row[nickname]" value="" data-rule="required;username" /> <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="" data-rule="required;username" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label> <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input type="password" class="form-control" id="password" name="row[password]" value="" data-rule="required;password" /> <input type="password" class="form-control" id="password" name="row[password]" autocomplete="new-password" value="" data-rule="required;password" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

4
application/admin/view/auth/admin/edit.html
View File

@ -20,13 +20,13 @@
<div class="form-group"> <div class="form-group">
<label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label> <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$row.nickname}" data-rule="required" /> <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="{$row.nickname}" data-rule="required" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label> <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input type="password" class="form-control" id="password" name="row[password]" value="" data-rule="password" /> <input type="password" class="form-control" id="password" name="row[password]" autocomplete="new-password" value="" data-rule="password" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

2
application/admin/view/general/profile/index.html
View File

@ -63,7 +63,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password" class="control-label">{:__('Password')}:</label> <label for="password" class="control-label">{:__('Password')}:</label>
<input type="text" class="form-control" placeholder="{:__('Leave password blank if dont want to change')}" name="row[password]" value=""/> <input type="text" class="form-control" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" name="row[password]" value=""/>
</div> </div>
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-success">{:__('Submit')}</button> <button type="submit" class="btn btn-success">{:__('Submit')}</button>

3
extend/fast/Tree.php
View File

@ -350,7 +350,8 @@ class Tree
$childlist = strtr($childlist, array('@class' => $childdata ? 'last' : '')); $childlist = strtr($childlist, array('@class' => $childdata ? 'last' : ''));
$value = array( $value = array(
'@childlist' => $childlist, '@childlist' => $childlist,
'@url' => $childdata || !isset($value['@url']) ? "javascript:;" : url($value['@url']) . (stripos($value['@url'], "?") !== false ? "&" : "?") . "ref=addtabs", '@url' => $childdata || !isset($value['@url']) ? "javascript:;" : url($value['@url']),
'@addtabs' => $childdata || !isset($value['@url']) ? "" : (stripos($value['@url'], "?") !== false ? "&" : "?") . "ref=addtabs",
'@caret' => ($childdata && (!isset($value['@badge']) || !$value['@badge']) ? '<i class="fa fa-angle-left"></i>' : ''), '@caret' => ($childdata && (!isset($value['@badge']) || !$value['@badge']) ? '<i class="fa fa-angle-left"></i>' : ''),
'@badge' => isset($value['@badge']) ? $value['@badge'] : '', '@badge' => isset($value['@badge']) ? $value['@badge'] : '',
'@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''), '@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''),