From c45b3f2c7a89337355406fb9e91e5f1b14a8fd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 21 Apr 2017 11:44:33 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E5=8E=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99load-open=E4=BA=8B=E4=BB=B6=E7=BB=91=E5=AE=9A=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8data-load=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/auth.index.html      |  2 +-
 application/extra/view/admin.main.left.html |  4 ++--
 application/extra/view/admin.main.top.html  |  2 +-
 application/wechat/view/keys.form.html      |  3 +++
 application/wechat/view/keys.index.html     |  4 ++--
 extend/controller/BasicAdmin.php            |  2 +-
 public/static/admin/listen.js               | 10 ++--------
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/application/admin/view/auth.index.html b/application/admin/view/auth.index.html
index 1e83eb9d7..57a4b5699 100644
--- a/application/admin/view/auth.index.html
+++ b/application/admin/view/auth.index.html
@@ -50,7 +50,7 @@
                     {/if}
                     {if auth("$classuri/apply")}
                     <span class="text-explode">|</span>
-                    <a data-open='{:url("$classuri/apply")}?id={$vo.id}' href="javascript:void(0)">授权</a>
+                    <a data-load='{:url("$classuri/apply")}?id={$vo.id}' href="javascript:void(0)">授权</a>
                     {/if}
                     {if $vo.status eq 1 and auth("$classuri/forbid")}
                     <span class="text-explode">|</span>
diff --git a/application/extra/view/admin.main.left.html b/application/extra/view/admin.main.left.html
index 09a00190c..bb80a766c 100644
--- a/application/extra/view/admin.main.left.html
+++ b/application/extra/view/admin.main.left.html
@@ -12,7 +12,7 @@
                     {empty name='menu.sub'}
                     <ul class="sidebar-trans">
                         <li class="nav-item">
-                            <a data-menu-node='m-{$pmenu.id}-{$menu.id}' data-open="{$menu.url}"
+                            <a data-menu-node='m-{$pmenu.id}-{$menu.id}' data-load="{$menu.url}"
                                class="sidebar-trans">
                                 <div class="nav-icon sidebar-trans">
                                     <span class="{$menu.icon|default='fa fa-link'} transition-min"></span>
@@ -31,7 +31,7 @@
                     <ul class="sidebar-trans" style="display:none" data-menu-node='m-{$pmenu.id}-{$menu.id}'>
                         {volist name='menu.sub' id='submenu'}
                         <li class="nav-item">
-                            <a data-menu-node='m-{$pmenu.id}-{$submenu.id}' data-open="{$submenu.url}"
+                            <a data-menu-node='m-{$pmenu.id}-{$submenu.id}' data-load="{$submenu.url}"
                                class="sidebar-trans">
                                 <div class="nav-icon sidebar-trans">
                                     <span class="{$submenu.icon|default='fa fa-link'} transition-min"></span>
diff --git a/application/extra/view/admin.main.top.html b/application/extra/view/admin.main.top.html
index b4d4adf1f..0183411c7 100644
--- a/application/extra/view/admin.main.top.html
+++ b/application/extra/view/admin.main.top.html
@@ -8,7 +8,7 @@
             </div>
             {volist name='menus' id='pmenu'}
             {empty name='pmenu.sub'}
-            <a data-menu-node='m-{$pmenu.id}' data-open="{$pmenu.url}"
+            <a data-menu-node='m-{$pmenu.id}' data-load="{$pmenu.url}"
                class="topbar-home-link topbar-btn topbar-left">
                 <span>{notempty name='$pmenu.icon'}<i class="{$pmenu.icon}"></i>{/notempty} {$pmenu.title}</span>
             </a>
diff --git a/application/wechat/view/keys.form.html b/application/wechat/view/keys.form.html
index 1b3233740..7765df9fb 100644
--- a/application/wechat/view/keys.form.html
+++ b/application/wechat/view/keys.form.html
@@ -241,6 +241,9 @@
 
                     <div class="text-center" style="padding-bottom:30px">
                         <button class="layui-btn menu-submit">保存数据</button>
