diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index b16e21780c28902170323da27019af554631ad85..98d2234450d77168364f48e4550ff42faf3668aa 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -255,7 +255,7 @@ */ _seeHistory () { this.self.$router.push({ - name: 'task-instance-list', + name: 'task-instance', query: { processInstanceId: this.self.$route.params.id, taskName: this.backfillItem.name diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue index 22a13624a5304469b869b4e554c0211085c2353d..39a851f5eb0353fc257df63ab044b2ee14e485a4 100644 --- a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue +++ b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue @@ -333,8 +333,16 @@ padding: 0 20px; } .content-p { - min-width: 500px; + min-width: 820px; min-height: 100px; + .list-box-f { + .text { + width: 166px; + } + .cont { + width: calc(100% - 186px); + } + } } } diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue index 11ca0327ba793d63a463c39144c4aef7e0e2189d..03b2c09b6314737975e15ac67711683b40520e92 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue @@ -29,6 +29,7 @@ import mSpin from '@/module/components/spin/spin' import { setUrlParams } from '@/module/util/routerUtil' import mNoData from '@/module/components/noData/noData' + import listUrlParamHandle from '@/module/mixin/listUrlParamHandle' import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu' import mListConstruction from '@/module/components/listConstruction/listConstruction' @@ -53,6 +54,7 @@ } } }, + mixins: [listUrlParamHandle], props: { config: String }, @@ -83,44 +85,21 @@ }, _onUpdate () { this._debounceGET() - }, - /** - * Anti-shake request interface - * @desc Prevent function from being called multiple times - */ - _debounceGET: _.debounce(function (flag) { - this._getList(flag) - }, 100, { - 'leading': false, - 'trailing': true - }) + } }, watch: { // router '$route' (a) { // url no params get instance list if (_.isEmpty(a.query)) { - this.searchParams.pageNo = 1 this.searchParams.processInstanceId = '' - } else { - this.searchParams.pageNo = a.query.pageNo || 1 - } - }, - 'searchParams.pageNo': { - deep: true, - handler () { - this._debounceGET() } + this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo } }, created () { - // Routing parameter merging - if (!_.isEmpty(this.$route.query)) { - this.searchParams = _.assign(this.searchParams, this.$route.query) - } }, mounted () { - this._debounceGET() }, components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData } } diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue index 792ed33add7ffe33b13be9e4ef93ff7f5cdc89e3..e578a43dcdbb3f9d68c6e6dba8abc772cee8717f 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue @@ -198,11 +198,11 @@ if (this.item.crontab) { api = 'dag/updateSchedule' searchParams.id = this.item.id - msg = '编辑成功!不要忘记上线' + msg = `${i18n.$t('Edit')}${i18n.$t('success')},${i18n.$t('Please go online')}` } else { api = 'dag/createSchedule' searchParams.processDefinitionId = this.item.id - msg = '创建成功' + msg = `${i18n.$t('Create')}${i18n.$t('success')}` } this.store.dispatch(api, searchParams).then(res => { diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue index 9ec83559894480714e39f9c7f08aa5437161224c..b0b630d6fed17b6493f06252fb08ea6f49b7e862 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue @@ -32,6 +32,7 @@ import localStore from '@/module/util/localStorage' import { setUrlParams } from '@/module/util/routerUtil' import mNoData from '@/module/components/noData/noData' + import listUrlParamHandle from '@/module/mixin/listUrlParamHandle' import mConditions from '@/module/components/conditions/conditions' import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu' import mListConstruction from '@/module/components/listConstruction/listConstruction' @@ -44,15 +45,14 @@ processListP: [], isLoading: true, searchParams: { - // 分页条数 pageSize: 10, - // 分页 pageNo: 1, - // 查询名称 - searchVal: '' + searchVal: '', + userId: '' } } }, + mixins: [listUrlParamHandle], props: { }, methods: { @@ -77,15 +77,9 @@ /** * get data list */ - _getProcessListP (flag) { + _getList (flag) { this.isLoading = !flag - this.getProcessListP({ - pageSize: this.searchParams.pageSize, - pageNo: this.searchParams.pageNo, - searchVal: this.searchParams.searchVal, - userId: this.$route.query.userId || '' - }).then(res => { - setUrlParams({ pageNo: this.pageNo }) + this.getProcessListP(this.searchParams).then(res => { this.processListP = [] this.processListP = res.totalList this.total = res.total @@ -96,48 +90,20 @@ }, _onUpdate () { this._debounceGET('false') - }, - /** - * Anti-shake request interface - * @desc Prevent function from being called multiple times - */ - _debounceGET: _.debounce(function (flag) { - this._getProcessListP(flag) - }, 100, { - 'leading': false, - 'trailing': true - }) + } }, watch: { '$route' (a) { // url no params get instance list - if (_.isEmpty(a.query)) { - this.searchParams.pageNo = 1 - } else { - this.searchParams.pageNo = a.query.pageNo || 1 - } - }, - 'searchParams': { - deep: true, - handler () { - this._debounceGET() - } + this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo } }, created () { localStore.removeItem('subProcessId') - - // Routing parameter merging - if (!_.isEmpty(this.$route.query)) { - this.searchParams = _.assign(this.searchParams, this.$route.query) - } }, mounted () { - this._debounceGET() }, components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData } } - diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue index 5e242018287db25501b3577b9f05468f1be72cbf..3f6f6a600b9334a8b17a7a118d27c1567ec5b571 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue @@ -122,7 +122,7 @@ }, _goTask (name) { this.$router.push({ - name: 'task-instance-list', + name: 'task-instance', query: { stateType: _.find(stateType, ['label', name])['code'], startDate: this.scheduleTime[0], diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue index 6c5cae6ac4395420911c81c42ebc01174b9740ff..5ce5c47c15d987759981be0edae82b65c20b7ea3 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue @@ -3,33 +3,6 @@ - - + \ No newline at end of file diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue index d42980181582e31e071f0ef3fee170e9c5665191..7fdc13e4af5342069ebc60479841e6b7b120576b 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue @@ -162,6 +162,3 @@ components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData } } - - diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue index c7f495c3f5d7e29ea896b08f39eef9bb79f21307..bbe973f6421343ab8330392dc3d1bbd41d7e9359 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue @@ -9,9 +9,9 @@