fix #142 自定义按钮添加url功能

newpanjing · Sep 9, 2019 · 8bd98df · 8bd98df
1 parent 6167744
commit 8bd98df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -269,12 +269,13 @@
                                     window.open(temp.action_url)
                                     break;
                             }
+                            console.log('中断后续操作')
                             return;
                         }
                     }
                 }
             }
-
+            console.log('执行了')
             if (url) {
                 window.location.href = url;
                 return;