Browse Source

Merge remote-tracking branch 'origin/dev' into dev

pull/3/MERGE
BoYiZhang 4 years ago
parent
commit
49f3398594
  1. 8
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  2. 2
      e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java

8
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@ -103,7 +103,7 @@
</x-button>
<x-button
type="primary"
v-tooltip.light="$t('Close')"
v-tooltip.light="$t('Close')"
icon="ans-icon-off"
size="xsmall"
data-container="body"
@ -191,7 +191,7 @@
],
Connector: 'Bezier',
PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
ConnectionOverlays: [
[
'Arrow',
@ -639,7 +639,7 @@
],
Connector: 'Bezier',
PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
ConnectionOverlays: [
[
'Arrow',
@ -679,3 +679,5 @@
<style lang="scss" rel="stylesheet/scss">
@import "./dag";
</style>

2
e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java

@ -24,7 +24,6 @@ public class CreateWorkflowLocator {
/**
* jump workflow define page
*/
// click project name
public static final By CLICK_PROJECT_NAME = By.xpath("//span/a");
@ -179,4 +178,5 @@ public class CreateWorkflowLocator {
//click confirm delete workflow button
public static final By CONFIRM_DELETE_WORKFLOW_BOTTOM = By.xpath("//div[2]/div/button[2]/span");
}

Loading…
Cancel
Save