[incubator-dolphinscheduler] branch dev updated: [Improvement-4556][ui]Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page

[ch...@apache.org]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 3e467df  [Improvement-4556][ui]Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page
     new 8be894c  Merge pull request #4557 from break60/dev
3e467df is described below

commit 3e467dff2211e6c88a2ecfcf2b851964682881e1
Author: break60 <79...@qq.com>
AuthorDate: Mon Jan 25 15:08:25 2021 +0800

    [Improvement-4556][ui]Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page
---
 .../conf/home/pages/projects/pages/instance/pages/list/index.vue  | 1 +
 dolphinscheduler-ui/src/js/module/util/routerUtil.js              | 8 +++++---
 2 files changed, 6 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 162df69..05b905a 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
@@ -95,6 +95,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..1274a59 100644
--- a/dolphinscheduler-ui/src/js/module/util/routerUtil.js
+++ b/dolphinscheduler-ui/src/js/module/util/routerUtil.js
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * 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)
+  })
 }