Merge pull request #35 from codingapi/dev

Dev

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java

@@ -144,8 +144,7 @@ public void pushHistory(Workflow workflow,List<FlowRecord> historyRecords) {
             history.setNodeId(item.getNodeId());
             history.setNodeType(item.getNodeType());
             history.setUpdateTime(item.getUpdateTime());
-            history.setCurrentOperatorId(item.getCurrentOperatorId());
-            history.setCurrentOperatorName(item.getCurrentOperatorName());
+            history.setCurrentOperator(new FlowOperator(item.getCurrentOperatorId(), item.getCurrentOperatorName()));
             this.histories.add(history);
         }
     }
@@ -221,14 +220,9 @@ public static class History{
         private long updateTime;
 
         /**
-         * 当前审批人Id
+         * 当前审批人
          */
-        private long currentOperatorId;
-
-        /**
-         * 当前审批人名称
-         */
-        private String currentOperatorName;
+        private FlowOperator currentOperator;
     }
 
     @Data

frontend/apps/app-pc/rsbuild.config.ts

@@ -35,7 +35,7 @@ export default defineConfig({
     tools: {
         rspack: {
             /**
-             * ignore warnings from @coze-editor/editor/language-typescript
+             * ignore warnings from @coze-design-editor/design-editor/language-typescript
              */
             ignoreWarnings: [/Critical dependency: the request of a dependency is an expression/],
         },

…ts/editor/components/base-node/index.tsx …gn-editor/components/base-node/index.tsxfrontend/packages/flow-design/src/components/editor/components/base-node/index.tsx renamed to frontend/packages/flow-design/src/components/design-editor/components/base-node/index.tsx frontend/packages/flow-design/src/components/editor/components/base-node/index.tsx renamed to frontend/packages/flow-design/src/components/design-editor/components/base-node/index.tsx

@@ -1,13 +1,13 @@
 import {type FlowNodeEntity, useClientContext} from '@flowgram.ai/fixed-layout-editor';
 import React, {useCallback, useContext} from "react";
-import {NodeRenderContext} from "@/components/editor/context";
-import {NodePanel} from "@/components/editor/node-components/panel";
-import {NodeHeader} from "@/components/editor/node-components/header";
+import {NodeRenderContext} from "@/components/design-editor/context";
+import {NodePanel} from "@/components/design-editor/node-components/panel";
+import {NodeHeader} from "@/components/design-editor/node-components/header";
 import {Button} from "antd";
-import {nodeFormPanelFactory} from "@/components/editor/components/sidebar";
+import {nodeFormPanelFactory} from "@/components/design-editor/components/sidebar";
 import {usePanelManager} from "@flowgram.ai/panel-manager-plugin";
-import {useDesignContext} from "@/pages/design-panel/hooks/use-design-context";
-import {NodeType} from "@/components/editor/typings/node-type";
+import {useDesignContext} from "@/components/design-panel/hooks/use-design-context";
+import {NodeType} from "@/components/design-editor/typings/node-type";
 
 interface BranchAdderPropsType {
     activated?: boolean;

…s/editor/components/base-node/styles.tsx …n-editor/components/base-node/styles.tsxfrontend/packages/flow-design/src/components/editor/components/base-node/styles.tsx renamed to frontend/packages/flow-design/src/components/design-editor/components/base-node/styles.tsx frontend/packages/flow-design/src/components/editor/components/base-node/styles.tsx renamed to frontend/packages/flow-design/src/components/design-editor/components/base-node/styles.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {NodeType} from "@/components/editor/typings/node-type";
+import {NodeType} from "@/components/design-editor/typings/node-type";
 import {Button, Flex, Space,Input,theme} from "antd";
 import {ApiOutlined, AuditOutlined, BellOutlined, BranchesOutlined, ClockCircleOutlined, CloseOutlined, EditOutlined,
     MergeOutlined,