Skip to content
Merged

Dev #35

Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -221,14 +220,9 @@ public static class History{
private long updateTime;

/**
* 当前审批人Id
* 当前审批人
*/
private long currentOperatorId;

/**
* 当前审批人名称
*/
private String currentOperatorName;
private FlowOperator currentOperator;
}

@Data
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/app-pc/rsbuild.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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/],
},
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {FlowNodeEntity, useClientContext} from "@flowgram.ai/fixed-layout-editor";
import React from "react";
import {FlowNodeRegistry} from "@/components/editor/typings";
import {FlowNodeRegistry} from "@/components/design-editor/typings";
import styled from 'styled-components';
import {FlowNodeRegistries} from "@/components/editor/nodes";
import {NodeIcon} from "@/components/editor/components/node-icon";
import {NodeType} from "@/components/editor/typings/node-type";
import {useDesignContext} from "@/pages/design-panel/hooks/use-design-context";
import {FlowNodeRegistries} from "@/components/design-editor/nodes";
import {NodeIcon} from "@/components/design-editor/components/node-icon";
import {NodeType} from "@/components/design-editor/typings/node-type";
import {useDesignContext} from "@/components/design-panel/hooks/use-design-context";

const NodesWrap = styled.div`
max-height: 500px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {ConstantKeys, FixedLayoutProps, FlowLayoutDefault, FlowRendererKey} from
import {createDownloadPlugin} from "@flowgram.ai/export-plugin";
import {createPanelManagerPlugin} from "@flowgram.ai/panel-manager-plugin";
import {nodeFormPanelFactory} from "../components/sidebar";
import {BaseNode} from "@/components/editor/components/base-node";
import {BaseNode} from "@/components/design-editor/components/base-node";
import {debounce} from "lodash-es";
import {FlowDocumentJSON, FlowNodeRegistry} from "@/components/editor/typings";
import {Adder} from "@/components/editor/components/node-adder";
import {BranchAdder} from "@/components/editor/components/branch-adder";
import {FlowDocumentJSON, FlowNodeRegistry} from "@/components/design-editor/typings";
import {Adder} from "@/components/design-editor/components/node-adder";
import {BranchAdder} from "@/components/design-editor/components/branch-adder";
import {Collapse} from "../components/collapse";

export function useEditorProps(initialData: FlowDocumentJSON, nodeRegistries: FlowNodeRegistry[]): FixedLayoutProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from "react";
import {EditorRenderer, FixedLayoutEditorProvider, FixedLayoutPluginContext} from "@flowgram.ai/fixed-layout-editor";
import {useEditorProps} from './hooks/use-editor-props';
import {EditorTools} from "@/components/editor/tools";
import {EditorTools} from "@/components/design-editor/tools";
import {initialData as defaultInitialData} from './initial-data';
import {FlowNodeRegistries} from './nodes';
import "./index.scss";
import {FlowDocumentJSON} from "@/components/editor/typings";
import {FlowDocumentJSON} from "@/components/design-editor/typings";


export interface FlowEditorAction {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {FlowDocumentJSON} from "@/components/editor/typings";
import {FlowDocumentJSON} from "@/components/design-editor/typings";

export const initialData: FlowDocumentJSON = {
nodes: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {actionOptions, ActionType} from "@/components/editor/typings/node-type";
import {actionOptions, ActionType} from "@/components/design-editor/typings/node-type";
import {nanoid} from "nanoid";

export class ActionManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useContext} from "react";
import {Space, Switch} from "antd";
import {Table} from "@/components/table";
import {NodeRenderContext} from "@/components/editor/context";
import {ActionManager} from "@/components/editor/node-components/action/index";
import {Table} from "@/components/ui/table";
import {NodeRenderContext} from "@/components/design-editor/context";
import {ActionManager} from "@/components/design-editor/node-components/action/index";

interface ActionTableProps {
value: any[];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, {useCallback, useContext, useMemo, useState} from "react";
import {useIsSidebar} from "@/components/editor/hooks";
import {useIsSidebar} from "@/components/design-editor/hooks";
import {Button, Flex, Input, Space, theme} 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 {NodeRenderContext} from "@/components/editor/context";
import {NodeRenderContext} from "@/components/design-editor/context";
import {Field, FieldRenderProps} from "@flowgram.ai/fixed-layout-editor";
import {CloseOutlined, EditOutlined} from "@ant-design/icons";
import {NodeIcon} from "@/components/editor/components/node-icon";
import {NodeType} from "@/components/editor/typings/node-type";
import {FlowNodeRegistry} from "@/components/editor/typings";
import {NodeIcon} from "@/components/design-editor/components/node-icon";
import {NodeType} from "@/components/design-editor/typings/node-type";
import {FlowNodeRegistry} from "@/components/design-editor/typings";

interface HeaderTitleProps {
title: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import {TabBase} from "@/components/editor/node-components/taps/base";
import {TabAction} from "@/components/editor/node-components/taps/action";
import {TabPromission} from "@/components/editor/node-components/taps/promission";
import {TabBase} from "@/components/design-editor/node-components/taps/base";
import {TabAction} from "@/components/design-editor/node-components/taps/action";
import {TabPromission} from "@/components/design-editor/node-components/taps/promission";
import { TabsProps,Tabs } from "antd";

interface TabNodeLayoutProps{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, {useCallback, useContext, useMemo, useState} from "react";
import {Flex, theme} from "antd";
import {CloseCircleOutlined} from "@ant-design/icons";
import {NodeRenderContext} from "@/components/editor/context";
import {FlowNodeRegistry} from "@/components/editor/typings";
import {NodeRenderContext} from "@/components/design-editor/context";
import {FlowNodeRegistry} from "@/components/design-editor/typings";
import {useClientContext} from "@flowgram.ai/fixed-layout-editor";
import {useIsSidebar} from "@/components/editor/hooks";
import {useIsSidebar} from "@/components/design-editor/hooks";

interface NodePanelProps {
children?: React.ReactNode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {FlowForm} from "@/pages/design-panel/types";
import {FlowForm} from "@/components/design-panel/types";

export class PromissionManager {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import {Tabs,Switch} from "antd";
import {Table} from "@/components/table";
import {PromissionManager} from "@/components/editor/node-components/promission/index";
import {useDesignContext} from "@/pages/design-panel/hooks/use-design-context";
import {Table} from "@/components/ui/table";
import {PromissionManager} from "@/components/design-editor/node-components/promission/index";
import {useDesignContext} from "@/components/design-panel/hooks/use-design-context";

interface PromissionTableProps {
value: any;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import {Field, FieldRenderProps} from "@flowgram.ai/fixed-layout-editor";
import {ActionTable} from "@/components/editor/node-components/action/table";
import {ActionTable} from "@/components/design-editor/node-components/action/table";

export const TabAction: React.FC = () => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import {Field, FieldRenderProps} from "@flowgram.ai/fixed-layout-editor";
import {PromissionTable} from "@/components/editor/node-components/promission/table";
import {PromissionTable} from "@/components/design-editor/node-components/promission/table";

export const TabPromission: React.FC = () => {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-la

import {FlowNodeJSON} from '../../typings';
import {useIsSidebar} from '../../hooks';
import {NodeHeader} from "@/components/editor/node-components/header";
import {NodePanel} from "@/components/editor/node-components/panel";
import {TabNodeLayout} from "@/components/editor/node-components/layout";
import {OperatorLoadStrategy} from "@/components/editor/node-components/strategy/operator-load";
import {NodeTitleStrategy} from "@/components/editor/node-components/strategy/node-title";
import {MultiOperatorAuditStrategy} from "@/components/editor/node-components/strategy/multi-operator-audit";
import {SameOperatorAuditStrategy} from "@/components/editor/node-components/strategy/same-operator-audit";
import {ErrorTriggerStrategy} from "@/components/editor/node-components/strategy/error-trigger";
import {ResubmitStrategy} from "@/components/editor/node-components/strategy/resubmit";
import {AdviceStrategy} from "@/components/editor/node-components/strategy/advice";
import {TimeoutStrategy} from "@/components/editor/node-components/strategy/timeout";
import {RecordMergeStrategy} from "@/components/editor/node-components/strategy/record-merge";
import {RevokeStrategy} from "@/components/editor/node-components/strategy/revoke";
import {View} from "@/components/editor/node-components/view";
import {NodeHeader} from "@/components/design-editor/node-components/header";
import {NodePanel} from "@/components/design-editor/node-components/panel";
import {TabNodeLayout} from "@/components/design-editor/node-components/layout";
import {OperatorLoadStrategy} from "@/components/design-editor/node-components/strategy/operator-load";
import {NodeTitleStrategy} from "@/components/design-editor/node-components/strategy/node-title";
import {MultiOperatorAuditStrategy} from "@/components/design-editor/node-components/strategy/multi-operator-audit";
import {SameOperatorAuditStrategy} from "@/components/design-editor/node-components/strategy/same-operator-audit";
import {ErrorTriggerStrategy} from "@/components/design-editor/node-components/strategy/error-trigger";
import {ResubmitStrategy} from "@/components/design-editor/node-components/strategy/resubmit";
import {AdviceStrategy} from "@/components/design-editor/node-components/strategy/advice";
import {TimeoutStrategy} from "@/components/design-editor/node-components/strategy/timeout";
import {RecordMergeStrategy} from "@/components/design-editor/node-components/strategy/record-merge";
import {RevokeStrategy} from "@/components/design-editor/node-components/strategy/revoke";
import {View} from "@/components/design-editor/node-components/view";

export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
const isSidebar = useIsSidebar();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-la

import {FlowNodeJSON} from '../../typings';
import {useIsSidebar} from '../../hooks';
import {NodeHeader} from "@/components/editor/node-components/header";
import {NodePanel} from "@/components/editor/node-components/panel";
import {ConditionScript} from "@/components/editor/node-components/condition";
import {NodeHeader} from "@/components/design-editor/node-components/header";
import {NodePanel} from "@/components/design-editor/node-components/panel";
import {ConditionScript} from "@/components/design-editor/node-components/condition";

export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
const isSidebar = useIsSidebar();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {provideJsonSchemaOutputs, syncVariableTitle,} from '@flowgram.ai/form-ma
import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-layout-editor';

import {FlowNodeJSON} from '../../typings';
import {BranchAdderRender} from "@/components/editor/components/branch-adder";
import {BranchAdderRender} from "@/components/design-editor/components/branch-adder";

export const renderForm = ({form}: FormRenderProps<FlowNodeJSON['data']>) => {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-la

import {FlowNodeJSON} from '../../typings';
import {useIsSidebar} from '../../hooks';
import {NodeHeader} from "@/components/editor/node-components/header";
import {NodePanel} from "@/components/editor/node-components/panel";
import {PanelLayout} from "@/components/editor/node-components/layout";
import {DelayStrategy} from "@/components/editor/node-components/strategy/deplay";
import {NodeHeader} from "@/components/design-editor/node-components/header";
import {NodePanel} from "@/components/design-editor/node-components/panel";
import {PanelLayout} from "@/components/design-editor/node-components/layout";
import {DelayStrategy} from "@/components/design-editor/node-components/strategy/deplay";

export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
const isSidebar = useIsSidebar();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {provideJsonSchemaOutputs, syncVariableTitle,} from '@flowgram.ai/form-ma
import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-layout-editor';

import {FlowNodeJSON} from '../../typings';
import {NodePanel} from "@/components/editor/node-components/panel";
import {NodeIcon} from "@/components/editor/components/node-icon";
import {NodePanel} from "@/components/design-editor/node-components/panel";
import {NodeIcon} from "@/components/design-editor/components/node-icon";
import {Space} from "antd";

export const renderForm = ({form}: FormRenderProps<FlowNodeJSON['data']>) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const EndNodeRegistry: FlowNodeRegistry = {
meta: {
isNodeEnd: true, // Mark as end
deleteDisable:true, // End node cannot delete
selectable: false, // End node cannot select
selectable: false, // End node cannot workflow-select
copyDisable: true, // End node canot copy
expandable: false, // disable expanded
addDisable: true, // End Node cannot be added,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-la

import {FlowNodeJSON} from '../../typings';
import {useIsSidebar} from '../../hooks';
import {NodeHeader} from "@/components/editor/node-components/header";
import {NodePanel} from "@/components/editor/node-components/panel";
import {TabNodeLayout} from "@/components/editor/node-components/layout";
import {OperatorLoadStrategy} from "@/components/editor/node-components/strategy/operator-load";
import {NodeTitleStrategy} from "@/components/editor/node-components/strategy/node-title";
import {ErrorTriggerStrategy} from "@/components/editor/node-components/strategy/error-trigger";
import {TimeoutStrategy} from "@/components/editor/node-components/strategy/timeout";
import {MultiOperatorAuditStrategy} from "@/components/editor/node-components/strategy/multi-operator-audit";
import {SameOperatorAuditStrategy} from "@/components/editor/node-components/strategy/same-operator-audit";
import {RecordMergeStrategy} from "@/components/editor/node-components/strategy/record-merge";
import {ResubmitStrategy} from "@/components/editor/node-components/strategy/resubmit";
import {AdviceStrategy} from "@/components/editor/node-components/strategy/advice";
import {View} from "@/components/editor/node-components/view";
import {NodeHeader} from "@/components/design-editor/node-components/header";
import {NodePanel} from "@/components/design-editor/node-components/panel";
import {TabNodeLayout} from "@/components/design-editor/node-components/layout";
import {OperatorLoadStrategy} from "@/components/design-editor/node-components/strategy/operator-load";
import {NodeTitleStrategy} from "@/components/design-editor/node-components/strategy/node-title";
import {ErrorTriggerStrategy} from "@/components/design-editor/node-components/strategy/error-trigger";
import {TimeoutStrategy} from "@/components/design-editor/node-components/strategy/timeout";
import {MultiOperatorAuditStrategy} from "@/components/design-editor/node-components/strategy/multi-operator-audit";
import {SameOperatorAuditStrategy} from "@/components/design-editor/node-components/strategy/same-operator-audit";
import {RecordMergeStrategy} from "@/components/design-editor/node-components/strategy/record-merge";
import {ResubmitStrategy} from "@/components/design-editor/node-components/strategy/resubmit";
import {AdviceStrategy} from "@/components/design-editor/node-components/strategy/advice";
import {View} from "@/components/design-editor/node-components/view";

export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
const isSidebar = useIsSidebar();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-la

import {FlowNodeJSON} from '../../typings';
import {useIsSidebar} from '../../hooks';
import {NodeHeader} from "@/components/editor/node-components/header";
import {NodePanel} from "@/components/editor/node-components/panel";
import {ConditionScript} from "@/components/editor/node-components/condition";
import {NodeHeader} from "@/components/design-editor/node-components/header";
import {NodePanel} from "@/components/design-editor/node-components/panel";
import {ConditionScript} from "@/components/design-editor/node-components/condition";

export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
const isSidebar = useIsSidebar();
Expand Down
Loading