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

fix: router

Browse Source
This commit is contained in:
sheldon66 2025-03-23 15:20:20 +08:00
parent ff9d749d9d
commit 02097cd96d
1 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packages/core/client/src/schema-component/antd/variable/Helpers/HelperConfiguator.tsx
View File

@ -15,7 +15,7 @@ import { createMemoryHistory } from 'history';
import debounce from 'lodash/debounce'; import debounce from 'lodash/debounce';
import minimatch from 'minimatch'; import minimatch from 'minimatch';
import React from 'react'; import React from 'react';
import { Router } from 'react-router-dom'; import { Router, useLocation } from 'react-router-dom';
import { useApp } from '../../../../application'; import { useApp } from '../../../../application';
import { SchemaComponent } from '../../../core/SchemaComponent'; import { SchemaComponent } from '../../../core/SchemaComponent';
import { useCurrentVariable, VariableHelperMapping } from '../VariableProvider'; import { useCurrentVariable, VariableHelperMapping } from '../VariableProvider';
@ -59,7 +59,7 @@ export function isFilterAllowedForVariable(
return !mapping.strictMode; return !mapping.strictMode;
} }
export const HelperConfiguator = observer( const Configurator = observer(
({ index, close }: { index: number; close: () => void }) => { ({ index, close }: { index: number; close: () => void }) => {
const app = useApp(); const app = useApp();
const { value, helperObservables } = useCurrentVariable(); const { value, helperObservables } = useCurrentVariable();
@ -68,7 +68,6 @@ export const HelperConfiguator = observer(
const rawHelper = rawHelpersObs.value[index]; const rawHelper = rawHelpersObs.value[index];
const helperConfigs = app.jsonTemplateParser.filters; const helperConfigs = app.jsonTemplateParser.filters;
const helperConfig = helperConfigs.find((item) => item.name === helper.name); const helperConfig = helperConfigs.find((item) => item.name === helper.name);
const history = createMemoryHistory();
const previousHelpers = helpersObs.value.slice(0, index); const previousHelpers = helpersObs.value.slice(0, index);
const inputValue = previousHelpers.reduce((value, helper) => { const inputValue = previousHelpers.reduce((value, helper) => {
return helper.handler(value, ...helper.args); return helper.handler(value, ...helper.args);
@ -178,21 +177,48 @@ export const HelperConfiguator = observer(
}, },
}, },
}; };
return (
<SchemaComponent
components={{ InputValue, OuputValue }}
schema={schema}
scope={{
t: app.i18n.t,
useFormBlockProps,
useDeleteActionProps,
useCloseActionProps,
}}
basePath={['']}
/>
);
},
{ displayName: 'Configurator' },
);
const WithRouter = observer(
({ children }: { children: React.ReactNode }) => {
const history = createMemoryHistory();
return ( return (
<Router location={history.location} navigator={history}> <Router location={history.location} navigator={history}>
<SchemaComponent {children}
components={{ InputValue, OuputValue }}
schema={schema}
scope={{
t: app.i18n.t,
useFormBlockProps,
useDeleteActionProps,
useCloseActionProps,
}}
basePath={['']}
/>
</Router> </Router>
); );
}, },
{ displayName: 'Helper' }, { displayName: 'WithRouter' },
);
export const HelperConfiguator = observer(
(props: { index: number; close: () => void }) => {
try {
useLocation();
return <Configurator {...props} />;
} catch (error) {
return (
<WithRouter>
<Configurator {...props} />
</WithRouter>
);
}
},
{ displayName: 'HelperConfiguator' },
); );