From d37cadee6a1b6139fab3b437ae02d94447b5e1bf Mon Sep 17 00:00:00 2001
From: Rairn <958414905@qq.com>
Date: Wed, 5 Apr 2023 15:45:56 +0800
Subject: [PATCH] refactor: remove useless code

---
 .../antd/table-v2/FilterDynamicComponent.tsx  | 40 ++++---------------
 .../antd/table-v2/hooks/useUserVariable.ts    |  5 ++-
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/table-v2/FilterDynamicComponent.tsx b/packages/core/client/src/schema-component/antd/table-v2/FilterDynamicComponent.tsx
index 0c884d4ded..084033b47b 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/FilterDynamicComponent.tsx
+++ b/packages/core/client/src/schema-component/antd/table-v2/FilterDynamicComponent.tsx
@@ -4,21 +4,13 @@ import { useValues } from '../filter/useValues';
 import { Variable } from '../variable';
 import { useUserVariable } from './hooks/useUserVariable';
 
-const useVariableTypes = () => {
+const useVariableOptions = () => {
   const { operator, schema } = useValues();
   const operatorValue = operator?.value || '';
   const userVariable = useUserVariable({ schema, operator });
 
   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 dateOptions = [
     {
@@ -157,38 +149,22 @@ const useVariableTypes = () => {
 
   return [
     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',
+      key: '$date',
       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) {
   const { value, onChange, renderSchemaComponent } = props;
-  const scope = useVariableOptions();
+  const options = useVariableOptions();
+  const compile = useCompile();
+  const scope = compile(options);
+
   return (
     <Variable.Input value={value} onChange={onChange} scope={scope}>
       {renderSchemaComponent()}
diff --git a/packages/core/client/src/schema-component/antd/table-v2/hooks/useUserVariable.ts b/packages/core/client/src/schema-component/antd/table-v2/hooks/useUserVariable.ts
index 9cee4fb97f..74e262218f 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/hooks/useUserVariable.ts
+++ b/packages/core/client/src/schema-component/antd/table-v2/hooks/useUserVariable.ts
@@ -47,9 +47,10 @@ export const useUserVariable = ({ schema, operator }) => {
   const options = useOptions('users', { schema, operator, maxDepth: 3 }) || [];
 
   return {
-    title: `{{t("Current user")}}`,
+    label: `{{t("Current user")}}`,
     value: '$user',
+    key: '$user',
     disabled: options.every((option) => option.disabled),
-    options: options,
+    children: options,
   };
 };