This commit is contained in:
heheer 2025-12-10 15:40:53 +08:00
parent 2dd48afe39
commit 3c477cff69
No known key found for this signature in database
GPG Key ID: 37DCB43201661540
4 changed files with 29 additions and 6 deletions

View File

@ -66,9 +66,26 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
return false;
};
// 1. any值忽略格式化
if (value === undefined || value === null) return value;
if (!valueType || valueType === WorkflowIOValueTypeEnum.any) return value;
// Handle null/undefined, return default value by type
if (value === undefined || value === null) {
if (!valueType || valueType === WorkflowIOValueTypeEnum.any) return value;
// Default value map (use function to ensure new reference each time)
const defaultValueMap: Partial<Record<WorkflowIOValueTypeEnum, () => any>> = {
[WorkflowIOValueTypeEnum.string]: () => '',
[WorkflowIOValueTypeEnum.number]: () => 0,
[WorkflowIOValueTypeEnum.boolean]: () => false,
[WorkflowIOValueTypeEnum.arrayString]: () => [],
[WorkflowIOValueTypeEnum.arrayNumber]: () => [],
[WorkflowIOValueTypeEnum.arrayBoolean]: () => [],
[WorkflowIOValueTypeEnum.arrayObject]: () => [],
[WorkflowIOValueTypeEnum.arrayAny]: () => [],
[WorkflowIOValueTypeEnum.object]: () => ({})
};
const getDefaultValue = defaultValueMap[valueType];
return getDefaultValue ? getDefaultValue() : value;
}
// Password check
if (valueType === WorkflowIOValueTypeEnum.string && isSecretValue(value)) return value;
@ -78,7 +95,7 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
(valueType === WorkflowIOValueTypeEnum.string && typeof value === 'string') ||
(valueType === WorkflowIOValueTypeEnum.number && typeof value === 'number') ||
(valueType === WorkflowIOValueTypeEnum.boolean && typeof value === 'boolean') ||
(valueType.startsWith('array') && Array.isArray(value)) ||
(valueType?.startsWith('array') && Array.isArray(value)) ||
(valueType === WorkflowIOValueTypeEnum.object && typeof value === 'object') ||
(valueType === WorkflowIOValueTypeEnum.chatHistory &&
(Array.isArray(value) || typeof value === 'number')) ||
@ -117,7 +134,7 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
}
// 4.4 数组类型(这里 value 不是数组类型)TODO: 嵌套数据类型转化)
if (valueType.startsWith('array')) {
if (valueType?.startsWith('array')) {
if (isObjectString(value)) {
try {
return json5.parse(value);
@ -132,7 +149,7 @@ export const valueTypeFormat = (value: any, valueType?: WorkflowIOValueTypeEnum)
WorkflowIOValueTypeEnum.datasetQuote,
WorkflowIOValueTypeEnum.selectDataset,
WorkflowIOValueTypeEnum.selectApp
].includes(valueType)
].includes(valueType as any)
) {
if (isObjectString(value)) {
try {

View File

@ -265,6 +265,7 @@ export const useDebug = () => {
<Box display={currentTab === TabEnum.node ? 'block' : 'none'}>
{renderInputs.map((item) => (
<LabelAndFormRender
{...item}
key={item.key}
label={item.label}
required={item.required}
@ -279,6 +280,7 @@ export const useDebug = () => {
<Box display={currentTab === TabEnum.global ? 'block' : 'none'}>
{customVar.map((item) => (
<LabelAndFormRender
{...item}
key={item.key}
label={item.label}
required={item.required}
@ -291,6 +293,7 @@ export const useDebug = () => {
))}
{internalVar.map((item) => (
<LabelAndFormRender
{...item}
key={item.key}
label={item.label}
required={item.required}
@ -303,6 +306,7 @@ export const useDebug = () => {
))}
{filteredVar.map((item) => (
<LabelAndFormRender
{...item}
key={item.key}
label={item.label}
required={item.required}

View File

@ -153,6 +153,7 @@ const WorkflowInitContextProvider = ({
version: node.data.version,
versionLabel: node.data.versionLabel,
isLatestVersion: node.data.isLatestVersion,
isFolded: node.data.isFolded,
inputs: node.data.inputs.map((input) => {
return {
key: input.key,

View File

@ -230,6 +230,7 @@ const SecretInputModal = ({
{showInput ? (
<Input
bg={'myGray.50'}
placeholder={item.description}
{...register(inputKey, {
required: item.required
})}