diff --git a/packages/core/client/src/schema-component/antd/variable/Helpers/HelperConfiguator.tsx b/packages/core/client/src/schema-component/antd/variable/Helpers/HelperConfiguator.tsx
index 9b5c61f1e9..6286d4b051 100644
--- a/packages/core/client/src/schema-component/antd/variable/Helpers/HelperConfiguator.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/Helpers/HelperConfiguator.tsx
@@ -63,6 +63,7 @@ const Configurator = observer(
({ index, close }: { index: number; close: () => void }) => {
const app = useApp();
const { value, helperObservables } = useCurrentVariable();
+
const { helpersObs, rawHelpersObs, removeHelper } = helperObservables;
const helper = helpersObs.value[index];
const rawHelper = rawHelpersObs.value[index];
@@ -77,11 +78,11 @@ const Configurator = observer(
}, value);
const InputValue = () => {
- return {JSON.stringify(inputValue).slice(1, -1)};
+ return {JSON.stringify(typeof inputValue).slice(1, -1)};
};
const OuputValue = () => {
- return {JSON.stringify(outputValue).slice(1, -1)};
+ return {outputValue.toDate().toLocaleString()};
};
const useFormBlockProps = () => {
diff --git a/packages/core/client/src/schema-component/antd/variable/VariableProvider.tsx b/packages/core/client/src/schema-component/antd/variable/VariableProvider.tsx
index 53a9665eeb..f96241f9af 100644
--- a/packages/core/client/src/schema-component/antd/variable/VariableProvider.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/VariableProvider.tsx
@@ -13,6 +13,7 @@ import { isArray } from 'lodash';
import minimatch from 'minimatch';
import React, { createContext, useContext, useEffect, useState } from 'react';
import { useLocalVariables, useVariables } from '../../../variables';
+import { useVariablesContext } from '../../../variables/context';
import { useHelperObservables } from './Helpers/hooks/useHelperObservables';
interface VariableContextValue {
value: any;
diff --git a/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/date.ts b/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/date.ts
index 699fd16219..daa7a4bc74 100644
--- a/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/date.ts
+++ b/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/date.ts
@@ -47,7 +47,7 @@ export function dateFormat(initialValue: any, format: string) {
}
}
-export function dateAdd(initialValue: any, number: number, unit: any) {
+export function dateAdd(initialValue: any, unit: any, number: number) {
const handler = (value: any) => {
return dayjs.isDayjs(value) ? value.add(number, unit) : dayjs(value).add(number, unit);
};
@@ -58,7 +58,7 @@ export function dateAdd(initialValue: any, number: number, unit: any) {
}
}
-export function dateSubtract(initialValue: any, number: number, unit: any) {
+export function dateSubtract(initialValue: any, unit: any, number: number) {
const handler = (value: any) => {
return dayjs.isDayjs(value) ? value.subtract(number, unit) : dayjs(value).subtract(number, unit);
};
diff --git a/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/index.ts b/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/index.ts
index 511f86f820..dfc99d72f9 100644
--- a/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/index.ts
+++ b/packages/plugins/@nocobase/plugin-variable-helpers/src/json-template-helpers/index.ts
@@ -39,13 +39,6 @@ export const helpers = [
group: 'date',
sort: 2,
uiSchema: [
- {
- name: 'number',
- title: tval('Amount'),
- type: 'number',
- 'x-component': 'InputNumber',
- required: true,
- },
{
name: 'unit',
title: tval('Unit'),
@@ -62,6 +55,13 @@ export const helpers = [
{ label: tval('Second'), value: 'second' },
],
},
+ {
+ name: 'number',
+ title: tval('Amount'),
+ type: 'number',
+ 'x-component': 'InputNumber',
+ required: true,
+ },
],
},
{
@@ -71,13 +71,6 @@ export const helpers = [
group: 'date',
sort: 3,
uiSchema: [
- {
- name: 'number',
- title: tval('Amount'),
- type: 'number',
- 'x-component': 'InputNumber',
- required: true,
- },
{
name: 'unit',
title: tval('Unit'),
@@ -94,6 +87,13 @@ export const helpers = [
{ label: tval('Second'), value: 'second' },
],
},
+ {
+ name: 'number',
+ title: tval('Amount'),
+ type: 'number',
+ 'x-component': 'InputNumber',
+ required: true,
+ },
],
},
{