fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 11:12:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: variable parse issue in link action with variables in paths (#4732)

Browse Source
This commit is contained in:
Katherine 2024-06-24 08:00:15 +08:00 committed by GitHub
parent 78955cb560
commit aec77064c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/block-provider/hooks/index.ts
View File

@ -1523,8 +1523,11 @@ async function resetFormCorrectly(form: Form) {
} }
export function appendQueryStringToUrl(url: string, queryString: string) { export function appendQueryStringToUrl(url: string, queryString: string) {
if (queryString) {
return url + (url.includes('?') ? '&' : '?') + queryString; return url + (url.includes('?') ? '&' : '?') + queryString;
} }
return url;
}
export function useLinkActionProps() { export function useLinkActionProps() {
const navigate = useNavigate(); const navigate = useNavigate();
@ -1548,7 +1551,8 @@ export function useLinkActionProps() {
localVariables, localVariables,
replaceVariableValue, replaceVariableValue,
}); });
const link = appendQueryStringToUrl(url, queryString); const targetUrl = await replaceVariableValue(url, variables, localVariables);
const link = appendQueryStringToUrl(targetUrl, queryString);
if (link) { if (link) {
if (isURL(link)) { if (isURL(link)) {
window.open(link, '_blank'); window.open(link, '_blank');