Skip to content

Commit b089f9f

Browse files
committed
[app-builder] add text concatenate node
1 parent 455141a commit b089f9f

File tree

7 files changed

+34
-3
lines changed

7 files changed

+34
-3
lines changed

app-builder/plugins/aipp-plugin/src/main/resources/application.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ tool:
8383
FILEEXTRACTNODESTATE: fileExtractionNodeState
8484
LOOPNODESTATE: loopNodeState
8585
PARALLELNODESTATE: parallelNodeState
86+
TEXTCONCATENATENODESTATE: textConcatenateNodeState
8687
export-meta:
8788
version: 1.0.1
8889
sensitive:

app-builder/plugins/aipp-plugin/src/main/resources/component/basic_node_en.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,10 @@
7373
"type": "parallelNodeState",
7474
"name": "Parallel",
7575
"uniqueName": ""
76+
},
77+
{
78+
"type": "textConcatenateNodeState",
79+
"name": "Text Joiner",
80+
"uniqueName": ""
7681
}
7782
]

app-builder/plugins/aipp-plugin/src/main/resources/component/basic_node_zh.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,10 @@
7373
"type": "parallelNodeState",
7474
"name": "并行",
7575
"uniqueName": ""
76+
},
77+
{
78+
"type": "textConcatenateNodeState",
79+
"name": "文本拼接",
80+
"uniqueName": ""
7681
}
7782
]

