fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 23:19:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: update extractTemplateElements to return helpers and refactor usage in VariablesProvider

Browse Source
This commit is contained in:
Sheldon Guo 2025-03-13 07:16:31 +08:00
parent 21d45bf59a
commit 967724929c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/variables/VariablesProvider.tsx
View File

@ -277,7 +277,7 @@ const VariablesProvider = ({ children, filterVariables }: any) => {
fieldOperator?: string | void; fieldOperator?: string | void;
}, },
) => { ) => {
const { fullVariable, filters } = extractTemplateElements(str); const { fullVariable, helpers } = extractTemplateElements(str);
if (!fullVariable) { if (!fullVariable) {
return str; return str;
} }
@ -288,8 +288,8 @@ const VariablesProvider = ({ children, filterVariables }: any) => {
const path = getPath(str); const path = getPath(str);
const result = await getResult(path, localVariables as VariableOption[], options); const result = await getResult(path, localVariables as VariableOption[], options);
if (Array.isArray(filters) && filters.length > 0) { if (Array.isArray(helpers) && helpers.length > 0) {
result.value = filters.reduce((acc, filter) => filter.handler(...[acc, ...filter.args]), result.value); result.value = helpers.reduce((acc, helper) => helper.handler(...[acc, ...helper.args]), result.value);
} }
return { return {

6
packages/core/json-template-parser/src/utils/index.ts
View File

@ -28,7 +28,11 @@ export function extractTemplateVariable(template: string): string | null {
} }
} }
export function extractTemplateElements(template: string) { export function extractTemplateElements(template: string): {
fullVariable: string | null;
variableSegments: string[];
helpers: Filter[];
} {
const escapedTemplate = escape(template ?? ''); const escapedTemplate = escape(template ?? '');
try { try {
const fullVariable = engine.fullVariablesSync(escapedTemplate)[0] ?? ''; const fullVariable = engine.fullVariablesSync(escapedTemplate)[0] ?? '';