Skip to content

Commit 07e9bc9

Browse files
committed
fix flow
1 parent b2a2998 commit 07e9bc9

23 files changed

+432
-439
lines changed

.DS_Store

0 Bytes
Binary file not shown.

admin-pro-ui/src/components/flow/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import Start from "@/components/flow/nodes/Start";
77
import Node from "@/components/flow/nodes/Node";
88
import Over from "@/components/flow/nodes/Over";
99
import Circulate from "@/components/flow/nodes/Circulate";
10-
import ControlPanel from "@/components/flow/layout/ControlPanel";
11-
import NodePanel from "@/components/flow/layout/NodePanel";
10+
import ControlPanel from "@/components/flow/panel/ControlPanel";
11+
import NodePanel from "@/components/flow/panel/NodePanel";
1212
import {EdgeType} from "@/components/flow/flow/types";
1313

1414
import "./index.scss";

admin-pro-ui/src/components/flow/layout/NodePanel.tsx

Lines changed: 0 additions & 104 deletions
This file was deleted.

admin-pro-ui/src/components/flow/nodes/Circulate/index.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import React from "react";
33
import ReactDOM from "react-dom/client";
44
import "./index.scss";
55
import {InboxOutlined, SettingFilled} from "@ant-design/icons";
6-
import CirculateSettingPanel from "@/components/flow/panel/circulate";
7-
import {NodeState} from "@/components/flow/nodes/states";
8-
import {Tag} from "antd";
9-
import StateLabel from "@/components/flow/nodes/StateLabel";
6+
import CirculateSettingPanel from "@/components/flow/nodes/panel/circulate";
7+
import StateTag from "@/components/flow/nodes/panel/StateTag";
8+
import {NodeState} from "@/components/flow/types";
109

1110
type CirculateProperties = {
1211
id: string;
@@ -62,7 +61,7 @@ export const CirculateView: React.FC<CirculateProps> = (props) => {
6261

6362
{state && (
6463
<div className={"state"}>
65-
<StateLabel
64+
<StateTag
6665
state={state}/>
6766
</div>
6867
)}

admin-pro-ui/src/components/flow/nodes/Node/index.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import React from "react";
33
import ReactDOM from "react-dom/client";
44
import "./index.scss";
55
import {PlusCircleFilled, SettingFilled} from "@ant-design/icons";
6-
import NodeSettingPanel from "@/components/flow/panel/node";
7-
import {NodeState} from "@/components/flow/nodes/states";
8-
import {Tag} from "antd";
9-
import StateLabel from "@/components/flow/nodes/StateLabel";
6+
import NodeSettingPanel from "@/components/flow/nodes/panel/node";
7+
import StateTag from "@/components/flow/nodes/panel/StateTag";
8+
import {NodeState} from "@/components/flow/types";
109

1110
type NodeProperties = {
1211
id: string;
@@ -63,7 +62,7 @@ export const NodeView: React.FC<NodeProps> = (props) => {
6362

6463
{state && (
6564
<div className={"state"}>
66-
<StateLabel
65+
<StateTag
6766
state={state}/>
6867
</div>
6968
)}

admin-pro-ui/src/components/flow/nodes/Over/index.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ import React from "react";
33
import ReactDOM from "react-dom/client";
44
import "./index.scss";
55
import {CheckCircleFilled, SettingFilled} from "@ant-design/icons";
6-
import OverSettingPanel from "@/components/flow/panel/over";
7-
import FlowUtils from "@/components/flow/utils";
8-
import {NodeState} from "@/components/flow/nodes/states";
9-
import {Tag} from "antd";
10-
import StateLabel from "@/components/flow/nodes/StateLabel";
6+
import OverSettingPanel from "@/components/flow/nodes/panel/over";
7+
import StateTag from "@/components/flow/nodes/panel/StateTag";
8+
import {NodeState} from "@/components/flow/types";
119

1210
type OverProperties = {
1311
id:string;
@@ -62,7 +60,7 @@ export const OverView: React.FC<OverProps> = (props) => {
6260

6361
{state && (
6462
<div className={"state"}>
65-
<StateLabel
63+
<StateTag
6664
state={state}/>
6765
</div>
6866
)}

admin-pro-ui/src/components/flow/nodes/Start/index.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import React from "react";
33
import ReactDOM from "react-dom/client";
44
import "./index.scss";
55
import {PlayCircleFilled, SettingFilled} from "@ant-design/icons";
6-
import StartSettingPanel from "@/components/flow/panel/start";
7-
import {NodeState} from "@/components/flow/nodes/states";
8-
import {Tag} from "antd";
9-
import StateLabel from "@/components/flow/nodes/StateLabel";
6+
import StartSettingPanel from "@/components/flow/nodes/panel/start";
7+
import StateTag from "@/components/flow/nodes/panel/StateTag";
8+
import {NodeState} from "@/components/flow/types";
109

1110
type StartProperties ={
1211
id:string;
@@ -61,7 +60,7 @@ export const StartView: React.FC<StartProps> = (props) => {
6160

6261
{state && (
6362
<div className={"state"}>
64-
<StateLabel
63+
<StateTag
6564
state={state}/>
6665
</div>
6766
)}

admin-pro-ui/src/components/flow/panel/ButtonPanel.tsx renamed to admin-pro-ui/src/components/flow/nodes/panel/ButtonPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
} from "@ant-design/pro-components";
1313
import {Button, ColorPicker, Popconfirm, Space} from "antd";
1414
import FlowUtils from "@/components/flow/utils";
15-
import ScriptModal from "@/components/flow/panel/ScriptModal";
15+
import ScriptModal from "@/components/flow/nodes/panel/ScriptModal";
1616
import {EyeOutlined, ReloadOutlined} from "@ant-design/icons";
1717
import {CustomButtonType} from "@/components/flow/flow/types";
1818

admin-pro-ui/src/components/flow/panel/EdgePanel.tsx renamed to admin-pro-ui/src/components/flow/nodes/panel/EdgePanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ActionType, ProForm, ProTable} from "@ant-design/pro-components";
33
import {Input, InputNumber, Popconfirm, Space} from "antd";
44
import {CheckOutlined, EditOutlined, SettingOutlined} from "@ant-design/icons";
55
import FlowUtils from "@/components/flow/utils";
6-
import ScriptModal from "@/components/flow/panel/ScriptModal";
6+
import ScriptModal from "@/components/flow/nodes/panel/ScriptModal";
77

88
interface EdgePanelProps {
99
id?: string;

0 commit comments

Comments
 (0)