Skip to content

fix: 修复前端构建依赖与类型检查问题 #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luomgf wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix: 修复前端构建依赖与类型检查问题 #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bf4392
fix: 修复前端构建依赖与类型检查问题
luomgf May 13, 2026
17702d3
fix: 修复缺少vue-img-cutter
luomgf May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"vue": "^3.5.21",
"vue-draggable-plus": "^0.6.0",
"vue-i18n": "^11.1.10",
"vue-img-cutter": "^3.1.1",
"vue-json-pretty": "^2.5.0",
"vue-router": "^4.5.1",
"vue-web-terminal": "^3.4.1",
Expand Down
15 changes: 14 additions & 1 deletion frontend/web/src/components/layouts/fa-menus/fa-sidebar-menu/widget/SidebarSubmenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<ElMenuItem
v-else
:index="isExternalLink(item) ? undefined : item.path || item.meta.title"
:index="getLeafMenuIndex(item, index)"
:level-item="level + 1"
@click="goPage(item)"
>
Expand Down Expand Up @@ -192,6 +192,19 @@ const isExternalLink = (item: AppRouteRecord): boolean => {
return !!(item.meta.link && !item.meta.isIframe);
};

/**
* 生成叶子菜单的索引
* @param item 菜单项数据
* @param index 索引
* @returns 菜单索引
*/
const getLeafMenuIndex = (item: AppRouteRecord, index: number): string => {
if (isExternalLink(item)) {
return item.meta.link || item.path || `external-${props.level}-${index}`;
}
return item.path || item.meta.title || `menu-${props.level}-${index}`;
};

