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

pull/3/MERGE
break60 4 years ago
parent
commit
3e467dff22
  1. 1
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
  2. 8
      dolphinscheduler-ui/src/js/module/util/routerUtil.js

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

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

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

@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import merge from 'webpack-merge'
import router from '@/conf/home/router'
export function setUrlParams (o) { export function setUrlParams (o) {
// router.push({ router.push({
// query: merge(router.history.current.query, o) query: merge(router.history.current.query, o)
// }) })
} }

Loading…
Cancel
Save