fix: fix sorting of user menu (#2288)

packages/core/client/src/user/CurrentUser.tsx

@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import { error } from '@nocobase/utils/client';
 import { App, Dropdown, Menu, MenuProps } from 'antd';
-import React, { createContext, useCallback, useMemo, useState } from 'react';
+import React, { createContext, useCallback, useMemo as useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { useACLRoleContext, useAPIClient, useCurrentUserContext } from '..';
@@ -13,7 +13,7 @@ import { useLanguageSettings } from './LanguageSettings';
 import { useSwitchRole } from './SwitchRole';
 const useApplicationVersion = () => {
   const data = useCurrentAppInfo();
-  return useMemo(() => {
+  return useEffect(() => {
     return {
       key: 'version',
       disabled: true,
@@ -62,7 +62,7 @@ export const SettingsMenu: React.FC<{
   const switchRole = useSwitchRole();
   const languageSettings = useLanguageSettings();
   const { modal } = App.useApp();
-  const controlApp = useMemo<MenuProps['items']>(() => {
+  const controlApp = useEffect<MenuProps['items']>(() => {
     if (!appAllowed) {
       return [];
     }
@@ -102,40 +102,56 @@ export const SettingsMenu: React.FC<{
     ];
   }, [api, appAllowed, check, modal, t]);
 
-  const items = [
+  useEffect(() => {
-    appVersion,
+    const items = [
-    {
+      appVersion,
-      key: 'divider_1',
+      {
-      type: 'divider',
+        key: 'divider_1',
-    },
+        type: 'divider',
-    editProfile,
-    changePassword,
-    {
-      key: 'divider_2',
-      type: 'divider',
-    },
-    switchRole,
-    languageSettings,
-    {
-      key: 'divider_3',
-      type: 'divider',
-    },
-    ...controlApp,
-    {
-      key: 'signout',
-      label: t('Sign out'),
-      onClick: async () => {
-        await api.auth.signOut();
-        navigate(`/signin?redirect=${encodeURIComponent(redirectUrl)}`);
       },
-    },
+      editProfile,
-  ];
+      changePassword,
+      {
+        key: 'divider_2',
+        type: 'divider',
+      },
+      switchRole,
+      {
+        key: 'divider_3',
+        type: 'divider',
+      },
+      ...controlApp,
+      {
+        key: 'signout',
+        label: t('Sign out'),
+        onClick: async () => {
+          await api.auth.signOut();
+          navigate(`/signin?redirect=${encodeURIComponent(redirectUrl)}`);
+        },
+      },
+    ];
 
-  items.forEach((item) => {
+    items.forEach((item) => {
-    if (item) {
+      if (item) {
-      addMenuItem(item);
+        addMenuItem(item);
+      }
+    });
+    if (languageSettings) {
+      addMenuItem(languageSettings, { before: 'divider_3' });
     }
-  });
+  }, [
+    addMenuItem,
+    api.auth,
+    appVersion,
+    changePassword,
+    controlApp,
+    editProfile,
+    languageSettings,
+    navigate,
+    redirectUrl,
+    switchRole,
+    t,
+  ]);
 
   return <Menu items={getMenuItems()} />;
 };

packages/core/client/src/user/CurrentUserSettingsMenuProvider.tsx

@@ -2,7 +2,19 @@ import { error } from '@nocobase/utils/client';
 import { ItemType } from 'antd/es/menu/hooks/useItems';
 import React, { createContext, useCallback, useContext, useRef } from 'react';
 
-type menuItemsKey = 'version' | 'profile' | 'password' | 'role' | 'language' | 'cache' | 'reboot' | 'signout';
+type menuItemsKey =
+  | 'version'
+  | 'profile'
+  | 'password'
+  | 'role'
+  | 'language'
+  | 'cache'
+  | 'reboot'
+  | 'signout'
+  | 'divider_1'
+  | 'divider_2'
+  | 'divider_3'
+  | 'divider_4';
 
 interface OptionsOfAddMenuItem {
   before?: menuItemsKey;

packages/plugins/theme-editor/src/client/hooks/useUpdateThemeSettings.tsx

@@ -13,8 +13,7 @@ export function useUpdateThemeSettings() {
         return;
       }
       try {
-        await api.resource('users').update({
+        await api.resource('users').updateProfile({
-          filterByTk: currentUser.data.data.id,
           values: {
             systemSettings: {
               ...currentUser.data.data.systemSettings,

packages/plugins/theme-editor/src/client/index.tsx

@@ -43,8 +43,8 @@ const CustomThemeProvider = React.memo((props) => {
 
   useEffect(() => {
     // 在页面右上角中添加一个 Theme 菜单项
-    addMenuItem(themeItem, { after: 'role' });
+    addMenuItem(themeItem, { before: 'divider_3' });
-  }, [themeItem]);
+  }, [addMenuItem, themeItem]);
 
   const settings = useMemo(() => {
     return {