app-builder/plugins/aipp-text-concatenation/src/main/resources/sql/data/aipp_text_concatenation_tool.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ INSERT INTO store_definition (name, schema, definition_group_name) VALUES ('rend
99
INSERT INTO store_definition_group (name, summary, description, extensions) VALUES ('defGroup_text_concatenation_tool', '', '', '{}') ON CONFLICT(name) DO NOTHING;
1010

1111
INSERT INTO store_tag (tool_unique_name, name) VALUES ('192a8c72-dce9-40a5-a07e-4f8126c0f295', 'FIT') ON CONFLICT(tool_unique_name, name) DO NOTHING;
12-
INSERT INTO store_tag (tool_unique_name, name) VALUES ('192a8c72-dce9-40a5-a07e-4f8126c0f295', 'TEXTCONCATENATENODE') ON CONFLICT(tool_unique_name, name) DO NOTHING;
12+
INSERT INTO store_tag (tool_unique_name, name) VALUES ('192a8c72-dce9-40a5-a07e-4f8126c0f295', 'TEXTCONCATENATENODESTATE') ON CONFLICT(tool_unique_name, name) DO NOTHING;
1313
INSERT INTO store_tag (tool_unique_name, name) VALUES ('192a8c72-dce9-40a5-a07e-4f8126c0f295', 'BASIC') ON CONFLICT(tool_unique_name, name) DO NOTHING;
1414

1515
INSERT INTO store_tool_group (name, definition_group_name, summary, description, extensions) VALUES ('implGroup_text_concatenation_tool', 'defGroup_text_concatenation_tool', '', '', '{}') ON CONFLICT(name) DO NOTHING;

frontend/src/assets/icon.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TextToImageIcon = (props) => <Icon component={() => (<BaseIcons.TextToImag
6464
const FileExtractionIcon = (props) => <Icon component={() => (<BaseIcons.FileExtraction />)} {...props} />;
6565
const LoopIcon = (props) => <Icon component={() => (<BaseIcons.Loop />)} {...props} />;
6666
const PairingIcon = (props) => <Icon component={() => (<BaseIcons.Pairing />)} {...props} />;
67+
const TextConcatenateIcon = (props) => <BaseIcons.TextConcatenate {...props} />;
6768

6869
export {
6970
LeftArrowIcon,
@@ -121,6 +122,7 @@ export {
121122
TextToImageIcon,
122123
FileExtractionIcon,
123124
LoopIcon,
124-
PairingIcon
125+
PairingIcon,
126+
TextConcatenateIcon
125127
}
126128

frontend/src/components/icons/base.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,5 +952,21 @@ export const BaseIcons = {
952952
</g>
953953
</g>
954954
</svg>
955+
),
956+
TextConcatenate:() =>(
957+
<svg viewBox="0 0 28 28" width="28.000000" height="28.000000" fill="none" clip-path="url(#clipPath_0)" customFrame="url(#clipPath_0)">
958+
<defs>
959+
<clipPath id="clipPath_0">
960+
<rect width="28.000000" height="28.000000" x="0.000000" y="0.000000" rx="14.000000" fill="rgb(255,255,255)" />
961+
</clipPath>
962+
</defs>
963+
<rect id="关键词提取" width="28.000000" height="28.000000" x="0.000000" y="0.000000" rx="14.000000" fill="rgb(57,194,149)" />
964+
<g id="组合 761">
965+
<path id="减去顶层" d="M19.2631 6.57617L7.80582 6.57617C7.11713 6.57617 6.58496 7.06348 6.58496 7.69411L6.58496 20.3927C6.58496 20.9946 7.11713 21.5106 7.80582 21.5106L14.3025 21.5106C14.237 21.5026 14.1746 21.4758 14.1305 21.4303C14.0768 21.361 14.0502 21.292 14.0502 21.2088L14.0502 19.3833L14.6522 19.3833C15.2538 19.3694 15.7352 18.8439 15.7352 18.2216C15.7352 17.599 15.2538 17.0874 14.6522 17.0596L14.0502 17.0596L14.0502 14.8192C14.0502 14.7363 14.0772 14.6531 14.1305 14.598C14.1599 14.5716 14.1929 14.5512 14.2297 14.5369C14.2666 14.5227 14.3047 14.5154 14.3442 14.5152L16.4307 14.5152L16.4307 14.1276C16.4443 13.4776 16.9659 12.9656 17.581 12.9798C18.2097 12.994 18.7043 13.5331 18.6911 14.1696L18.6911 14.5152L20.4527 14.5152L20.4527 7.69411C20.4527 7.06348 19.9205 6.57617 19.2631 6.57617Z" fill="rgb(255,254.745,254.745)" fill-rule="evenodd" />
966+
<path id="path" d="M22.584 18.5908L22.584 16.7272C22.5839 16.6542 22.5586 16.5897 22.5082 16.5337C22.4811 16.5095 22.45 16.4911 22.415 16.4785C22.38 16.4659 22.3437 16.46 22.3061 16.4609L20.5642 16.4609L20.5642 16.1585C20.5766 15.6015 20.1098 15.1299 19.5164 15.1174C18.9357 15.105 18.4434 15.553 18.4306 16.1217L18.4306 16.4609L16.4612 16.4609C16.4239 16.4611 16.3879 16.4674 16.3531 16.4799C16.3183 16.4924 16.2871 16.5102 16.2594 16.5334C16.2091 16.5816 16.1836 16.6544 16.1836 16.7269L16.1836 18.6873L16.7518 18.6873C17.3197 18.7115 17.7741 19.1592 17.7741 19.704C17.7741 20.2485 17.3197 20.7083 16.7518 20.7205L16.1836 20.7205L16.1836 22.3178C16.1836 22.3906 16.2088 22.4509 16.2594 22.5116C16.3098 22.5598 16.3856 22.5841 16.4612 22.5841L18.3172 22.5841L20.438 22.5844L22.2937 22.5844C22.331 22.5843 22.3671 22.5779 22.4019 22.5654C22.4368 22.5529 22.468 22.5351 22.4958 22.5119C22.5461 22.4634 22.5713 22.3906 22.5713 22.3181L22.5713 20.7208L22.5841 19.3842L22.584 18.5908Z" fill="rgb(255,254.745,254.745)" fill-rule="evenodd" />
967+
<rect id="矩形 482" width="7.467223" height="1.066746" x="8.716309" y="9.785156" rx="0.533373" fill="rgb(57,194,149)" />
968+
<rect id="矩形 483" width="4.266985" height="1.066746" x="8.716309" y="11.916016" rx="0.533373" fill="rgb(57,194,149)" />
969+
</g>
970+
</svg>
955971
)
956972
}

frontend/src/pages/addFlow/components/basic-item.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
FileExtractionIcon,
2525
LoopIcon,
2626
PairingIcon,
27+
TextConcatenateIcon,
2728
} from '@/assets/icon';
2829
import { handleClickAddBasicNode, handleDragBasicNode } from '../utils'
2930

@@ -60,7 +61,8 @@ const BasicItems = (props: any) => {
6061
'noteNode': <ClassificationIcon />,
6162
'loopNodeState': <LoopIcon />,
6263
'manualCheckNodeState': <ManualCheckIcon />,
63-
'parallelNodeState': <PairingIcon />
64+
'parallelNodeState': <PairingIcon />,
65+
'textConcatenateNodeState': <TextConcatenateIcon />
6466
}[type];
6567
}
6668
return <>

0 commit comments

Comments
 (0)