作者 Karson

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

优化后台修改用户名和密码的autocomplete
@@ -393,7 +393,7 @@ class Auth extends \fast\Auth @@ -393,7 +393,7 @@ class Auth extends \fast\Auth
393 } 393 }
394 // 构造菜单数据 394 // 构造菜单数据
395 Tree::instance()->init($ruleList); 395 Tree::instance()->init($ruleList);
396 - $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"'); 396 + $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"');
397 return $menu; 397 return $menu;
398 } 398 }
399 399
@@ -20,13 +20,13 @@ @@ -20,13 +20,13 @@
20 <div class="form-group"> 20 <div class="form-group">
21 <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label> 21 <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
22 <div class="col-xs-12 col-sm-8"> 22 <div class="col-xs-12 col-sm-8">
23 - <input type="text" class="form-control" id="nickname" name="row[nickname]" value="" data-rule="required;username" /> 23 + <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="" data-rule="required;username" />
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label> 27 <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
28 <div class="col-xs-12 col-sm-8"> 28 <div class="col-xs-12 col-sm-8">
29 - <input type="password" class="form-control" id="password" name="row[password]" value="" data-rule="required;password" /> 29 + <input type="password" class="form-control" id="password" name="row[password]" autocomplete="new-password" value="" data-rule="required;password" />
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="form-group"> 32 <div class="form-group">
@@ -20,13 +20,13 @@ @@ -20,13 +20,13 @@
20 <div class="form-group"> 20 <div class="form-group">
21 <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label> 21 <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
22 <div class="col-xs-12 col-sm-8"> 22 <div class="col-xs-12 col-sm-8">
23 - <input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$row.nickname}" data-rule="required" /> 23 + <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="{$row.nickname}" data-rule="required" />
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label> 27 <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
28 <div class="col-xs-12 col-sm-8"> 28 <div class="col-xs-12 col-sm-8">
29 - <input type="password" class="form-control" id="password" name="row[password]" value="" data-rule="password" /> 29 + <input type="password" class="form-control" id="password" name="row[password]" autocomplete="new-password" value="" data-rule="password" />
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="form-group"> 32 <div class="form-group">
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 </div> 63 </div>
64 <div class="form-group"> 64 <div class="form-group">
65 <label for="password" class="control-label">{:__('Password')}:</label> 65 <label for="password" class="control-label">{:__('Password')}:</label>
66 - <input type="text" class="form-control" placeholder="{:__('Leave password blank if dont want to change')}" name="row[password]" value=""/> 66 + <input type="text" class="form-control" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" name="row[password]" value=""/>
67 </div> 67 </div>
68 <div class="form-group"> 68 <div class="form-group">
69 <button type="submit" class="btn btn-success">{:__('Submit')}</button> 69 <button type="submit" class="btn btn-success">{:__('Submit')}</button>
@@ -350,7 +350,8 @@ class Tree @@ -350,7 +350,8 @@ class Tree
350 $childlist = strtr($childlist, array('@class' => $childdata ? 'last' : '')); 350 $childlist = strtr($childlist, array('@class' => $childdata ? 'last' : ''));
351 $value = array( 351 $value = array(
352 '@childlist' => $childlist, 352 '@childlist' => $childlist,
353 - '@url' => $childdata || !isset($value['@url']) ? "javascript:;" : url($value['@url']) . (stripos($value['@url'], "?") !== false ? "&" : "?") . "ref=addtabs", 353 + '@url' => $childdata || !isset($value['@url']) ? "javascript:;" : url($value['@url']),
  354 + '@addtabs' => $childdata || !isset($value['@url']) ? "" : (stripos($value['@url'], "?") !== false ? "&" : "?") . "ref=addtabs",
354 '@caret' => ($childdata && (!isset($value['@badge']) || !$value['@badge']) ? '<i class="fa fa-angle-left"></i>' : ''), 355 '@caret' => ($childdata && (!isset($value['@badge']) || !$value['@badge']) ? '<i class="fa fa-angle-left"></i>' : ''),
355 '@badge' => isset($value['@badge']) ? $value['@badge'] : '', 356 '@badge' => isset($value['@badge']) ? $value['@badge'] : '',
356 '@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''), 357 '@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''),