From 4c92a8a788b2b352d1e7470cb6bcf896475dcf1f Mon Sep 17 00:00:00 2001
From: Sheldon Guo <sheldon_66@163.com>
Date: Thu, 13 Mar 2025 10:02:10 +0800
Subject: [PATCH] feat: simplify imports in HelperList and update ctx-func test
 to use extractTemplateVariable

---
 .../schema-component/antd/variable/Helpers/HelperList.tsx | 8 +-------
 .../json-template-parser/src/__tests__/ctx-func.test.ts   | 5 +++--
 packages/core/utils/src/parse-filter.ts                   | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/variable/Helpers/HelperList.tsx b/packages/core/client/src/schema-component/antd/variable/Helpers/HelperList.tsx
index 42d743be35..e49d7da42e 100644
--- a/packages/core/client/src/schema-component/antd/variable/Helpers/HelperList.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/Helpers/HelperList.tsx
@@ -7,14 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import React, { useState, useMemo, useContext } from 'react';
+import React from 'react';
 import { observer } from '@formily/reactive-react';
-import type { MenuProps } from 'antd';
-import { Dropdown, Popover } from 'antd';
-import { FilterOutlined } from '@ant-design/icons';
-import { useCompile } from '../../../hooks';
-import { useApp } from '../../../../application';
-import { addHelper } from './observables';
 import { helpersObs } from './observables';
 import { Helper } from './Helper';
 const _HelperList = () => {
diff --git a/packages/core/json-template-parser/src/__tests__/ctx-func.test.ts b/packages/core/json-template-parser/src/__tests__/ctx-func.test.ts
index 51c6a7e6e0..12fff3a91e 100644
--- a/packages/core/json-template-parser/src/__tests__/ctx-func.test.ts
+++ b/packages/core/json-template-parser/src/__tests__/ctx-func.test.ts
@@ -8,14 +8,15 @@
  */
 import get from 'lodash/get';
 import { createJSONTemplateParser } from '../parser';
+import { extractTemplateVariable } from '../utils';
 
 const parser = createJSONTemplateParser();
 
 describe('ctx function', () => {
   it('should handle basic context function', () => {
     const template = '{{}}';
-    const variable = parser.engine.fullVariablesSync(template);
-    console.log(variable);
+    const variable = extractTemplateVariable(template);
+    expect(variable).toBe(null);
   });
   it('should handle basic context function with state', () => {
     const template = '{{$user.id}} - {{$user.name}}';
diff --git a/packages/core/utils/src/parse-filter.ts b/packages/core/utils/src/parse-filter.ts
index 71d5164d47..402f254c33 100644
--- a/packages/core/utils/src/parse-filter.ts
+++ b/packages/core/utils/src/parse-filter.ts
@@ -176,7 +176,7 @@ export const parseFilter = async (filter: any, opts: ParseFilterOptions = {}) =>
       if (typeof value === 'string') {
         const match = re.exec(value);
         if (match) {
-          const { fullVariable: key, filters: helpers } = extractTemplateElements(value);
+          const { fullVariable: key, helpers } = extractTemplateElements(value);
           const val = getValuesByPath(vars, key, null);
           const field = getField?.(path);
           if (key.startsWith('$date') || key.startsWith('$nDate')) {