Browse Source

[Feature][UI Next] Adjust the projects directory (#8128)

3.0.0/version-upgrade
wangyizhi 3 years ago committed by GitHub
parent
commit
a87ddca98c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 44
      dolphinscheduler-ui-next/src/router/modules/projects.ts
  2. 36
      dolphinscheduler-ui-next/src/views/projects/dag/workflow/hook-demo.ts
  3. 25
      dolphinscheduler-ui-next/src/views/projects/task-definition-list/task-definition-list.tsx
  4. 0
      dolphinscheduler-ui-next/src/views/projects/task-details/config.ts
  5. 0
      dolphinscheduler-ui-next/src/views/projects/task-details/task-config.tsx
  6. 4
      dolphinscheduler-ui-next/src/views/projects/task-instance-list/task-instance-list.tsx
  7. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-definition-list/workflow-definition-list.tsx
  8. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-canvas.tsx
  9. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-config.ts
  10. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-hooks.ts
  11. 2
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-sidebar.tsx
  12. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-toolbar.tsx
  13. 64
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag.module.scss
  14. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/dag.tsx
  15. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/use-canvas-drop.ts
  16. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/use-canvas-init.ts
  17. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/use-cell-active.ts
  18. 2
      dolphinscheduler-ui-next/src/views/projects/workflow-details/use-graph-operations.ts
  19. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/use-node-search.ts
  20. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/use-sidebar-drag.ts
  21. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-definition-create.module.scss
  22. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-definition-create.tsx
  23. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-definition-details.tsx
  24. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-instance-details.tsx
  25. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-details/x6-style.scss
  26. 0
      dolphinscheduler-ui-next/src/views/projects/workflow-instance-list/workflow-instance-list.tsx

44
dolphinscheduler-ui-next/src/router/modules/projects.ts

@ -56,7 +56,15 @@ export default {
} }
}, },
{ {
path: '/projects/:projectCode/workflow/definitions/create', path: '/projects/:projectCode/workflow-definitions',
name: 'workflow-definition-list',
component: components['workflow-definition-list'],
meta: {
title: '工作流定义'
}
},
{
path: '/projects/:projectCode/workflow-definitions/create',
name: 'workflow-definition-create', name: 'workflow-definition-create',
component: components['workflow-definition-create'], component: components['workflow-definition-create'],
meta: { meta: {
@ -64,12 +72,44 @@ export default {
} }
}, },
{ {
path: '/projects/:projectCode/workflow/definitions/:code', path: '/projects/:projectCode/workflow-definitions/:code',
name: 'workflow-definition-details', name: 'workflow-definition-details',
component: components['workflow-definition-details'], component: components['workflow-definition-details'],
meta: { meta: {
title: '工作流定义详情' title: '工作流定义详情'
} }
},
{
path: '/projects/:projectCode/workflow-instances',
name: 'workflow-instance-list',
component: components['workflow-instance-list'],
meta: {
title: '工作流实例'
}
},
{
path: '/projects/:projectCode/workflow-instances/:id',
name: 'workflow-instance-details',
component: components['workflow-instance-details'],
meta: {
title: '工作流实例详情'
}
},
{
path: '/projects/:projectCode/task-instances',
name: 'task-instance-list',
component: components['task-instance-list'],
meta: {
title: '任务实例'
}
},
{
path: '/projects/:projectCode/task-definitions',
name: 'task-definition-list',
component: components['task-definition-list'],
meta: {
title: '任务定义'
}
} }
] ]
} }

36
dolphinscheduler-ui-next/src/views/projects/dag/workflow/hook-demo.ts

@ -1,36 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { ref, onMounted, Ref, onUnmounted } from 'vue'
interface Options {
// readonly: Ref<boolean>;
// canvas: Ref<HTMLElement | undefined>;
}
/**
* Canvas Init
* 1. Bind the graph to the dom
* 2. Redraw when the page is resized
* 3. Register custom graphics
*/
export function useCanvasInit(options: Options) {
// Whether the graph can be operated
const {} = options
return {}
}

25
dolphinscheduler-ui-next/src/views/projects/task-definition-list/task-definition-list.tsx

@ -0,0 +1,25 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { defineComponent } from 'vue'
export default defineComponent({
name: 'TaskDefinitionList',
setup() {
return () => <div>TaskDefinitionList</div>
}
})

0
dolphinscheduler-ui-next/src/views/projects/dag/task/config.ts → dolphinscheduler-ui-next/src/views/projects/task-details/config.ts

