Skip to content

Commit 116dcf0

Browse files
authored
Merge pull request #408 from kube-HPC/hkube-fix-bugs-flowinput
fix flowinput , dev mode , sidecar
2 parents 34d116b + b7e9029 commit 116dcf0

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

src/Routes/SidebarRight/AddPipeline/Steps/Nodes/InputParseJson/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const listAddOn = [
1515
{
1616
value: '#@',
1717
label: '(#@)Multi output of',
18-
placeholder: '<Node name>.<attribute>',
19-
rules: ['node'],
18+
placeholder: '<Node name>.<attribute> Or flowinput.<prop>',
19+
rules: ['node', 'flowinput'],
2020
},
2121
{
2222
value: '',

src/Routes/SidebarRight/AddPipeline/Steps/Nodes/InputParseJson/useInputField.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ const useInputField = (antFields, onRemove, inputRef, selectWidth) => {
135135
rules.forEach(rule => {
136136
if (isOneValid === false) {
137137
if (
138-
label === '(@)Output of' &&
138+
(label === '(@)Output of' || label === '(#@)Multi output of') &&
139139
rule === 'flowinput' &&
140140
srcValue.toLowerCase().includes('flowinput')
141141
) {

src/Routes/Tables/Jobs/NodeLogs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ const NodeLogs = ({
334334
<Select.Option
335335
key={sideCar.name}
336336
value={`SideCar ${sideCar.name}`}>
337-
SideCar {sideCar.name}
337+
{sideCar.name}
338338
</Select.Option>
339339
))}
340340
</SelectStyle>

src/Routes/Tables/Jobs/graphUtils/nodes.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,15 @@ export const formatNode =
209209

210210
const _node = {
211211
id: meta.nodeName,
212-
title: `${meta.nodeName} ${
213-
pipelineNode?.stateType ? pipelineNode.stateType : ''
214-
}`,
212+
title: `${meta.nodeName} ${pipelineNode?.stateType ? pipelineNode.stateType : ''} ${node?.devMode ? '(dev)' : ''}`,
215213
x: (position && position?.nodesPostions[node.nodeName]?.x) || 0,
216214
y: (position && position?.nodesPostions[node.nodeName]?.y) || 0,
215+
font: { multi: true },
217216
label: `${
218217
meta?.extra?.batch
219218
? `${meta.nodeName} (${meta.extra.batch})`
220219
: `${meta.nodeName}`
221-
} ${node?.devMode ? '(dev)' : ''}`,
220+
} ${node?.devMode ? '<b>(dev)</b>' : ''}`,
222221
};
223222
/** @type {NodeOptions} */
224223
const batchStyling = isBatchStyling

0 commit comments

Comments
 (0)