Skip to content

Commit 3c477cf

Browse files
committed
fix bugs
1 parent 2dd48af commit 3c477cf

File tree

4 files changed

+29
-6
lines changed

4 files changed

+29
-6
lines changed

packages/global/core/workflow/runtime/utils.ts

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,26 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
6666
return false;
6767
};
6868

69-
// 1. any值,忽略格式化
70-
if (value === undefined || value === null) return value;
71-
if (!valueType || valueType === WorkflowIOValueTypeEnum.any) return value;
69+
// Handle null/undefined, return default value by type
70+
if (value === undefined || value === null) {
71+
if (!valueType || valueType === WorkflowIOValueTypeEnum.any) return value;
72+
73+
// Default value map (use function to ensure new reference each time)
74+
const defaultValueMap: Partial<Record<WorkflowIOValueTypeEnum, () => any>> = {
75+
[WorkflowIOValueTypeEnum.string]: () => '',
76+
[WorkflowIOValueTypeEnum.number]: () => 0,
77+
[WorkflowIOValueTypeEnum.boolean]: () => false,
78+
[WorkflowIOValueTypeEnum.arrayString]: () => [],
79+
[WorkflowIOValueTypeEnum.arrayNumber]: () => [],
80+
[WorkflowIOValueTypeEnum.arrayBoolean]: () => [],
81+
[WorkflowIOValueTypeEnum.arrayObject]: () => [],
82+
[WorkflowIOValueTypeEnum.arrayAny]: () => [],
83+
[WorkflowIOValueTypeEnum.object]: () => ({})
84+
};
85+
86+
const getDefaultValue = defaultValueMap[valueType];
87+
return getDefaultValue ? getDefaultValue() : value;
88+
}
7289

7390
// Password check
7491
if (valueType === WorkflowIOValueTypeEnum.string && isSecretValue(value)) return value;
@@ -78,7 +95,7 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
7895
(valueType === WorkflowIOValueTypeEnum.string && typeof value === 'string') ||
7996
(valueType === WorkflowIOValueTypeEnum.number && typeof value === 'number') ||
8097
(valueType === WorkflowIOValueTypeEnum.boolean && typeof value === 'boolean') ||
81-
(valueType.startsWith('array') && Array.isArray(value)) ||
98+
(valueType?.startsWith('array') && Array.isArray(value)) ||
8299
(valueType === WorkflowIOValueTypeEnum.object && typeof value === 'object') ||
83100
(valueType === WorkflowIOValueTypeEnum.chatHistory &&
84101
(Array.isArray(value) || typeof value === 'number')) ||
@@ -117,7 +134,7 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
117134
}
118135

119136
// 4.4 数组类型(这里 value 不是数组类型)(TODO: 嵌套数据类型转化)
120-
if (valueType.startsWith('array')) {
137+
if (valueType?.startsWith('array')) {
121138
if (isObjectString(value)) {
122139
try {
123140
return json5.parse(value);
@@ -132,7 +149,7 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
132149
WorkflowIOValueTypeEnum.datasetQuote,
133150
WorkflowIOValueTypeEnum.selectDataset,
134151
WorkflowIOValueTypeEnum.selectApp
135-
].includes(valueType)
152+
].includes(valueType as any)
136153
) {
137154
if (isObjectString(value)) {
138155
try {

projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/hooks/useDebug.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ export const useDebug = () => {
265265
<Box display={currentTab === TabEnum.node ? 'block' : 'none'}>
266266
{renderInputs.map((item) => (
267267
<LabelAndFormRender
268+
{...item}
268269
key={item.key}
269270
label={item.label}
270271
required={item.required}
@@ -279,6 +280,7 @@ export const useDebug = () => {
279280
<Box display={currentTab === TabEnum.global ? 'block' : 'none'}>
280281
{customVar.map((item) => (
281282
<LabelAndFormRender
283+
{...item}
282284
key={item.key}
283285
label={item.label}
284286
required={item.required}
@@ -291,6 +293,7 @@ export const useDebug = () => {
291293
))}
292294
{internalVar.map((item) => (
293295
<LabelAndFormRender
296+
{...item}
294297
key={item.key}
295298
label={item.label}
296299
required={item.required}
@@ -303,6 +306,7 @@ export const useDebug = () => {
303306
))}
304307
{filteredVar.map((item) => (
305308
<LabelAndFormRender
309+
{...item}
306310
key={item.key}
307311
label={item.label}
308312
required={item.required}

projects/app/src/pageComponents/app/detail/WorkflowComponents/context/workflowInitContext.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ const WorkflowInitContextProvider = ({
153153
version: node.data.version,
154154
versionLabel: node.data.versionLabel,
155155
isLatestVersion: node.data.isLatestVersion,
156+
isFolded: node.data.isFolded,
156157
inputs: node.data.inputs.map((input) => {
157158
return {
158159
key: input.key,

projects/app/src/pageComponents/app/tool/SecretInputModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ const SecretInputModal = ({
230230
{showInput ? (
231231
<Input
232232
bg={'myGray.50'}
233+
placeholder={item.description}
233234
{...register(inputKey, {
234235
required: item.required
235236
})}

0 commit comments

Comments
 (0)