0
dolphinscheduler-ui-next/src/views/projects/dag/task/task-config.tsx → dolphinscheduler-ui-next/src/views/projects/task-details/task-config.tsx

4
dolphinscheduler-ui-next/src/views/projects/dag/index.tsx → dolphinscheduler-ui-next/src/views/projects/task-instance-list/task-instance-list.tsx

@ -18,8 +18,8 @@
import { defineComponent } from 'vue' import { defineComponent } from 'vue'
export default defineComponent({ export default defineComponent({
name: 'Projects', name: 'TaskInstanceList',
setup() { setup() {
return () => <div>Projects</div> return () => <div>TaskInstanceList</div>
} }
}) })

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-list.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-definition-list/workflow-definition-list.tsx

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-canvas.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-canvas.tsx

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-config.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-config.ts

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-hooks.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-hooks.ts

2
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-sidebar.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-sidebar.tsx

@ -18,7 +18,7 @@
import type { PropType, Ref } from 'vue' import type { PropType, Ref } from 'vue'
import type { Dragged } from './dag' import type { Dragged } from './dag'
import { defineComponent, ref, inject } from 'vue' import { defineComponent, ref, inject } from 'vue'
import { ALL_TASK_TYPES } from '../task/config' import { ALL_TASK_TYPES } from '../task-details/config'
import { useSidebarDrag } from './dag-hooks' import { useSidebarDrag } from './dag-hooks'
import Styles from './dag.module.scss' import Styles from './dag.module.scss'

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag-toolbar.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag-toolbar.tsx

64
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.module.scss → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag.module.scss

