test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-01 03:37:46 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge pull request #4557 from break60/dev

Browse Source 
[Improvement-4556][ui]Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page
This commit is contained in:
xingchun-chen 2021-01-25 17:03:16 +08:00 committed by GitHub
commit 8be894cb88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
View File

@ -95,6 +95,7 @@
* Query
*/
_onQuery (o) {
this.searchParams.pageNo = 1
this.searchParams = _.assign(this.searchParams, o)
setUrlParams(this.searchParams)
this._debounceGET()

8
dolphinscheduler-ui/src/js/module/util/routerUtil.js
View File

@ -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)
})
}