Skip to content

Commit d1826f9

Browse files
committed
update script view
1 parent f30c6af commit d1826f9

14 files changed

Lines changed: 160 additions & 95 deletions

File tree

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/current-operator/index.tsx

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React from "react";
2+
import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
3+
import {Field, FieldRenderProps} from "@flowgram.ai/fixed-layout-editor";
4+
5+
interface NodeHintProps{
6+
fieldName:string;
7+
}
8+
9+
export const NodeHint:React.FC<NodeHintProps> = (props) => {
10+
return (
11+
<span>
12+
<Field
13+
name={props.fieldName}
14+
render={({ field: { value, onChange } }: FieldRenderProps<any>) => (
15+
<>
16+
{GroovyScriptConvertorUtil.getScriptTitle(value)}
17+
</>
18+
)}
19+
/>
20+
</span>
21+
)
22+
}

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/approval/form-meta.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {TimeoutStrategy} from "@/components/design-editor/node-components/strate
1818
import {RecordMergeStrategy} from "@/components/design-editor/node-components/strategy/record-merge";
1919
import {RevokeStrategy} from "@/components/design-editor/node-components/strategy/revoke";
2020
import {View} from "@/components/design-editor/node-components/view";
21-
import {CurrentNodeOperator} from "@/components/design-editor/node-components/current-operator";
21+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
2222

2323

2424
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
@@ -46,7 +46,7 @@ export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
4646
return (
4747
<NodePanel data={data}>
4848
<NodeHeader/>
49-
<CurrentNodeOperator/>
49+
<NodeHint fieldName={"OperatorLoadStrategy.script"}/>
5050
</NodePanel>
5151
);
5252
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/condition-branch/form-meta.tsx

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@ import {useIsSidebar} from '../../hooks';
66
import {NodeHeader} from "@/components/design-editor/node-components/header";
77
import {NodePanel} from "@/components/design-editor/node-components/panel";
88
import {ConditionScript} from "@/components/design-editor/node-components/condition";
9-
import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
9+
import React from "react";
10+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
1011

1112
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
12-
const isSidebar = useIsSidebar();
13-
const script = data.form.getValueIn('script');
14-
if (isSidebar) {
13+
const isSidebar = useIsSidebar();
14+
if (isSidebar) {
15+
return (
16+
<NodePanel data={data}>
17+
<NodeHeader/>
18+
<ConditionScript/>
19+
</NodePanel>
20+
);
21+
}
1522
return (
16-
<NodePanel data={data}>
17-
<NodeHeader/>
18-
<ConditionScript/>
19-
</NodePanel>
23+
<NodePanel data={data}>
24+
<NodeHeader/>
25+
<NodeHint fieldName={"script"}/>
26+
</NodePanel>
2027
);
21-
}
22-
return (
23-
<NodePanel data={data}>
24-
<NodeHeader/>
25-
{GroovyScriptConvertorUtil.getScriptTitle(script)}
26-
</NodePanel>
27-
);
2828
};
2929