@ -83,52 +83,52 @@ $toolbarHeight: 50px;
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 10px; margin-right: 10px;
&.icon-shell { &.icon-shell {
background-image: url("../../../../assets/images/task-icons/shell.png"); background-image: url("../../../assets/images/task-icons/shell.png");
} }
&.icon-sub_process { &.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 { &.icon-procedure {
background-image: url("../../../../assets/images/task-icons/procedure.png"); background-image: url("../../../assets/images/task-icons/procedure.png");
} }
&.icon-sql { &.icon-sql {
background-image: url("../../../../assets/images/task-icons/sql.png"); background-image: url("../../../assets/images/task-icons/sql.png");
} }
&.icon-flink { &.icon-flink {
background-image: url("../../../../assets/images/task-icons/flink.png"); background-image: url("../../../assets/images/task-icons/flink.png");
} }
&.icon-mr { &.icon-mr {
background-image: url("../../../../assets/images/task-icons/mr.png"); background-image: url("../../../assets/images/task-icons/mr.png");
} }
&.icon-python { &.icon-python {
background-image: url("../../../../assets/images/task-icons/python.png"); background-image: url("../../../assets/images/task-icons/python.png");
} }
&.icon-dependent { &.icon-dependent {
background-image: url("../../../../assets/images/task-icons/dependent.png"); background-image: url("../../../assets/images/task-icons/dependent.png");
} }
&.icon-http { &.icon-http {
background-image: url("../../../../assets/images/task-icons/http.png"); background-image: url("../../../assets/images/task-icons/http.png");
} }
&.icon-datax { &.icon-datax {
background-image: url("../../../../assets/images/task-icons/datax.png"); background-image: url("../../../assets/images/task-icons/datax.png");
} }
&.icon-pigeon { &.icon-pigeon {
background-image: url("../../../../assets/images/task-icons/pigeon.png"); background-image: url("../../../assets/images/task-icons/pigeon.png");
} }
&.icon-sqoop { &.icon-sqoop {
background-image: url("../../../../assets/images/task-icons/sqoop.png"); background-image: url("../../../assets/images/task-icons/sqoop.png");
} }
&.icon-conditions { &.icon-conditions {
background-image: url("../../../../assets/images/task-icons/conditions.png"); background-image: url("../../../assets/images/task-icons/conditions.png");
} }
&.icon-seatunnel { &.icon-seatunnel {
background-image: url("../../../../assets/images/task-icons/seatunnel.png"); background-image: url("../../../assets/images/task-icons/seatunnel.png");
} }
&.icon-spark { &.icon-spark {
background-image: url("../../../../assets/images/task-icons/spark.png"); background-image: url("../../../assets/images/task-icons/spark.png");
} }
&.icon-switch { &.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; background-color: $blueBg;
.sidebar-icon { .sidebar-icon {
&.icon-shell { &.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 { &.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 { &.icon-procedure {
background-image: url("../../../../assets/images/task-icons/procedure_hover.png"); background-image: url("../../../assets/images/task-icons/procedure_hover.png");
} }
&.icon-sql { &.icon-sql {
background-image: url("../../../../assets/images/task-icons/sql_hover.png"); background-image: url("../../../assets/images/task-icons/sql_hover.png");
} }
&.icon-flink { &.icon-flink {
background-image: url("../../../../assets/images/task-icons/flink_hover.png"); background-image: url("../../../assets/images/task-icons/flink_hover.png");
} }
&.icon-mr { &.icon-mr {
background-image: url("../../../../assets/images/task-icons/mr_hover.png"); background-image: url("../../../assets/images/task-icons/mr_hover.png");
} }
&.icon-python { &.icon-python {
background-image: url("../../../../assets/images/task-icons/python_hover.png"); background-image: url("../../../assets/images/task-icons/python_hover.png");
} }
&.icon-dependent { &.icon-dependent {
background-image: url("../../../../assets/images/task-icons/dependent_hover.png"); background-image: url("../../../assets/images/task-icons/dependent_hover.png");
} }
&.icon-http { &.icon-http {
background-image: url("../../../../assets/images/task-icons/http_hover.png"); background-image: url("../../../assets/images/task-icons/http_hover.png");
} }
&.icon-datax { &.icon-datax {
background-image: url("../../../../assets/images/task-icons/datax_hover.png"); background-image: url("../../../assets/images/task-icons/datax_hover.png");
} }
&.icon-pigeon { &.icon-pigeon {
background-image: url("../../../../assets/images/task-icons/pigeon_hover.png"); background-image: url("../../../assets/images/task-icons/pigeon_hover.png");
} }
&.icon-sqoop { &.icon-sqoop {
background-image: url("../../../../assets/images/task-icons/sqoop_hover.png"); background-image: url("../../../assets/images/task-icons/sqoop_hover.png");
} }
&.icon-conditions { &.icon-conditions {
background-image: url("../../../../assets/images/task-icons/conditions_hover.png"); background-image: url("../../../assets/images/task-icons/conditions_hover.png");
} }
&.icon-seatunnel { &.icon-seatunnel {
background-image: url("../../../../assets/images/task-icons/seatunnel_hover.png"); background-image: url("../../../assets/images/task-icons/seatunnel_hover.png");
} }
&.icon-spark { &.icon-spark {
background-image: url("../../../../assets/images/task-icons/spark_hover.png"); background-image: url("../../../assets/images/task-icons/spark_hover.png");
} }
&.icon-switch { &.icon-switch {
background-image: url("../../../../assets/images/task-icons/switch_hover.png"); background-image: url("../../../assets/images/task-icons/switch_hover.png");
} }
} }
} }

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/dag.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/dag.tsx

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-canvas-drop.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/use-canvas-drop.ts

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-canvas-init.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/use-canvas-init.ts

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-cell-active.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/use-cell-active.ts

2
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-graph-operations.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/use-graph-operations.ts

@ -18,7 +18,7 @@
import type { Ref } from 'vue' import type { Ref } from 'vue'
import type { Node, Graph, Edge } from '@antv/x6' import type { Node, Graph, Edge } from '@antv/x6'
import { X6_NODE_NAME, X6_EDGE_NAME } from './dag-config' import { X6_NODE_NAME, X6_EDGE_NAME } from './dag-config'
import { ALL_TASK_TYPES } from '../task/config' import { ALL_TASK_TYPES } from '../task-details/config'
import utils from '@/utils' import utils from '@/utils'
interface Options { interface Options {

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-node-search.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/use-node-search.ts

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/use-sidebar-drag.ts → dolphinscheduler-ui-next/src/views/projects/workflow-details/use-sidebar-drag.ts

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-create.module.scss → dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-definition-create.module.scss

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-create.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-definition-create.tsx

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-definition-details.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-definition-details.tsx

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-instance-details.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-details/workflow-instance-details.tsx

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/x6-style.scss → dolphinscheduler-ui-next/src/views/projects/workflow-details/x6-style.scss

0
dolphinscheduler-ui-next/src/views/projects/dag/workflow/workflow-instance-list.tsx → dolphinscheduler-ui-next/src/views/projects/workflow-instance-list/workflow-instance-list.tsx

Loading…
Cancel
Save