fix(Collapse): fix default value
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run

This commit is contained in:
Zeke Zhang 2024-09-23 13:26:42 +08:00
parent 9db63710bb
commit 597ee9d42c

View File

@ -194,7 +194,9 @@ export function Input(props: VariableInputProps) {
const form = useForm(); const form = useForm();
const [options, setOptions] = React.useState<DefaultOptionType[]>([]); const [options, setOptions] = React.useState<DefaultOptionType[]>([]);
const [variableText, setVariableText] = React.useState([]); const [variableText, setVariableText] = React.useState([]);
const [isFieldValue, setIsFieldValue] = React.useState(children && value != null ? true : false); const [isFieldValue, setIsFieldValue] = React.useState(
hideVariableButton || (children && value != null ? true : false),
);
const parsed = useMemo(() => parseValue(value, parseOptions), [parseOptions, value]); const parsed = useMemo(() => parseValue(value, parseOptions), [parseOptions, value]);
const isConstant = typeof parsed === 'string'; const isConstant = typeof parsed === 'string';
@ -239,6 +241,10 @@ export function Input(props: VariableInputProps) {
cValue = children ? ['$'] : [' ', type]; cValue = children ? ['$'] : [' ', type];
} }
if (hideVariableButton) {
cValue = ['$'];
}
useEffect(() => { useEffect(() => {
const { component, ...cOption } = constantOption ?? {}; const { component, ...cOption } = constantOption ?? {};
const options = [ const options = [