Merge branch 'dev' into dev2

interface/package.json

@@ -43,7 +43,7 @@
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
     "react-icons": "^4.12.0",
-    "react-router-dom": "^6.19.0",
+    "react-router-dom": "6.18.0",
     "react-toastify": "^9.1.3",
     "sockette": "^2.0.6",
     "typesafe-i18n": "^5.26.2",

interface/src/framework/security/ManageUsersForm.tsx

@@ -12,7 +12,7 @@ import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-li
 import { useTheme } from '@table-library/react-table-library/theme';
 import { useContext, useState } from 'react';
 
-import { useBlocker } from 'react-router-dom';
+import { unstable_useBlocker as useBlocker } from 'react-router-dom';
 import GenerateToken from './GenerateToken';
 import UserForm from './UserForm';
 import type { FC } from 'react';

interface/src/project/SettingsCustomization.tsx

@@ -23,7 +23,7 @@ import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-li
 import { useTheme } from '@table-library/react-table-library/theme';
 import { useRequest } from 'alova';
 import { useState, useEffect, useCallback } from 'react';
-import { useBlocker, useLocation } from 'react-router-dom';
+import { unstable_useBlocker as useBlocker, useLocation } from 'react-router-dom';
 import { toast } from 'react-toastify';
 
 import EntityMaskToggle from './EntityMaskToggle';

interface/src/project/SettingsEntities.tsx

@@ -7,7 +7,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
 // eslint-disable-next-line import/named
 import { updateState, useRequest } from 'alova';
 import { useState, useCallback } from 'react';
-import { useBlocker } from 'react-router-dom';
+import { unstable_useBlocker as useBlocker } from 'react-router-dom';
 
 import { toast } from 'react-toastify';
 

interface/src/project/SettingsScheduler.tsx

@@ -9,7 +9,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
 // eslint-disable-next-line import/named
 import { updateState, useRequest } from 'alova';
 import { useState, useEffect, useCallback } from 'react';
-import { useBlocker } from 'react-router-dom';
+import { unstable_useBlocker as useBlocker } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import SettingsSchedulerDialog from './SettingsSchedulerDialog';
 import * as EMSESP from './api';

interface/src/utils/useRest.ts

@@ -1,6 +1,6 @@
 import { useRequest, type Method } from 'alova';
 import { useState } from 'react';
-import { useBlocker } from 'react-router-dom';
+import { unstable_useBlocker as useBlocker } from 'react-router-dom';
 import { toast } from 'react-toastify';
 
 import { useI18nContext } from 'i18n/i18n-react';

interface/yarn.lock

@@ -1187,10 +1187,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.12.0":
-  version: 1.12.0
-  resolution: "@remix-run/router@npm:1.12.0"
-  checksum: f984e42cfe855991e1d3067f686f857614f12e8c1c45168a2d98e3fc3a427e232fd0b6cf145173b7cd132faf070702b532c34230a825d933908c54c85077fc69
+"@remix-run/router@npm:1.11.0":
+  version: 1.11.0
+  resolution: "@remix-run/router@npm:1.11.0"
+  checksum: 629ec578b9dfd3c5cb5de64a0798dd7846ec5ba0351aa66f42b1c65efb43da8f30366be59b825303648965b0df55b638c110949b24ef94fd62e98117fdfb0c0f
   languageName: node
   linkType: hard
 
@@ -1775,7 +1775,7 @@ __metadata:
     react-dom: "npm:latest"
     react-dropzone: "npm:^14.2.3"
     react-icons: "npm:^4.12.0"
-    react-router-dom: "npm:^6.19.0"
+    react-router-dom: "npm:6.18.0"
     react-toastify: "npm:^9.1.3"
     rollup-plugin-visualizer: "npm:^5.9.2"
     sockette: "npm:^2.0.6"
@@ -7020,27 +7020,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.19.0":
-  version: 6.19.0
-  resolution: "react-router-dom@npm:6.19.0"
+"react-router-dom@npm:6.18.0":
+  version: 6.18.0
+  resolution: "react-router-dom@npm:6.18.0"
   dependencies:
-    "@remix-run/router": "npm:1.12.0"
-    react-router: "npm:6.19.0"
+    "@remix-run/router": "npm:1.11.0"
+    react-router: "npm:6.18.0"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 38312efc11d3ef688062301479a8257a1495a81cd8dd7039c1f81aba6774963df7d21aaee2ba1a3c152857b70f4fb9966a3ccff47aca12212e854dcd6fc4deab
+  checksum: b0e72603d73172b6c6662afe2faed326753d5bbd9905aa560e3dade7996fc13d19e34e3ed668d2849efd685e2db2f711129c84b1439870e92c9cc91ddc343cf5
   languageName: node
   linkType: hard
 
-"react-router@npm:6.19.0":
-  version: 6.19.0
-  resolution: "react-router@npm:6.19.0"
+"react-router@npm:6.18.0":
+  version: 6.18.0
+  resolution: "react-router@npm:6.18.0"
   dependencies:
-    "@remix-run/router": "npm:1.12.0"
+    "@remix-run/router": "npm:1.11.0"
   peerDependencies:
     react: ">=16.8"
-  checksum: 5454f4a4d65401430ded8f1033cebe4ccca771c3c827e8329c77dcfd73618ca9a32488fb58722bf6a07afef7d8e7ef22a710aae0f3337e5c20962bf6473d81a3
+  checksum: a00c8f347b7ffee575f4a7731782e688e3fca458ca5bd970fb41cef66a6851853caa24464155ab438d5879f367b1223a539642a405a865913ffe7e63e53b1245
   languageName: node
   linkType: hard