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

refactor: remove useless code

Browse Source
This commit is contained in:
Rairn 2023-04-05 15:45:56 +08:00
parent c4ef0dea8c
commit d37cadee6a
2 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/core/client/src/schema-component/antd/table-v2/FilterDynamicComponent.tsx
View File

@ -4,21 +4,13 @@ import { useValues } from '../filter/useValues';
import { Variable } from '../variable'; import { Variable } from '../variable';
import { useUserVariable } from './hooks/useUserVariable'; import { useUserVariable } from './hooks/useUserVariable';
const useVariableTypes = () => { const useVariableOptions = () => {
const { operator, schema } = useValues(); const { operator, schema } = useValues();
const operatorValue = operator?.value || ''; const operatorValue = operator?.value || '';
const userVariable = useUserVariable({ schema, operator }); const userVariable = useUserVariable({ schema, operator });
if (!operator || !schema) return []; if (!operator || !schema) return [];
const systemOptions = [
{
key: 'now',
value: 'now',
label: `{{t("Now")}}`,
disabled: schema['x-component'] !== 'DatePicker' || operatorValue === '$dateBetween',
},
];
const disabled = !['DatePicker', 'DatePicker.RangePicker'].includes(schema['x-component']); const disabled = !['DatePicker', 'DatePicker.RangePicker'].includes(schema['x-component']);
const dateOptions = [ const dateOptions = [
{ {
@ -157,38 +149,22 @@ const useVariableTypes = () => {
return [ return [
userVariable, userVariable,
// {
// title: `{{t("System variables")}}`,
// value: '$system',
// disabled: systemOptions.every((option) => option.disabled),
// options: systemOptions,
// },
{ {
title: `{{t("Date variables")}}`, label: `{{t("Date variables")}}`,
value: '$date', value: '$date',
key: '$date',
disabled: dateOptions.every((option) => option.disabled), disabled: dateOptions.every((option) => option.disabled),
options: dateOptions, children: dateOptions,
}, },
]; ];
}; };
const useVariableOptions = () => {
const compile = useCompile();
const options = useVariableTypes().map((item) => {
return {
label: compile(item.title),
value: item.value,
key: item.value,
children: compile(item.options),
disabled: item.disabled,
};
});
return options;
};
export function FilterDynamicComponent(props) { export function FilterDynamicComponent(props) {
const { value, onChange, renderSchemaComponent } = props; const { value, onChange, renderSchemaComponent } = props;
const scope = useVariableOptions(); const options = useVariableOptions();
const compile = useCompile();
const scope = compile(options);
return ( return (
<Variable.Input value={value} onChange={onChange} scope={scope}> <Variable.Input value={value} onChange={onChange} scope={scope}>
{renderSchemaComponent()} {renderSchemaComponent()}

5
packages/core/client/src/schema-component/antd/table-v2/hooks/useUserVariable.ts
View File

@ -47,9 +47,10 @@ export const useUserVariable = ({ schema, operator }) => {
const options = useOptions('users', { schema, operator, maxDepth: 3 }) || []; const options = useOptions('users', { schema, operator, maxDepth: 3 }) || [];
return { return {
title: `{{t("Current user")}}`, label: `{{t("Current user")}}`,
value: '$user', value: '$user',
key: '$user',
disabled: options.every((option) => option.disabled), disabled: options.every((option) => option.disabled),
options: options, children: options,
}; };
}; };