From 8bd98dfaa7d6d0191ad0d5215775a58f2c977243 Mon Sep 17 00:00:00 2001
From: newpanjing <newpanjing@163.com>
Date: Mon, 9 Sep 2019 14:38:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#142=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0url=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simpleui/static/admin/simpleui-x/js/index.js | 6 +++---
 simpleui/templates/admin/actions.html        | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/simpleui/static/admin/simpleui-x/js/index.js b/simpleui/static/admin/simpleui-x/js/index.js
index 0fa0cee0..d005f179 100644
--- a/simpleui/static/admin/simpleui-x/js/index.js
+++ b/simpleui/static/admin/simpleui-x/js/index.js
@@ -4,8 +4,6 @@
     }
 
     window.addEventListener('hashchange', function (e) {
-        // console.log(e)
-        // console.log('hash')
         if (e.newURL != e.oldURL) {
             openByHash()
         }
@@ -25,7 +23,9 @@
     }
 
     function changeUrl(data) {
-        location.href = '#' + (data.url || '/')
+        if(data.url.indexOf('http')!=0){
+            location.href = '#' + (data.url || '/')
+        }
     }
 
     window.callback = function () {
diff --git a/simpleui/templates/admin/actions.html b/simpleui/templates/admin/actions.html
index e8d14fb6..4f5eaf87 100644
--- a/simpleui/templates/admin/actions.html
+++ b/simpleui/templates/admin/actions.html
@@ -269,12 +269,13 @@
                                     window.open(temp.action_url)
                                     break;
                             }
+                            console.log('中断后续操作')
                             return;
                         }
                     }
                 }
             }
-
+            console.log('执行了')
             if (url) {
                 window.location.href = url;
                 return;