Merge branch 'main' into next

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,

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 页面