From bfc69edc8094469a1a3f9bb4036a2f82c802a3f1 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 15 Oct 2019 16:04:46 +0800 Subject: [PATCH] 1. Solution task instance page cannot jump to project home page 2. Modification of Startup Parameter Style of Workflow Instance Page 3. Pre/Post Annotations for SQL Workflow 4. Resolve data source center selection hive or spark display exception (#1028) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 1.repair [BUG]#884；2.Add Scheduling Time Fields to Workflow Instance List；3.Add a reminder for empty data 4.Delete the'babel-plugin-transform-remove-console'dependency package * 1.update logo 2.Workflow Definition Page Timing Component Replaced with Source Code * Repair bug #901，#909，#935 * Optimizing Page License and Page Style * 1. Changing API paths; 2. Modifying statistical management naming * update favicon.ico and title * 1. Solution task instance page cannot jump to project home page 2. Modification of Startup Parameter Style of Workflow Instance Page 3. Pre/Post Annotations for SQL Workflow 4. Resolve data source center selection hive or spark display exception --- .../formModel/tasks/_source/statementList.vue | 1 + .../pages/dag/_source/startingParam/index.vue | 28 ++++++++---- .../pages/list/_source/createDataSource.vue | 45 +++++++++---------- .../projects/pages/taskInstance/index.vue | 4 ++ .../src/js/module/i18n/locale/en_US.js | 1 + .../src/js/module/i18n/locale/zh_CN.js | 1 + 6 files changed, 48 insertions(+), 32 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue index bd9a7d238..11e0533f6 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue @@ -9,6 +9,7 @@ type="textarea" resize="none" :autosize="{minRows:1}" + :placeholder="$t('Please enter a non-query SQL statement')" v-model="localStatementList[$index]" @on-blur="_verifProp()" style="width: 525px;"> diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue index b1494e063..1a06e80f4 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue @@ -4,15 +4,15 @@

{{$t('Startup parameter')}}

@@ -111,4 +111,14 @@ } } } + .tab { + font-size: 12px; + font-weight: bold; + } + .content { + font-size: 12px; + &:hover { + color: #47c3ff; + } + } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue index 7e0b31005..fe873664f 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue @@ -317,37 +317,36 @@ }) } }, - watch: { - 'type'(value){ - if((value =='HIVE'||value == 'SPARK')&&this.isShowPrincipal== true){ - this.showPrincipal = false - }else{ - this.showPrincipal = true - } - if(value == 'POSTGRESQL') { - this.showdDatabase = true; - } else { - this.showdDatabase = false; - } - } - }, created () { // Backfill if (this.item.id) { this._getEditDatasource() } - return new Promise((resolve, reject) => { - this.store.dispatch('datasource/getKerberosStartupState').then(res => { - this.isShowPrincipal=res - }).catch(e => { - this.$message.error(e.msg || '') - reject(e) + }, + watch: { + type(value){ + if(value == 'POSTGRESQL') { + this.showdDatabase = true; + } else { + this.showdDatabase = false; + } + return new Promise((resolve, reject) => { + this.store.dispatch('datasource/getKerberosStartupState').then(res => { + this.isShowPrincipal=res + if((value =='HIVE'||value == 'SPARK')&&this.isShowPrincipal== true){ + this.showPrincipal = false + }else{ + this.showPrincipal = true + } + }).catch(e => { + this.$message.error(e.msg || '') + reject(e) + }) }) - }) - - + } }, + mounted () { }, components: { mPopup, mListBoxF } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue index e07652c37..bdec16d92 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue @@ -78,6 +78,10 @@ */ _getList (flag) { this.isLoading = !flag + if(this.searchParams.pageNo == undefined) { + this.$router.push({ path: `/projects/index` }) + return false + } this.getTaskInstanceList(this.searchParams).then(res => { this.taskInstanceList = [] this.taskInstanceList = res.totalList diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 1fc2615a2..3300d5dd1 100644 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -133,6 +133,7 @@ export default { 'jdbc connect parameters': 'jdbc connect parameters', 'Test Connect': 'Test Connect', 'Please enter resource name': 'Please enter resource name', + 'Please enter a non-query SQL statement': 'Please enter a non-query SQL statement', 'Please enter IP/hostname': 'Please enter IP/hostname', 'jdbc connection parameters is not a correct JSON format': 'jdbc connection parameters is not a correct JSON format', '#': '#', diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index 8e7d6263b..8ee8b019e 100644 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -133,6 +133,7 @@ export default { 'jdbc connect parameters': 'jdbc连接参数', 'Test Connect': '测试连接', 'Please enter resource name': '请输入数据源名称', + 'Please enter a non-query SQL statement': '请输入非查询sql语句', 'Please enter IP/hostname': '请输入IP/主机名', 'jdbc connection parameters is not a correct JSON format': 'jdbc连接参数不是一个正确的JSON格式', '#': '编号', -- GitLab