From 914169ba11bb78c04eaafcaf64bf21d07804a254 Mon Sep 17 00:00:00 2001 From: gongzijian Date: Tue, 16 Apr 2019 18:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=BB=E5=BA=95=E4=BC=98=E5=8C=96=E5=88=86?= =?UTF-8?q?=E9=A1=B5=20url=E5=B8=A6=E5=8F=82=E6=9F=A5=E8=AF=A2=20=E4=BF=9D?= =?UTF-8?q?=E7=95=99url=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dag/_source/formModel/formModel.vue | 2 +- .../pages/list/_source/createDataSource.vue | 10 ++- .../pages/_source/taskRecordList/index.vue | 29 ++------ .../definition/pages/list/_source/timing.vue | 4 +- .../pages/definition/pages/list/index.vue | 50 +++----------- .../pages/index/_source/projectChart.vue | 2 +- .../pages/projects/pages/instance/index.vue | 31 +-------- .../pages/instance/pages/list/index.vue | 3 - .../home/pages/projects/pages/list/index.vue | 58 +++++++++------- .../projects/pages/taskInstance/index.vue | 31 ++------- .../resource/pages/file/pages/list/index.vue | 66 ++++++++++--------- .../pages/udf/pages/function/index.vue | 59 ++++++++++------- .../pages/udf/pages/resource/index.vue | 58 +++++++++------- .../src/js/conf/home/router/index.js | 2 +- .../module/components/listBoxF/listBoxF.vue | 4 +- .../src/js/module/components/popup/popup.vue | 2 +- .../src/js/module/i18n/locale/en_US.js | 3 +- .../src/js/module/i18n/locale/zh_CN.js | 3 +- .../src/js/module/mixin/disabledState.js | 2 - .../src/js/module/mixin/listUrlParamHandle.js | 53 +++++++++++++++ 20 files changed, 230 insertions(+), 242 deletions(-) create mode 100644 escheduler-ui/src/js/module/mixin/listUrlParamHandle.js 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 b16e21780c..98d2234450 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 22a13624a5..39a851f5eb 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 11ca0327ba..03b2c09b63 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 792ed33add..e578a43dcd 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 9ec8355989..b0b630d6fe 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 5e24201828..3f6f6a600b 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 6c5cae6ac4..5ce5c47c15 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 d429801815..7fdc13e4af 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 c7f495c3f5..bbe973f642 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 @@