+                        <button class="layui-btn layui-btn-danger" type='button' data-load="{:url('index')}"
+                                data-confirm="确定要取消编辑吗？">取消编辑
+                        </button>
                     </div>
 
                     {if isset($vo['id'])}<input type='hidden' value='{$vo.id}' name='id'/>{/if}
diff --git a/application/wechat/view/keys.index.html b/application/wechat/view/keys.index.html
index d4c9eb582..4a22c8b43 100644
--- a/application/wechat/view/keys.index.html
+++ b/application/wechat/view/keys.index.html
@@ -2,7 +2,7 @@
 
 {block name="button"}
 <div class="nowrap pull-right" style="margin-top:10px">
-    <button data-open="{:url('add')}" class='layui-btn layui-btn-small'>添加规则</button>
+    <button data-load="{:url('add')}" class='layui-btn layui-btn-small'>添加规则</button>
 </div>
 {/block}
 
@@ -48,7 +48,7 @@
             <td class='text-center nowrap'>
                 {if auth("$classuri/edit")}
                 <span class="text-explode">|</span>
-                <a data-open='{:url("@wechat/keys/edit")}?id={$vo.id}'>编辑</a>
+                <a data-load='{:url("@wechat/keys/edit")}?id={$vo.id}'>编辑</a>
                 {/if}
                 {if auth("$classuri/del")}
                 <span class="text-explode">|</span>
diff --git a/extend/controller/BasicAdmin.php b/extend/controller/BasicAdmin.php
index 244fcf14f..96f9ab043 100644
--- a/extend/controller/BasicAdmin.php
+++ b/extend/controller/BasicAdmin.php
@@ -147,7 +147,7 @@ class BasicAdmin extends Controller {
             cookie('rows', $row_page >= 10 ? $row_page : 20);
             $page = $db->paginate($row_page, $total, ['query' => $this->request->get()]);
             $result['list'] = $page->all();
-            $result['page'] = preg_replace(['|href="(.*?)"|', '|pagination|'], ['data-open="$1" href="javascript:void(0);"', 'pagination pull-right'], $page->render());
+            $result['page'] = preg_replace(['|href="(.*?)"|', '|pagination|'], ['data-load="$1" href="javascript:void(0);"', 'pagination pull-right'], $page->render());
         } else {
             $result['list'] = $db->select();
         }
diff --git a/public/static/admin/listen.js b/public/static/admin/listen.js
index 3eee62764..e7d23df32 100644
--- a/public/static/admin/listen.js
+++ b/public/static/admin/listen.js
@@ -45,12 +45,6 @@ define(['jquery', 'admin.plugs'], function () {
         return $.form.modal($(this).attr('data-modal'), 'open_type=modal', $(this).attr('data-title') || '编辑');
     });
 
-    /*! 注册 data-open 事件行为 */
-    this.$body.on('click', '[data-open]', function () {
-        var url = $(this).attr('data-open');
-        $.form.href(url, this);
-    });
-
     /*! 注册 data-reload 事件行为 */
     this.$body.on('click', '[data-reload]', function () {
         $.form.reload();
@@ -191,7 +185,7 @@ define(['jquery', 'admin.plugs'], function () {
     function showLeftMenu(menuNode, $openNode) {
         var $leftmenu = $('[data-menu-box=' + menuNode + ']').removeClass('hide');
         $("[data-menu-box]").not($leftmenu).addClass('hide');
-        $openNode ? $openNode.trigger('click') : $leftmenu.find('[data-open]:first').trigger('click');
+        $openNode ? $openNode.trigger('click') : $leftmenu.find('[data-load]:first').trigger('click');
     }
 
     var $menutarget = $('[data-menu-target]').on('click', function () {
@@ -234,7 +228,7 @@ define(['jquery', 'admin.plugs'], function () {
     };
     /*! 通过URI查询最有可能的菜单NODE */
     function queryNode(url) {
-        var $menu = $('[data-menu-node][data-open*="_URL_"]'.replace('_URL_', url.replace(/\.html$/ig, '')));
+        var $menu = $('[data-menu-node][data-load*="_URL_"]'.replace('_URL_', url.replace(/\.html$/ig, '')));
         if ($menu.size()) {
             return $menu.get(0).getAttribute('data-menu-node');
         }