3030
export const formMeta: FormMeta<FlowNodeJSON['data']> = {
31-
render: renderForm,
32-
validateTrigger: ValidateTrigger.onChange,
33-
validate: {
34-
title: ({ value }: { value: string }) => (value ? undefined : 'Title is required'),
35-
},
36-
effect: {
37-
title: syncVariableTitle,
38-
outputs: provideJsonSchemaOutputs,
39-
},
31+
render: renderForm,
32+
validateTrigger: ValidateTrigger.onChange,
33+
validate: {
34+
title: ({value}: { value: string }) => (value ? undefined : 'Title is required'),
35+
},
36+
effect: {
37+
title: syncVariableTitle,
38+
outputs: provideJsonSchemaOutputs,
39+
},
4040
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/handle/form-meta.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {RecordMergeStrategy} from "@/components/design-editor/node-components/st
1616
import {ResubmitStrategy} from "@/components/design-editor/node-components/strategy/resubmit";
1717
import {AdviceStrategy} from "@/components/design-editor/node-components/strategy/advice";
1818
import {View} from "@/components/design-editor/node-components/view";
19-
import {CurrentNodeOperator} from "@/components/design-editor/node-components/current-operator";
2019
import React from "react";
20+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
2121

2222
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
2323
const isSidebar = useIsSidebar();
@@ -43,7 +43,7 @@ export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
4343
return (
4444
<NodePanel data={data}>
4545
<NodeHeader/>
46-
<CurrentNodeOperator/>
46+
<NodeHint fieldName={"OperatorLoadStrategy.script"}/>
4747
</NodePanel>
4848
);
4949
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/inclusive-branch/form-meta.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import {useIsSidebar} from '../../hooks';
66
import {NodeHeader} from "@/components/design-editor/node-components/header";
77
import {NodePanel} from "@/components/design-editor/node-components/panel";
88
import {ConditionScript} from "@/components/design-editor/node-components/condition";
9-
import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
9+
import React from "react";
10+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
1011

1112
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
1213
const isSidebar = useIsSidebar();
13-
const script = data.form.getValueIn('script');
1414
if (isSidebar) {
1515
return (
1616
<NodePanel data={data}>
@@ -22,7 +22,7 @@ export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
2222
return (
2323
<NodePanel data={data}>
2424
<NodeHeader/>
25-
{GroovyScriptConvertorUtil.getScriptTitle(script)}
25+
<NodeHint fieldName={"script"}/>
2626
</NodePanel>
2727
);
2828
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/notify/form-meta.tsx

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ import {ErrorTriggerStrategy} from "@/components/design-editor/node-components/s
1010
import {NodeTitleStrategy} from "@/components/design-editor/node-components/strategy/node-title";
1111
import {OperatorLoadStrategy} from "@/components/design-editor/node-components/strategy/operator-load";
1212
import {View} from "@/components/design-editor/node-components/view";
13-
import {CurrentNodeOperator} from "@/components/design-editor/node-components/current-operator";
1413
import React from "react";
14+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
1515

1616
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
17-
const isSidebar = useIsSidebar();
18-
if (isSidebar) {
17+
const isSidebar = useIsSidebar();
18+
if (isSidebar) {
19+
return (
20+
<NodePanel data={data}>
21+
<NodeHeader/>
22+
<TabNodeLayout hiddenAction={true}>
23+
<View/>
24+
<OperatorLoadStrategy/>
25+
<NodeTitleStrategy/>
26+
<ErrorTriggerStrategy/>
27+
</TabNodeLayout>
28+
</NodePanel>
29+
);
30+
}
1931
return (
20-
<NodePanel data={data}>
21-
<NodeHeader/>
22-
<TabNodeLayout hiddenAction={true}>
23-
<View/>
24-
<OperatorLoadStrategy/>
25-
<NodeTitleStrategy/>
26-
<ErrorTriggerStrategy/>
27-
</TabNodeLayout>
28-
</NodePanel>
32+
<NodePanel data={data}>
33+
<NodeHeader/>
34+
<NodeHint fieldName={"OperatorLoadStrategy.script"}/>
35+
</NodePanel>
2936
);
30-
}
31-
return (
32-
<NodePanel data={data}>
33-
<NodeHeader/>
34-
<CurrentNodeOperator/>
35-
</NodePanel>
36-
);
3737
};
3838

3939
export const formMeta: FormMeta<FlowNodeJSON['data']> = {
40-
render: renderForm,
41-
validateTrigger: ValidateTrigger.onChange,
42-
validate: {
43-
title: ({ value }: { value: string }) => (value ? undefined : 'Title is required'),
44-
},
45-
effect: {
46-
title: syncVariableTitle,
47-
outputs: provideJsonSchemaOutputs,
48-
},
40+
render: renderForm,
41+
validateTrigger: ValidateTrigger.onChange,
42+
validate: {
43+
title: ({value}: { value: string }) => (value ? undefined : 'Title is required'),
44+
},
45+
effect: {
46+
title: syncVariableTitle,
47+
outputs: provideJsonSchemaOutputs,
48+
},
4949
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/router/form-meta.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import {NodeHeader} from "@/components/design-editor/node-components/header";
77
import {NodePanel} from "@/components/design-editor/node-components/panel";
88
import {PanelLayout} from "@/components/design-editor/node-components/layout";
99
import {RouterStrategy} from "@/components/design-editor/node-components/strategy/router";
10-
import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
10+
import React from "react";
11+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
1112

1213
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
1314
const isSidebar = useIsSidebar();
14-
const script = data.form.getValueIn('RouterStrategy.script');
1515
if (isSidebar) {
1616
return (
1717
<NodePanel data={data}>
@@ -25,7 +25,7 @@ export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
2525
return (
2626
<NodePanel data={data}>
2727
<NodeHeader/>
28-
{GroovyScriptConvertorUtil.getScriptTitle(script)}
28+
<NodeHint fieldName={"RouterStrategy.script"}/>
2929
</NodePanel>
3030
);
3131
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/sub-process/form-meta.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import {NodeHeader} from "@/components/design-editor/node-components/header";
77
import {NodePanel} from "@/components/design-editor/node-components/panel";
88
import {PanelLayout} from "@/components/design-editor/node-components/layout";
99
import {SubProcessStrategy} from "@/components/design-editor/node-components/strategy/sub-process";
10-
import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
10+
import React from "react";
11+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
1112

1213
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
1314
const isSidebar = useIsSidebar();
14-
const script = data.form.getValueIn('SubProcessStrategy.script');
1515
if (isSidebar) {
1616
return (
1717
<NodePanel data={data}>
@@ -25,7 +25,7 @@ export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
2525
return (
2626
<NodePanel data={data}>
2727
<NodeHeader/>
28-
{GroovyScriptConvertorUtil.getScriptTitle(script)}
28+
<NodeHint fieldName={"SubProcessStrategy.script"}/>
2929
</NodePanel>
3030
);
3131
};

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/trigger/form-meta.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import {NodeHeader} from "@/components/design-editor/node-components/header";
77
import {NodePanel} from "@/components/design-editor/node-components/panel";
88
import {PanelLayout} from "@/components/design-editor/node-components/layout";
99
import {TriggerStrategy} from "@/components/design-editor/node-components/strategy/trigger";
10-
import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
10+
import {NodeHint} from "@/components/design-editor/node-components/node-hint";
11+
import React from "react";
1112

1213
export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
1314
const isSidebar = useIsSidebar();
14-
const script = data.form.getValueIn('TriggerStrategy.script');
1515
if (isSidebar) {
1616
return (
1717
<NodePanel data={data}>
@@ -25,7 +25,7 @@ export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
2525
return (
2626
<NodePanel data={data}>
2727
<NodeHeader/>
28-
{GroovyScriptConvertorUtil.getScriptTitle(script)}
28+
<NodeHint fieldName={"TriggerStrategy.script"}/>
2929
</NodePanel>
3030
);
3131
};

0 commit comments

Comments
 (0)