From 20f0e90fe6038cb9f9dcc7faeca833b91515e6be Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Fri, 9 Aug 2024 18:12:49 +0800
Subject: [PATCH] fix(variable): the chinaRegions field should not be a submenu
 (#5030)

* fix(variable): the chinaRegions field should not be a submenu

* chore: skip unstable test
---
 .../schema-settings/VariableInput/hooks/useBaseVariable.tsx    | 2 +-
 .../@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx b/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx
index 324c05858b4..ea17da86daa 100644
--- a/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx
+++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx
@@ -121,7 +121,7 @@ const getChildren = (
 ): Option[] => {
   const result = options
     .map((option): Option => {
-      if (!option.target) {
+      if (!option.target || option.target === 'chinaRegions') {
         return {
           key: option.name,
           value: option.name,
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts
index 629027dd87f..cbcfb67da54 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts
@@ -69,7 +69,8 @@ test('menu permission ', async ({ page, mockPage, mockRole, updateRole }) => {
   expect(page.url()).toContain(uid2);
 });
 
-test('i18n should not fallbackNS', async ({ page }) => {
+// TODO: this is not stable
+test.skip('i18n should not fallbackNS', async ({ page }) => {
   await page.goto('/admin/settings/system-settings');
 
   // 创建 Users 页面