Merge pull request chavyleung#221 from id77/master

chavyleung · web-flow · commit 61f117f501a7 · 2020-08-22T13:39:23.000+08:00
更新[BoxJs TF]: 优化页面后退事件逻辑
diff --git a/box/chavy.boxjs.html b/box/chavy.boxjs.html
@@ -1841,7 +1841,6 @@ <h2 :class="version === ver.version ? 'primary--text' : undefined">v{{ver.versio
           } else {
             this.path = defview
           }
-          this.handleHistory(this.path)
           // 监听浏览器后退事件
           window.addEventListener('popstate', (e) => (this.path = e.state.url), false)
           // 如果后端没有渲染数据, 则发出请求获取数据
@@ -1909,23 +1908,18 @@ <h2 :class="version === ver.version ? 'primary--text' : undefined">v{{ver.versio
             this.ui.isWaitToggleSearchBar = false
           }, 1000),
           handleHistory(path) {
-            const state = { title: 'BoxJs', url: path }
+            const { hash } = window.location.href;
+            const state = { title: 'BoxJs', url:  '/' + (hash ? hash : '#/') }
             if (!history.state) {
               history.replaceState(state, '')
             }
+
+            state.url = path;
             history.pushState(state, '', path)
           },
           // 页面返回
           back() {
-            if (this.view === 'bak' && !this.bfpath) {
-              this.path = '/#/my'
-              this.handleHistory(this.path)
-            } else if (this.view === 'app' && !this.bfpath) {
-              this.path = '/#/app'
-              this.handleHistory(this.path)
-            } else {
-              history.back()
-            }
+            history.back()
           },
           // 切换当前容器环境
           switchEnv(env) {
diff --git a/box/chavy.boxjs.js b/box/chavy.boxjs.js
@@ -3,7 +3,7 @@ const $ = new Env('BoxJs')
 // 为 eval 准备的上下文环境
 const $eval_env = {}
 
-$.version = '0.7.49'
+$.version = '0.7.50'
 $.versionType = 'beta'
 
 /**
diff --git a/box/release/box.release.tf.json b/box/release/box.release.tf.json
@@ -1,5 +1,19 @@
 {
   "releases": [
+    {
+      "version": "0.7.50",
+      "tags": ["beta"],
+      "author": "@id77",
+      "icon": "https://avatars3.githubusercontent.com/u/29748519",
+      "repo": "https://github.com/chavyleung",
+      "msg": "更新[BoxJs TF]: 优化页面后退事件逻辑",
+      "notes": [
+        {
+          "name": "优化",
+          "descs": ["页面后退事件逻辑"]
+        }
+      ]
+    },
     {
       "version": "0.7.49",
       "tags": ["beta"],
