From c156a472cc035f691bcb5f0e4c01b192a1af8e27 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 1 Dec 2017 17:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87JS=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=BD=A9=E8=89=B2=E8=A7=92=E6=A0=87=E4=B8=8D=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=9A=84BUG=20=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84autocomplete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/library/Auth.php                | 2 +-
 application/admin/view/auth/admin/add.html        | 4 ++--
 application/admin/view/auth/admin/edit.html       | 4 ++--
 application/admin/view/general/profile/index.html | 2 +-
 extend/fast/Tree.php                              | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index 8c31ecbb..0bdb26bd 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -393,7 +393,7 @@ class Auth extends \fast\Auth
         }
         // 构造菜单数据
         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;
     }
 
diff --git a/application/admin/view/auth/admin/add.html b/application/admin/view/auth/admin/add.html
index 0f3471c9..9ffc51f5 100644
--- a/application/admin/view/auth/admin/add.html
+++ b/application/admin/view/auth/admin/add.html
@@ -20,13 +20,13 @@
     <div class="form-group">
         <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <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 class="form-group">
         <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <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 class="form-group">
diff --git a/application/admin/view/auth/admin/edit.html b/application/admin/view/auth/admin/edit.html
index a1569a8f..b487438c 100644
--- a/application/admin/view/auth/admin/edit.html
+++ b/application/admin/view/auth/admin/edit.html
@@ -20,13 +20,13 @@
     <div class="form-group">
         <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <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 class="form-group">
         <label for="password" class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <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 class="form-group">
diff --git a/application/admin/view/general/profile/index.html b/application/admin/view/general/profile/index.html
index 0991a80c..f211abc8 100644
--- a/application/admin/view/general/profile/index.html
+++ b/application/admin/view/general/profile/index.html
@@ -63,7 +63,7 @@
                         </div>
                         <div class="form-group">
                             <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 class="form-group">
                             <button type="submit" class="btn btn-success">{:__('Submit')}</button>
diff --git a/extend/fast/Tree.php b/extend/fast/Tree.php
index 743878b1..1351f992 100644
--- a/extend/fast/Tree.php
+++ b/extend/fast/Tree.php
@@ -350,7 +350,8 @@ class Tree
                 $childlist = strtr($childlist, array('@class' => $childdata ? 'last' : ''));
                 $value = array(
                     '@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>' : ''),
                     '@badge'     => isset($value['@badge']) ? $value['@badge'] : '',
                     '@class'     => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''),