+
{children}
);
diff --git a/packages/core/client/src/schema-component/antd/variable/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/variable/demos/demo1.tsx
index 257eddf6ff..ac2f646761 100644
--- a/packages/core/client/src/schema-component/antd/variable/demos/demo1.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/demos/demo1.tsx
@@ -1,13 +1,98 @@
import { createForm } from '@formily/core';
import { observer, useField, useForm } from '@formily/react';
-import { AntdSchemaComponentProvider, Plugin, SchemaComponent } from '@nocobase/client';
+import { AntdSchemaComponentProvider, Plugin, SchemaComponent, VariableEvaluateProvider } from '@nocobase/client';
import { mockApp } from '@nocobase/client/demo-utils';
+import { createJSONTemplateParser } from '@nocobase/json-template-parser';
import PluginVariableFiltersClient from '@nocobase/plugin-variable-helpers/client';
-import React from 'react';
+import { dayjs } from '@nocobase/utils/client';
+import React, { useEffect, useState } from 'react';
+const parser = createJSONTemplateParser();
+const numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 30, 60, 90];
const scope = [
{ label: 'v1', value: 'v1' },
- { label: 'Date', value: '$nDate', children: [{ label: 'Now', value: 'now', type: 'date' }] },
+ {
+ label: 'Date',
+ value: '$nDate',
+ type: 'date',
+ children: [
+ { label: 'Now', value: 'now', type: 'date' },
+ {
+ label: 'before',
+ value: 'before',
+ type: 'date',
+ children: numbers.map((number) => ({
+ label: `${number}`,
+ value: `${number}`,
+ children: [
+ {
+ label: 'days',
+ value: 'day',
+ type: 'date',
+ helpers: [
+ {
+ name: 'date_format',
+ args: ['YYYY-MM-DD'],
+ },
+ ],
+ showLastHelper: true,
+ },
+ {
+ label: 'weeks',
+ value: 'week',
+ type: 'date',
+ helpers: [
+ {
+ name: 'date_format',
+ args: ['YYYY-MM-DD'],
+ },
+ ],
+ showLastHelper: true,
+ },
+ {
+ label: 'months',
+ value: 'month',
+ type: 'date',
+ helpers: [
+ {
+ name: 'date_format',
+ args: ['YYYY-MM-DD'],
+ },
+ ],
+ showLastHelper: true,
+ },
+ {
+ label: 'years',
+ value: 'year',
+ type: 'date',
+ helpers: [
+ {
+ name: 'date_format',
+ args: ['YYYY-MM-DD'],
+ },
+ ],
+ showLastHelper: true,
+ },
+ ],
+ })),
+ },
+ {
+ label: 'after',
+ value: 'after',
+ type: 'date',
+ children: numbers.map((number) => ({
+ label: `${number}`,
+ value: `${number}`,
+ children: [
+ { label: 'days', value: 'day', type: 'date' },
+ { label: 'weeks', value: 'week', type: 'date' },
+ { label: 'months', value: 'month', type: 'date' },
+ { label: 'years', value: 'year', type: 'date' },
+ ],
+ })),
+ },
+ ],
+ },
];
const useFormBlockProps = () => {
@@ -34,22 +119,64 @@ const schema = {
},
output: {
type: 'void',
- title: `输出`,
+ title: `模板`,
'x-decorator': 'FormItem',
'x-component': 'OutPut',
},
+ result: {
+ type: 'void',
+ title: `值`,
+ 'x-decorator': 'FormItem',
+ 'x-component': 'Result',
+ },
},
};
const OutPut = observer(() => {
const form = useForm();
- return Current input value: {form.values.input}
;
+ return {form.values.input}
;
});
+const Result = observer(() => {
+ const form = useForm();
+ const [value, setValue] = useState('');
+ useEffect(() => {
+ if (!form.values.input) {
+ return;
+ }
+ parser
+ .render(form.values.input, { $nDate: dateScopeFn }, {})
+ .then((result) => {
+ setValue(result);
+ })
+ .catch((error) => {
+ throw error;
+ });
+ }, [form.values.input]);
+ return {value.toString()}
;
+});
+
+const dateScopeFn = ({ fields, data, context }) => {
+ return {
+ getValue: ({ field, keys }) => {
+ const path = field.split('.');
+ if (path[0] === 'now') {
+ return dayjs();
+ } else if (path[0] === 'before') {
+ return dayjs().subtract(parseInt(path[1]), path[2]);
+ } else if (path[0] === 'after') {
+ return dayjs().add(parseInt(path[1]), path[2]);
+ }
+ return null;
+ },
+ };
+};
const Demo = () => {
return (
-
+
+
+
);
};
diff --git a/packages/core/client/src/variables/context/EvaluateContext.tsx b/packages/core/client/src/variables/context/EvaluateContext.tsx
new file mode 100644
index 0000000000..ce843628fe
--- /dev/null
+++ b/packages/core/client/src/variables/context/EvaluateContext.tsx
@@ -0,0 +1,72 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { get } from 'lodash';
+import React, { createContext, ReactNode, useContext } from 'react';
+
+interface EvaluateContextProps {
+ data: Record;
+ context: Record;
+ getValue: (field: string) => Promise;
+}
+
+const EvaluateContext = createContext({ data: {}, context: {}, getValue: async () => null });
+
+export const VariableEvaluateProvider: React.FC<{
+ children: ReactNode;
+ data: Record;
+ context: Record;
+}> = ({ children, data, context }) => {
+ const getValueFromData = async (field: string): Promise => {
+ return getValue({ field, data, context });
+ };
+ return (
+
+ {children}
+
+ );
+};
+
+export const useVariableEvaluateContext = (): EvaluateContextProps => {
+ const context = useContext(EvaluateContext);
+ if (!context) {
+ throw new Error('useEvaluate must be used within an EvaluateProvider');
+ }
+ return context;
+};
+
+const getValue = async (params: {
+ field: string;
+ data: Record;
+ context?: Record;
+}): Promise => {
+ const { field, data, context } = params;
+ const path = field.split('.');
+ const dataKey = path.slice(1).join('.');
+ // Handle scope functions (starting with $)
+ if (path[0].startsWith('$')) {
+ const scopeKey = path[0];
+ const scopeFn = data[scopeKey];
+ if (typeof scopeFn === 'function') {
+ const scopeResult = await scopeFn({ fields: [dataKey], data, context });
+ if (scopeResult?.getValue) {
+ return scopeResult.getValue({ field: dataKey, keys: [] });
+ }
+ }
+ return null;
+ }
+
+ const value = get(data, dataKey);
+
+ // Handle function values
+ if (typeof value === 'function') {
+ return value();
+ }
+ return value;
+};
diff --git a/packages/core/client/src/variables/index.ts b/packages/core/client/src/variables/index.ts
index c883997108..d701e14347 100644
--- a/packages/core/client/src/variables/index.ts
+++ b/packages/core/client/src/variables/index.ts
@@ -7,13 +7,15 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
-export { default as VariablesProvider, VariablesContext } from './VariablesProvider';
export { default as useBuiltinVariables } from './hooks/useBuiltinVariables';
export { default as useContextVariable } from './hooks/useContextVariable';
export { default as useLocalVariables } from './hooks/useLocalVariables';
export { default as useVariables } from './hooks/useVariables';
export * from './utils/isVariable';
export * from './utils/transformVariableValue';
+export { VariablesContext, default as VariablesProvider } from './VariablesProvider';
export * from './constants';
export type { VariablesContextType } from './types';
+
+export * from './context/EvaluateContext';
diff --git a/packages/core/json-template-parser/src/parser/json-template-parser.ts b/packages/core/json-template-parser/src/parser/json-template-parser.ts
index 112260a9ef..558bf5b68a 100644
--- a/packages/core/json-template-parser/src/parser/json-template-parser.ts
+++ b/packages/core/json-template-parser/src/parser/json-template-parser.ts
@@ -159,7 +159,7 @@ export class JSONTemplateParser {
fieldSet.add(field);
}
return {
- variableName: fullVariables[0],
+ variableName: variableSegments.join('.'),
variableSegments,
tokenKind: rawTemplate.token.kind,
tokenBegin: rawTemplate.token.begin,
diff --git a/packages/core/json-template-parser/src/utils/index.ts b/packages/core/json-template-parser/src/utils/index.ts
index 348e2a78d1..7834f360e8 100644
--- a/packages/core/json-template-parser/src/utils/index.ts
+++ b/packages/core/json-template-parser/src/utils/index.ts
@@ -30,8 +30,8 @@ export function extractTemplateElements(template: string): {
} {
const escapedTemplate = escape(template ?? '');
try {
- const fullVariable = engine.fullVariablesSync(escapedTemplate)[0] ?? '';
const variableSegments = engine.variableSegmentsSync(escapedTemplate)[0] ?? [];
+ const fullVariable = variableSegments.join('.');
const parsedTemplate = engine.parse(escapedTemplate)[0] ?? {};
const helpers =
//@ts-ignore