This is an automated email from the ASF dual-hosted git repository.
wangyizhi pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 98ae331 [Feature][UI Next] Organize folders. (#8127)
98ae331 is described below
commit 98ae33112c855255a2fdd3407b7defe48fa65b77
Author: songjianet <[email protected]>
AuthorDate: Wed Jan 19 22:58:21 2022 +0800
[Feature][UI Next] Organize folders. (#8127)
---
.../src/router/modules/projects.ts | 2 +-
.../src/views/projects/{ => dag}/index.tsx | 0
.../src/views/projects/{ => dag}/task/config.ts | 0
.../views/projects/{ => dag}/task/task-config.tsx | 0
.../projects/{ => dag}/workflow/dag-canvas.tsx | 0
.../projects/{ => dag}/workflow/dag-config.ts | 0
.../views/projects/{ => dag}/workflow/dag-hooks.ts | 0
.../projects/{ => dag}/workflow/dag-sidebar.tsx | 0
.../projects/{ => dag}/workflow/dag-toolbar.tsx | 0
.../projects/{ => dag}/workflow/dag.module.scss | 64 +++++++++++-----------
.../src/views/projects/{ => dag}/workflow/dag.tsx | 0
.../views/projects/{ => dag}/workflow/hook-demo.ts | 0
.../projects/{ => dag}/workflow/use-canvas-drop.ts | 0
.../projects/{ => dag}/workflow/use-canvas-init.ts | 0
.../projects/{ => dag}/workflow/use-cell-active.ts | 0
.../{ => dag}/workflow/use-graph-operations.ts | 0
.../projects/{ => dag}/workflow/use-node-search.ts | 0
.../{ => dag}/workflow/use-sidebar-drag.ts | 0
.../workflow-definition-create.module.scss | 0
.../workflow/workflow-definition-create.tsx | 0
.../workflow/workflow-definition-details.tsx | 0
.../workflow/workflow-definition-list.tsx | 0
.../workflow/workflow-instance-details.tsx | 0
.../{ => dag}/workflow/workflow-instance-list.tsx | 0
.../projects/{ => dag}/workflow/x6-style.scss | 0
25 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/router/modules/projects.ts
b/dolphinscheduler-ui-next/src/router/modules/projects.ts
index 86c04b8..b780a75 100644
--- a/dolphinscheduler-ui-next/src/router/modules/projects.ts
+++ b/dolphinscheduler-ui-next/src/router/modules/projects.ts
@@ -52,7 +52,7 @@ export default {
name: 'workflow-relation',
component: components['workflow-relation'],
meta: {
- title: '工作流定义'
+ title: '工作流关系'
}
},
{
diff --git a/dolphinscheduler-ui-next/src/views/projects/index.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/index.tsx
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/index.tsx
rename to dolphinscheduler-ui-next/src/views/projects/dag/index.tsx
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/config.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/task/config.ts
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/task/config.ts
rename to dolphinscheduler-ui-next/src/views/projects/dag/task/config.ts
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/task-config.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/task/task-config.tsx
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/task/task-config.tsx
rename to dolphinscheduler-ui-next/src/views/projects/dag/task/task-config.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/dag-canvas.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-canvas.tsx
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag-canvas.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-canvas.tsx
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/dag-config.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-config.ts
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag-config.ts
rename to dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-config.ts
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/dag-hooks.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-hooks.ts
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag-hooks.ts
rename to dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-hooks.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/dag-sidebar.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-sidebar.tsx
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag-sidebar.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-sidebar.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/dag-toolbar.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-toolbar.tsx
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag-toolbar.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-toolbar.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/dag.module.scss
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.module.scss
similarity index 54%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag.module.scss
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.module.scss
index 2298363..37f4d35 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/dag.module.scss
+++ b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.module.scss
@@ -83,52 +83,52 @@ $toolbarHeight: 50px;
background-size: 100% 100%;
margin-right: 10px;
&.icon-shell {
- background-image: url("../../../assets/images/task-icons/shell.png");
+ background-image: url("../../../../assets/images/task-icons/shell.png");
}
&.icon-sub_process {
- background-image:
url("../../../assets/images/task-icons/sub_process.png");
+ background-image:
url("../../../../assets/images/task-icons/sub_process.png");
}
&.icon-procedure {
- background-image: url("../../../assets/images/task-icons/procedure.png");
+ background-image:
url("../../../../assets/images/task-icons/procedure.png");
}
&.icon-sql {
- background-image: url("../../../assets/images/task-icons/sql.png");
+ background-image: url("../../../../assets/images/task-icons/sql.png");
}
&.icon-flink {
- background-image: url("../../../assets/images/task-icons/flink.png");
+ background-image: url("../../../../assets/images/task-icons/flink.png");
}
&.icon-mr {
- background-image: url("../../../assets/images/task-icons/mr.png");
+ background-image: url("../../../../assets/images/task-icons/mr.png");
}
&.icon-python {
- background-image: url("../../../assets/images/task-icons/python.png");
+ background-image: url("../../../../assets/images/task-icons/python.png");
}
&.icon-dependent {
- background-image: url("../../../assets/images/task-icons/dependent.png");
+ background-image:
url("../../../../assets/images/task-icons/dependent.png");
}
&.icon-http {
- background-image: url("../../../assets/images/task-icons/http.png");
+ background-image: url("../../../../assets/images/task-icons/http.png");
}
&.icon-datax {
- background-image: url("../../../assets/images/task-icons/datax.png");
+ background-image: url("../../../../assets/images/task-icons/datax.png");
}
&.icon-pigeon {
- background-image: url("../../../assets/images/task-icons/pigeon.png");
+ background-image: url("../../../../assets/images/task-icons/pigeon.png");
}
&.icon-sqoop {
- background-image: url("../../../assets/images/task-icons/sqoop.png");
+ background-image: url("../../../../assets/images/task-icons/sqoop.png");
}
&.icon-conditions {
- background-image:
url("../../../assets/images/task-icons/conditions.png");
+ background-image:
url("../../../../assets/images/task-icons/conditions.png");
}
&.icon-seatunnel {
- background-image: url("../../../assets/images/task-icons/seatunnel.png");
+ background-image:
url("../../../../assets/images/task-icons/seatunnel.png");
}
&.icon-spark {
- background-image: url("../../../assets/images/task-icons/spark.png");
+ background-image: url("../../../../assets/images/task-icons/spark.png");
}
&.icon-switch {
- background-image: url("../../../assets/images/task-icons/switch.png");
+ background-image: url("../../../../assets/images/task-icons/switch.png");
}
}
@@ -138,52 +138,52 @@ $toolbarHeight: 50px;
background-color: $blueBg;
.sidebar-icon {
&.icon-shell {
- background-image:
url("../../../assets/images/task-icons/shell_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/shell_hover.png");
}
&.icon-sub_process {
- background-image:
url("../../../assets/images/task-icons/sub_process_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/sub_process_hover.png");
}
&.icon-procedure {
- background-image:
url("../../../assets/images/task-icons/procedure_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/procedure_hover.png");
}
&.icon-sql {
- background-image:
url("../../../assets/images/task-icons/sql_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/sql_hover.png");
}
&.icon-flink {
- background-image:
url("../../../assets/images/task-icons/flink_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/flink_hover.png");
}
&.icon-mr {
- background-image:
url("../../../assets/images/task-icons/mr_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/mr_hover.png");
}
&.icon-python {
- background-image:
url("../../../assets/images/task-icons/python_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/python_hover.png");
}
&.icon-dependent {
- background-image:
url("../../../assets/images/task-icons/dependent_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/dependent_hover.png");
}
&.icon-http {
- background-image:
url("../../../assets/images/task-icons/http_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/http_hover.png");
}
&.icon-datax {
- background-image:
url("../../../assets/images/task-icons/datax_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/datax_hover.png");
}
&.icon-pigeon {
- background-image:
url("../../../assets/images/task-icons/pigeon_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/pigeon_hover.png");
}
&.icon-sqoop {
- background-image:
url("../../../assets/images/task-icons/sqoop_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/sqoop_hover.png");
}
&.icon-conditions {
- background-image:
url("../../../assets/images/task-icons/conditions_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/conditions_hover.png");
}
&.icon-seatunnel {
- background-image:
url("../../../assets/images/task-icons/seatunnel_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/seatunnel_hover.png");
}
&.icon-spark {
- background-image:
url("../../../assets/images/task-icons/spark_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/spark_hover.png");
}
&.icon-switch {
- background-image:
url("../../../assets/images/task-icons/switch_hover.png");
+ background-image:
url("../../../../assets/images/task-icons/switch_hover.png");
}
}
}
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/dag.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.tsx
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/dag.tsx
rename to dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.tsx
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/hook-demo.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/hook-demo.ts
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/hook-demo.ts
rename to dolphinscheduler-ui-next/src/views/projects/dag/workflow/hook-demo.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/use-canvas-drop.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-canvas-drop.ts
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/use-canvas-drop.ts
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-canvas-drop.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/use-canvas-init.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-canvas-init.ts
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/use-canvas-init.ts
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-canvas-init.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/use-cell-active.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-cell-active.ts
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/use-cell-active.ts
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-cell-active.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/use-graph-operations.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-graph-operations.ts
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/use-graph-operations.ts
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-graph-operations.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/use-node-search.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-node-search.ts
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/use-node-search.ts
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-node-search.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/use-sidebar-drag.ts
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-sidebar-drag.ts
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/use-sidebar-drag.ts
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-sidebar-drag.ts
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-create.module.scss
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-create.module.scss
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-create.module.scss
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-create.module.scss
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-create.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-create.tsx
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-create.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-create.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-details.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-details.tsx
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-details.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-details.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-list.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-list.tsx
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/workflow-definition-list.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-list.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/workflow-instance-details.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-instance-details.tsx
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/workflow-instance-details.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-instance-details.tsx
diff --git
a/dolphinscheduler-ui-next/src/views/projects/workflow/workflow-instance-list.tsx
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-instance-list.tsx
similarity index 100%
rename from
dolphinscheduler-ui-next/src/views/projects/workflow/workflow-instance-list.tsx
rename to
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-instance-list.tsx
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/x6-style.scss
b/dolphinscheduler-ui-next/src/views/projects/dag/workflow/x6-style.scss
similarity index 100%
rename from dolphinscheduler-ui-next/src/views/projects/workflow/x6-style.scss
rename to dolphinscheduler-ui-next/src/views/projects/dag/workflow/x6-style.scss
