This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 5739afb Fix DAG task nodes keep requesting API and tooltip background
color modification (#1837)
5739afb is described below
commit 5739afb95ad74e11fa844be8c1778ecd4dc5ef61
Author: break60 <[email protected]>
AuthorDate: Thu Jan 16 11:27:43 2020 +0800
Fix DAG task nodes keep requesting API and tooltip background color
modification (#1837)
* fix udfs assignment and task instance page jump #1789
* jest add coverage display
* Fix data echo, style, popup cannot be closed and license
* Fix data echo, style, popup cannot be closed and license
* fix
* Requests the previous page when there is no data on the list page
* Fix DAG task nodes keep requesting API and tooltip background color
modification
---
.../src/js/conf/home/pages/dag/_source/dag.scss | 9 +++++++--
.../src/js/conf/home/pages/dag/_source/dag.vue | 22 +++++++++++++---------
.../pages/datasource/pages/list/_source/list.vue | 2 +-
.../pages/definition/pages/list/_source/list.vue | 2 +-
.../pages/projects/pages/list/_source/list.vue | 2 +-
.../pages/file/pages/list/_source/list.vue | 2 +-
.../pages/udf/pages/function/_source/list.vue | 2 +-
.../pages/udf/pages/resource/_source/list.vue | 2 +-
.../pages/security/pages/tenement/_source/list.vue | 2 +-
.../security/pages/warningGroups/_source/list.vue | 2 +-
.../src/js/module/i18n/locale/en_US.js | 1 +
.../src/js/module/i18n/locale/zh_CN.js | 1 +
12 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index a63157d..fbb4f41 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -159,6 +159,9 @@
border-radius: 0 3px 0 0;
.ans-btn-text {
color: #337ab7;
+ .ans-icon {
+ font-size: 16px;
+ }
}
.assist-btn {
position: absolute;
@@ -206,7 +209,7 @@
color: #333;
}
&.active {
- background: #e1e2e3;
+ // background: #e1e2e3;
i {
color: #2d8cf0;
}
@@ -234,7 +237,9 @@
border-radius: 3px 3px 0px 0px;
}
}
-
+#screen {
+ margin-right: 5px;
+}
.v-modal-custom-log {
z-index: 101;
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index feb756d..40b6d85 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -61,20 +61,28 @@
<span v-if="name" class="copy-name" @click="_copyName"
:data-clipboard-text="name"><em class="ans-icon-copy" data-container="body"
data-toggle="tooltip" :title="$t('Copy name')" ></em></span>
</div>
<div class="save-btn">
- <div class="operation" style="vertical-align: middle;">
+ <div class="operation" style="vertical-align: middle;">
<a href="javascript:"
v-for="(item,$index) in toolOperList"
:class="_operationClass(item)"
:id="item.code"
:key="$index"
@click="_ckOperation(item,$event)">
- <em :class="item.icon" data-toggle="tooltip"
:title="item.description" ></em>
+ <x-button type="text" data-container="body" :icon="item.icon"
v-tooltip.light="item.desc"></x-button>
</a>
</div>
- <x-button type="text" icon="ans-icon-triangle-solid-right"
@click="dagAutomaticLayout"></x-button>
+ <x-button
+ type="primary"
+ v-tooltip.light="$t('Format DAG')"
+ icon="ans-icon-triangle-solid-right"
+ size="xsmall"
+ data-container="body"
+ v-if="type === 'instance'"
+ style="vertical-align: middle;"
+ @click="dagAutomaticLayout">
+ </x-button>
<x-button
- data-toggle="tooltip"
- :title="$t('Refresh DAG status')"
+ v-tooltip.light="$t('Refresh DAG status')"
data-container="body"
style="vertical-align: middle;"
icon="ans-icon-refresh"
@@ -189,10 +197,6 @@
Dag.backfill(true)
if (this.type === 'instance') {
this._getTaskState(false).then(res => {})
- // Round robin acquisition status
- this.setIntervalP = setInterval(() => {
- this._getTaskState(true).then(res => {})
- }, 90000)
}
} else {
Dag.create()
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
index ef6f839..a496fe8 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
@@ -64,7 +64,7 @@
</m-tooltips-JSON>
</td>
<td>
- <span v-if="item.note" class="ellipsis"
v-tooltip.large.top.start="{text: item.note, maxWidth:
'500px'}">{{item.note}}</span>
+ <span v-if="item.note" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.note, maxWidth:
'500px'}">{{item.note}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 7a9a165..5550864 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -69,7 +69,7 @@
<span v-else>-</span>
</td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
index bf5bc12..8acee8e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
@@ -66,7 +66,7 @@
<span>{{item.instRunningCount}}</span>
</td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index 513d0d1..c50d392 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -52,7 +52,7 @@
</td>
<td><span class="ellipsis">{{item.fileName}}</span></td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index febb215..b0c9b5a 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -67,7 +67,7 @@ v-ps<template>
<span>{{item.type}}</span>
</td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
index 6337ef4..ce28894 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
@@ -58,7 +58,7 @@
<span>{{_rtSize(item.size)}}</span>
</td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
index 521b96d..d0029d2 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
@@ -59,7 +59,7 @@
</span>
</td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index a27e4da..528693a 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -52,7 +52,7 @@
</td>
<td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` :
`${$t('SMS')}`}}</span></td>
<td>
- <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
+ <span v-if="item.description" class="ellipsis"
v-tooltip.large.top.start.light="{text: item.description, maxWidth:
'500px'}">{{item.description}}</span>
<span v-else>-</span>
</td>
<td>
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 64c6376..a77585e 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -374,6 +374,7 @@ export default {
'All_1': 'All',
'Toolbar': 'Toolbar',
'View variables': 'View variables',
+ 'Format DAG': 'Format DAG',
'Refresh DAG status': 'Refresh DAG status',
'Return_1': 'Return',
'Please enter format': 'Please enter 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 8c7fac6..6784498 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -369,6 +369,7 @@ export default {
'All_1': '成功或失败都发',
'Toolbar': '工具栏',
'View variables': '查看变量',
+ 'Format DAG': '格式化DAG',
'Refresh DAG status': '刷新DAG状态',
'Return_1': '返回上一节点',
'Please enter format': '请输入格式为',