/**
* 生成唯一的 key
* 使用 path、title 和 index 组合确保唯一性
Expand Down
80 changes: 44 additions & 36 deletions frontend/web/src/views/module_task/workflow/components/WorkflowDesignDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ import WorkflowDefinitionAPI, {
} from "@/api/module_task/workflow/definition";
import WorkflowNodeTypeAPI from "@/api/module_task/workflow/node-type";

type FlowNode = Node<any, any>;
type FlowEdge = Edge<any>;

defineOptions({
name: "WorkflowCreateDrawer",
inheritAttrs: false,
Expand Down Expand Up @@ -435,8 +438,8 @@ const handleFormatCanvas = () => {
ElMessage.success("画布格式化完成");
};

const nodes = ref<Node[]>([]);
const edges = ref<Edge[]>([]);
const nodes = ref<FlowNode[]>([]);
const edges = ref<FlowEdge[]>([]);

const searchKeyword = ref("");

Expand Down Expand Up @@ -482,12 +485,12 @@ const getCategoryText = (category: string) => {
const nodeTypesRegistry = ref<Record<string, Component>>({});

const updateState = ref("");
const selectedEdge = ref<Edge>();
const selectedNode = ref<Node>();
const selectedEdge = ref<FlowEdge>();
const selectedNode = ref<FlowNode>();
const loading = ref(false);

const getNodes = () => getNodesRef.value;
const getEdges = () =>
const getNodes = (): FlowNode[] => getNodesRef.value as FlowNode[];
const getEdges = (): FlowEdge[] =>
getEdgesRef.value.map((edge) => ({
id: edge.id,
source: edge.source,
Expand All @@ -497,7 +500,7 @@ const getEdges = () =>
animated: edge.animated,
style: edge.style,
data: edge.data,
}));
})) as FlowEdge[];

const loadNodeTypes = async () => {
loading.value = true;
Expand Down Expand Up @@ -540,14 +543,14 @@ onInit((vueFlowInstance) => {
if (res.data && res.data.data) {
nodes.value = res.data.data.nodes || [];
edges.value = res.data.data.edges || [];
saveToHistory(nodes.value, edges.value);
pushHistoryFromCanvas();
}
} catch {
ElMessage.error("流程加载失败");
}
})();
} else {
saveToHistory(nodes.value, edges.value);
pushHistoryFromCanvas();
}
});

Expand All @@ -557,7 +560,7 @@ onConnect((connection) => {
type: edgeStyle.value,
animated: edgeAnimated.value,
});
saveToHistory(nodes.value, edges.value);
pushHistoryFromCanvas();
});

function handleValidate() {
Expand All @@ -571,8 +574,8 @@ function handleValidate() {
errors.push("流程中没有节点");
}

const nodeIds = new Set(allNodesList.map((n: Node) => n.id));
allEdgesList.forEach((edge: Edge) => {
const nodeIds = new Set(allNodesList.map((n: FlowNode) => n.id));
allEdgesList.forEach((edge: FlowEdge) => {
if (!nodeIds.has(edge.source)) {
errors.push(`连线 ${edge.label || edge.id} 的源节点不存在`);
}
Expand All @@ -582,12 +585,13 @@ function handleValidate() {
});

const orphanNodes = allNodesList.filter(
(node: Node) => !allEdgesList.some((e: Edge) => e.source === node.id || e.target === node.id)
(node: FlowNode) =>
!allEdgesList.some((e: FlowEdge) => e.source === node.id || e.target === node.id)
);

if (orphanNodes.length > 0) {
warnings.push(
`有 ${orphanNodes.length} 个孤立节点: ${orphanNodes.map((n: Node) => n.data.label).join(", ")}`
`有 ${orphanNodes.length} 个孤立节点: ${orphanNodes.map((n: FlowNode) => n.data.label).join(", ")}`
);
}

Expand Down Expand Up @@ -662,9 +666,9 @@ function handleClosePanel() {
function handleSaveNode(data: any) {
if (!selectedNode.value) return;
const nodeId = selectedNode.value!.id;
if (nodeId && updateNodeData(nodeId, data, getNodes, setNodes)) {
saveToHistory(nodes.value, edges.value);
}
if (!nodeId) return;
if (!updateNodeData(nodeId, data, getNodes, setNodes)) return;
pushHistoryFromCanvas();
}

function handleDeleteNode() {
Expand All @@ -682,7 +686,7 @@ function handleDeleteNode() {
deleteNode(nodeId, getNodes, setNodes, getEdges, setEdges);
ElMessage.success("节点删除成功");
handleClosePanel();
saveToHistory(nodes.value, edges.value);
pushHistoryFromCanvas();
} catch {
// 用户取消
}
Expand All @@ -692,9 +696,9 @@ function handleDeleteNode() {
function handleSaveEdge(data: any) {
if (!selectedEdge.value) return;
const edgeId = selectedEdge.value!.id;
if (edgeId && updateEdgeData(edgeId, data, getEdges, setEdges)) {
saveToHistory(nodes.value, edges.value);
}
if (!edgeId) return;
if (!updateEdgeData(edgeId, data, getEdges, setEdges)) return;
pushHistoryFromCanvas();
}

function handleDeleteEdge() {
Expand All @@ -712,7 +716,7 @@ function handleDeleteEdge() {
deleteEdge(edgeId, getEdges, setEdges);
ElMessage.success("连线删除成功");
handleClosePanel();
saveToHistory(nodes.value, edges.value);
pushHistoryFromCanvas();
} catch {
// 用户取消
}
Expand Down Expand Up @@ -788,15 +792,19 @@ const handleClose = () => {
};

// 历史记录管理
const history = ref<{ nodes: Node[]; edges: Edge[] }[]>([]);
const history = ref<{ nodes: unknown[]; edges: unknown[] }[]>([]);
const historyIndex = ref(-1);

function saveToHistory(nodesData: Node[], edgesData: Edge[]) {
function saveToHistory(nodesData: FlowNode[], edgesData: FlowEdge[]) {
history.value = history.value.slice(0, historyIndex.value + 1);
history.value.push({ nodes: nodesData, edges: edgesData });
historyIndex.value = history.value.length - 1;
}

function pushHistoryFromCanvas() {
saveToHistory([...nodes.value] as FlowNode[], [...edges.value] as FlowEdge[]);
}

// 拖拽相关函数
function onDragStart(event: DragEvent, node: LoadedNodeType) {
if (event.dataTransfer) {
Expand All @@ -820,16 +828,16 @@ function handleNodeDrop(
event: DragEvent,
screenToFlowCoordinate: (position: { x: number; y: number }) => { x: number; y: number },
onNodesInitialized: (callback: () => void) => void,
updateNode: (id: string, node: Partial<Node>) => void,
addNodes: (nodes: Node[]) => void
updateNode: (id: string, node: Partial<FlowNode>) => void,
addNodes: (nodes: FlowNode[]) => void
) {
const data = event.dataTransfer?.getData("application/vueflow");
if (!data) return;

const nodeType = JSON.parse(data);
const position = screenToFlowCoordinate({ x: event.clientX, y: event.clientY });

const newNode: Node = {
const newNode: FlowNode = {
id: `node-${Date.now()}`,
type: nodeType.type,
position,
Expand All @@ -849,8 +857,8 @@ function handleNodeDrop(
function updateNodeData(
nodeId: string,
data: any,
getNodes: () => Node[],
setNodes: (nodes: Node[]) => void
getNodes: () => FlowNode[],
setNodes: (nodes: FlowNode[]) => void
) {
const currentNodes = getNodes();
const nodeIndex = currentNodes.findIndex((n) => n.id === nodeId);
Expand All @@ -870,10 +878,10 @@ function updateNodeData(

function deleteNode(
nodeId: string,
getNodes: () => Node[],
setNodes: (nodes: Node[]) => void,
getEdges: () => Edge[],
setEdges: (edges: Edge[]) => void
getNodes: () => FlowNode[],
setNodes: (nodes: FlowNode[]) => void,
getEdges: () => FlowEdge[],
setEdges: (edges: FlowEdge[]) => void
) {
const currentNodes = getNodes();
const currentEdges = getEdges();
Expand All @@ -887,8 +895,8 @@ function deleteNode(
function updateEdgeData(
edgeId: string,
data: any,
getEdges: () => Edge[],
setEdges: (edges: Edge[]) => void
getEdges: () => FlowEdge[],
setEdges: (edges: FlowEdge[]) => void
) {
const currentEdges = getEdges();
const edgeIndex = currentEdges.findIndex((e) => e.id === edgeId);
Expand All @@ -907,7 +915,7 @@ function updateEdgeData(
return true;
}

function deleteEdge(edgeId: string, getEdges: () => Edge[], setEdges: (edges: Edge[]) => void) {
function deleteEdge(edgeId: string, getEdges: () => FlowEdge[], setEdges: (edges: FlowEdge[]) => void) {
const currentEdges = getEdges();
const filteredEdges = currentEdges.filter((e) => e.id !== edgeId);
setEdges(filteredEdges);
Expand Down