[incubator-dolphinscheduler] branch 1.3.5-prepare updated: [1.3.5-prepare][ui][cherry-pick]#4557 Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page (#4647)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch 1.3.5-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.5-prepare by this push:
     new 4a65317  [1.3.5-prepare][ui][cherry-pick]#4557 Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page (#4647)
4a65317 is described below

commit 4a653177d7d50eec134136fce929fcc1eabbeccf
Author: break60 <79...@qq.com>
AuthorDate: Tue Feb 2 09:26:40 2021 +0800

    [1.3.5-prepare][ui][cherry-pick]#4557 Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page (#4647)
---
 .../conf/home/pages/projects/pages/instance/pages/list/index.vue | 1 +
 dolphinscheduler-ui/src/js/module/util/routerUtil.js             | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index 6582817..e922545 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -87,6 +87,7 @@
        * Query
        */
       _onQuery (o) {
+        this.searchParams.pageNo = 1
         this.searchParams = _.assign(this.searchParams, o)
         setUrlParams(this.searchParams)
         this._debounceGET()
diff --git a/dolphinscheduler-ui/src/js/module/util/routerUtil.js b/dolphinscheduler-ui/src/js/module/util/routerUtil.js
index a4a7052..7ae91f0 100644
--- a/dolphinscheduler-ui/src/js/module/util/routerUtil.js
+++ b/dolphinscheduler-ui/src/js/module/util/routerUtil.js
@@ -15,8 +15,11 @@
  * limitations under the License.
  */
 
+import merge from 'webpack-merge'
+import router from '@/conf/home/router'
+
 export function setUrlParams (o) {
-  // router.push({
-  //   query: merge(router.history.current.query, o)
-  // })
+  router.push({
+    query: merge(router.history.current.query, o)
+  })
 }