Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

2025-12-10 01:39:54 +03:00 · 2024-07-15 07:13:30 +02:00
parent c3ce0c1e2d 96bb220b36
commit 7727093767
47 changed files with 5986 additions and 5554 deletions
--- a/interface/eslint.config.js
+++ b/interface/eslint.config.js
@@ -16,7 +16,7 @@ export default tseslint.config(
    }
  },
  {
-    ignores: ['dist/*', '*.js', '**/*.cjs', '**/unpack.ts', 'i18*.ts']
+    ignores: ['dist/*', '*.js', '**/*.cjs', '**/unpack.ts', 'i18n*.*']
  },
  {
    rules: {
--- a/interface/package.json
+++ b/interface/package.json
@@ -26,15 +26,15 @@
    "@alova/scene-react": "^1.6.1",
    "@emotion/react": "^11.11.4",
    "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.16.0",
-    "@mui/material": "^5.16.0",
+    "@mui/icons-material": "^5.16.1",
+    "@mui/material": "^5.16.1",
    "@table-library/react-table-library": "4.1.7",
    "@types/lodash-es": "^4.17.12",
    "@types/node": "^20.14.10",
    "@types/react": "^18.3.3",
    "@types/react-dom": "^18.3.0",
    "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.21.3",
+    "alova": "^2.21.4",
    "async-validator": "^4.2.5",
    "history": "^5.3.0",
    "jwt-decode": "^4.0.0",
@@ -50,19 +50,19 @@
    "typescript": "^5.5.3"
  },
  "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@eslint/js": "^9.6.0",
+    "@babel/core": "^7.24.8",
+    "@eslint/js": "^9.7.0",
    "@preact/compat": "^17.1.2",
-    "@preact/preset-vite": "^2.8.3",
+    "@preact/preset-vite": "^2.9.0",
    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
    "@types/babel__core": "^7",
    "concurrently": "^8.2.2",
-    "eslint": "^9.6.0",
+    "eslint": "^9.7.0",
    "eslint-config-prettier": "^9.1.0",
    "preact": "^10.22.1",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
    "rollup-plugin-visualizer": "^5.12.0",
-    "terser": "^5.31.1",
+    "terser": "^5.31.2",
    "typescript-eslint": "8.0.0-alpha.10",
    "vite": "^5.3.3",
    "vite-plugin-imagemin": "^0.6.1",
--- a/interface/src/framework/system/SystemLog.tsx
+++ b/interface/src/framework/system/SystemLog.tsx
@@ -54,6 +54,8 @@ const levelLabel = (level: LogLevel) => {
      return 'NOTICE';
    case LogLevel.INFO:
      return 'INFO';
+    case LogLevel.DEBUG:
+      return 'DEBUG';
    case LogLevel.TRACE:
      return 'TRACE';
    default:
@@ -175,7 +177,7 @@ const SystemLog: FC = () => {
          justifyContent="flex-start"
          alignItems="center"
        >
-          <Grid item xs={2}>
+          <Grid item xs={4}>
            <TextField
              name="level"
              label={LL.LOG_LEVEL()}
@@ -194,7 +196,7 @@ const SystemLog: FC = () => {
              <MenuItem value={9}>ALL</MenuItem>
            </TextField>
          </Grid>
-          <Grid item xs={2}>
+          <Grid item xs={4}>
            <TextField
              name="max_messages"
              label={LL.BUFFER_SIZE()}
@@ -211,7 +213,7 @@ const SystemLog: FC = () => {
              <MenuItem value={100}>100</MenuItem>
            </TextField>
          </Grid>
-          <Grid item>
+          <Grid item xs={2}>
            <BlockFormControlLabel
              control={
                <Checkbox
@@ -226,8 +228,7 @@ const SystemLog: FC = () => {
          <Box
            sx={{
              '& button, & a, & .MuiCard-root': {
-                mt: 3,
-                mx: 0.6
+                ml: 3
              }
            }}
          >
@@ -266,8 +267,7 @@ const SystemLog: FC = () => {
          {logEntries.map((e) => (
            <LogEntryLine key={e.i}>
              <span>{e.t}</span>
-              {data.compact && <span>{paddedLevelLabel(e.l)} </span>}
-              {!data.compact && <span>{paddedLevelLabel(e.l)}&nbsp;</span>}
+              <span>{paddedLevelLabel(e.l)}&nbsp;</span>
              <span>{paddedIDLabel(e.i)} </span>
              <span>{paddedNameLabel(e.n)} </span>
              <span>{e.m}</span>
--- a/interface/src/framework/system/UploadDownload.tsx
+++ b/interface/src/framework/system/UploadDownload.tsx
@@ -2,7 +2,7 @@ import { type FC, useState } from 'react';
 import { toast } from 'react-toastify';

 import DownloadIcon from '@mui/icons-material/GetApp';
-import { Box, Button, Link, Typography } from '@mui/material';
+import { Box, Button, Divider, Link, Typography } from '@mui/material';

 import * as SystemApi from 'api/system';

@@ -195,6 +195,8 @@ const UploadDownload: FC = () => {
        <Box p={2} border="2px solid grey" borderRadius={2}>
          {LL.VERSION_ON() + ' '}
          <b>{data.emsesp_version}</b>&nbsp;({data.esp_platform})
+          {data.model.length > 0 && <p>Gateway Hardware:&nbsp;{data.model}</p>}
+          <Divider />
          {latestVersion && (
            <Box mt={2}>
              {LL.THE_LATEST()}&nbsp;{LL.OFFICIAL()}&nbsp;{LL.RELEASE_IS()}
--- a/interface/src/project/Scheduler.tsx
+++ b/interface/src/project/Scheduler.tsx
@@ -244,7 +244,7 @@ const Scheduler: FC = () => {
        data={{
          nodes: schedule
            .filter((si) => !si.deleted)
-            .sort((a, b) => a.name.localeCompare(b.name))
+            .sort((a, b) => a.flags - b.flags)
        }}
        theme={schedule_theme}
        layout={{ custom: true }}
--- a/interface/src/project/validators.ts
+++ b/interface/src/project/validators.ts
@@ -287,6 +287,7 @@ export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) =
    callback: (error?: string) => void
  ) {
    if (
+      name !== '' &&
      (o_name === undefined || o_name !== name) &&
      name !== '' &&
      schedule.find((si) => si.name === name)
@@ -392,8 +393,8 @@ export const temperatureSensorItemValidation = () =>
    n: [
      {
        type: 'string',
-        pattern: /^[a-zA-Z0-9_\\.]{0,15}$/,
-        message: "Must be <15 characters: alpha numeric, '_' or '.'"
+        pattern: /^[a-zA-Z0-9_\\.]{0,17}$/,
+        message: "Must be <18 characters: alpha numeric, '_' or '.'"
      }
    ]
  });
--- a/interface/src/types/system.ts
+++ b/interface/src/types/system.ts
@@ -24,6 +24,7 @@ export interface ESPSystemStatus {
  psram_size?: number;
  free_psram?: number;
  has_loader: boolean;
+  model: string;
 }

 export interface SystemStatus {
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -56,10 +56,10 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/compat-data@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/compat-data@npm:7.24.7"
-  checksum: 10c0/dcd93a5632b04536498fbe2be5af1057f635fd7f7090483d8e797878559037e5130b26862ceb359acbae93ed27e076d395ddb4663db6b28a665756ffd02d324f
+"@babel/compat-data@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/compat-data@npm:7.24.8"
+  checksum: 10c0/7f465e9d8e44c5b516eeb3001362a3cd9a6df51dd90d3ac9868e1e7fa631ac57fc781cec6700110d4f555ba37fe59c4a71927b445106fe0062e79e79ffe11091
  languageName: node
  linkType: hard

@@ -86,26 +86,26 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/core@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/core@npm:7.24.7"
+"@babel/core@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/core@npm:7.24.8"
  dependencies:
    "@ampproject/remapping": "npm:^2.2.0"
    "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helpers": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helpers": "npm:^7.24.8"
+    "@babel/parser": "npm:^7.24.8"
    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
    convert-source-map: "npm:^2.0.0"
    debug: "npm:^4.1.0"
    gensync: "npm:^1.0.0-beta.2"
    json5: "npm:^2.2.3"
    semver: "npm:^6.3.1"
-  checksum: 10c0/4004ba454d3c20a46ea66264e06c15b82e9f6bdc35f88819907d24620da70dbf896abac1cb4cc4b6bb8642969e45f4d808497c9054a1388a386cf8c12e9b9e0d
+  checksum: 10c0/5e21b40cc69746deda3fe3d6540351d9cb0d1ad5aea055b7c319db26071ff5789fd9580d1aa47b114f07631e8e2109f4e71696ca11d7c7e60d157767022c1bd2
  languageName: node
  linkType: hard

@@ -144,6 +144,18 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/generator@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/generator@npm:7.24.8"
+  dependencies:
+    "@babel/types": "npm:^7.24.8"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^2.5.1"
+  checksum: 10c0/e8a278e75a895f13a7b17dd79abe1e894fe82a5ed3abb127c33c14c66773d69993762521c094c6c364723f8f7375683b0d4a96097781175a29407baedf67b769
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.22.5":
  version: 7.22.5
  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -166,16 +178,16 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/helper-compilation-targets@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
+"@babel/helper-compilation-targets@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-compilation-targets@npm:7.24.8"
  dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
-    browserslist: "npm:^4.22.2"
+    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/helper-validator-option": "npm:^7.24.8"
+    browserslist: "npm:^4.23.1"
    lru-cache: "npm:^5.1.1"
    semver: "npm:^6.3.1"
-  checksum: 10c0/1d580a9bcacefe65e6bf02ba1dafd7ab278269fef45b5e281d8354d95c53031e019890464e7f9351898c01502dd2e633184eb0bcda49ed2ecd538675ce310f51
+  checksum: 10c0/2885c44ef6aaf82b7e4352b30089bb09fbe08ed5ec24eb452c2bdc3c021e2a65ab412f74b3d67ec1398da0356c730b33a2ceca1d67d34c85080d31ca6efa9aec
  languageName: node
  linkType: hard

@@ -267,9 +279,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/helper-module-transforms@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-module-transforms@npm:7.24.7"
+"@babel/helper-module-transforms@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-module-transforms@npm:7.24.8"
  dependencies:
    "@babel/helper-environment-visitor": "npm:^7.24.7"
    "@babel/helper-module-imports": "npm:^7.24.7"
@@ -278,7 +290,7 @@ __metadata:
    "@babel/helper-validator-identifier": "npm:^7.24.7"
  peerDependencies:
    "@babel/core": ^7.0.0
-  checksum: 10c0/4f311755fcc3b4cbdb689386309cdb349cf0575a938f0b9ab5d678e1a81bbb265aa34ad93174838245f2ac7ff6d5ddbd0104638a75e4e961958ed514355687b6
+  checksum: 10c0/b76496d5045af55be9de60e59e65e56a43033f01ccc746b26b7af911c358668c206b688ce70a23ab31ec04f9728f3a38e8d01073c85244115ab62f271a7fa3d1
  languageName: node
  linkType: hard

@@ -340,6 +352,13 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/helper-string-parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-string-parser@npm:7.24.8"
+  checksum: 10c0/6361f72076c17fabf305e252bf6d580106429014b3ab3c1f5c4eb3e6d465536ea6b670cc0e9a637a77a9ad40454d3e41361a2909e70e305116a23d68ce094c08
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.24.5":
  version: 7.24.5
  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
@@ -361,10 +380,10 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/helper-validator-option@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-option@npm:7.24.7"
-  checksum: 10c0/21aea2b7bc5cc8ddfb828741d5c8116a84cbc35b4a3184ec53124f08e09746f1f67a6f9217850188995ca86059a7942e36d8965a6730784901def777b7e8a436
+"@babel/helper-validator-option@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-validator-option@npm:7.24.8"
+  checksum: 10c0/73db93a34ae89201351288bee7623eed81a54000779462a986105b54ffe82069e764afd15171a428b82e7c7a9b5fec10b5d5603b216317a414062edf5c67a21f
  languageName: node
  linkType: hard

@@ -379,13 +398,13 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/helpers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helpers@npm:7.24.7"
+"@babel/helpers@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helpers@npm:7.24.8"
  dependencies:
    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/aa8e230f6668773e17e141dbcab63e935c514b4b0bf1fed04d2eaefda17df68e16b61a56573f7f1d4d1e605ce6cc162b5f7e9fdf159fde1fd9b77c920ae47d27
+    "@babel/types": "npm:^7.24.8"
+  checksum: 10c0/42b8939b0a0bf72d6df9721973eb0fd7cd48f42641c5c9c740916397faa586255c06d36c6e6a7e091860723096281c620f6ffaee0011a3bb254a6f5475d89a12
  languageName: node
  linkType: hard

@@ -431,6 +450,15 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/parser@npm:7.24.8"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10c0/ce69671de8fa6f649abf849be262707ac700b573b8b1ce1893c66cc6cd76aeb1294a19e8c290b0eadeb2f47d3f413a2e57a281804ffbe76bfb9fa50194cf3c52
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-syntax-jsx@npm:^7.23.3":
  version: 7.24.1
  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
@@ -553,6 +581,24 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/traverse@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/traverse@npm:7.24.8"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.8"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10c0/67a5cc35824455cdb54fb9e196a44b3186283e29018a9c2331f51763921e18e891b3c60c283615a27540ec8eb4c8b89f41c237b91f732a7aa518b2eb7a0d434d
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:7.17.0":
  version: 7.17.0
  resolution: "@babel/types@npm:7.17.0"
@@ -585,6 +631,17 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/types@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/types@npm:7.24.8"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.24.8"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10c0/2d7bf561ae993e794cb052c5a81d3a6d1877da13e1e2eb2a59ae75a8fb1c965b618fb3e4abd42548f5f9a4587d3a149185a32d6c4c4ea82195da7dd86f2da0f1
+  languageName: node
+  linkType: hard
+
 "@emotion/babel-plugin@npm:^11.11.0":
  version: 11.11.0
  resolution: "@emotion/babel-plugin@npm:11.11.0"
@@ -910,13 +967,20 @@ __metadata:
  languageName: node
  linkType: hard

-"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1":
+"@eslint-community/regexpp@npm:^4.10.0":
  version: 4.10.0
  resolution: "@eslint-community/regexpp@npm:4.10.0"
  checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
  languageName: node
  linkType: hard

+"@eslint-community/regexpp@npm:^4.11.0":
+  version: 4.11.0
+  resolution: "@eslint-community/regexpp@npm:4.11.0"
+  checksum: 10c0/0f6328869b2741e2794da4ad80beac55cba7de2d3b44f796a60955b0586212ec75e6b0253291fd4aad2100ad471d1480d8895f2b54f1605439ba4c875e05e523
+  languageName: node
+  linkType: hard
+
 "@eslint/config-array@npm:^0.17.0":
  version: 0.17.0
  resolution: "@eslint/config-array@npm:0.17.0"
@@ -945,10 +1009,10 @@ __metadata:
  languageName: node
  linkType: hard

-"@eslint/js@npm:9.6.0, @eslint/js@npm:^9.6.0":
-  version: 9.6.0
-  resolution: "@eslint/js@npm:9.6.0"
-  checksum: 10c0/83967a7e59f2e958c9bbb3acd0929cad00d59d927ad786ed8e0d30b07f983c6bea3af6f4ad32da32145db40b7a741a816ba339bdd8960fc7fc8231716d943b7f
+"@eslint/js@npm:9.7.0, @eslint/js@npm:^9.7.0":
+  version: 9.7.0
+  resolution: "@eslint/js@npm:9.7.0"
+  checksum: 10c0/73fc10666f6f4aed6f58e407e09f42ceb0d42fa60c52701c64ea9f59a81a6a8ad5caecdfd423d03088481515fe7ec17eb461acb4ef1ad70b649b6eae465b3164
  languageName: node
  linkType: hard

@@ -1099,16 +1163,16 @@ __metadata:
  languageName: node
  linkType: hard

-"@mui/core-downloads-tracker@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "@mui/core-downloads-tracker@npm:5.16.0"
-  checksum: 10c0/ed2c7e4e87637435d138026837436527934cd9c4c340721859f2f24d21d63e922231beb3b916070d549e2e6133310b2d3cca5b1d8bc1b8f88a10e6de913a363d
+"@mui/core-downloads-tracker@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/core-downloads-tracker@npm:5.16.1"
+  checksum: 10c0/2bdad71c53d65e59eba4889e6d3270b964200dddae448ae7d095de7130a4ec82e7fccdf8668488996e22993b653b91544195c10eeb996dc1c3a6c7a34c88c9c4
  languageName: node
  linkType: hard

-"@mui/icons-material@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "@mui/icons-material@npm:5.16.0"
+"@mui/icons-material@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/icons-material@npm:5.16.1"
  dependencies:
    "@babel/runtime": "npm:^7.23.9"
  peerDependencies:
@@ -1118,25 +1182,25 @@ __metadata:
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/c4aa6ea2941efe6bf50f477657234a946579f0ee0592cacec03a6e2bacefef04af2073e43c06cb69b1372f1ffb89ff4e4fc75f909ed4c54a04974176562f52f0
+  checksum: 10c0/90c235ee065a18e07e2c3059dcfe15ef880c5f936cde538c41ba3dfab83bbb963093a28603852647e0ef05e0a233e50ea4cd932d9ae58dcf803dadc16dd603af
  languageName: node
  linkType: hard

-"@mui/material@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "@mui/material@npm:5.16.0"
+"@mui/material@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/material@npm:5.16.1"
  dependencies:
    "@babel/runtime": "npm:^7.23.9"
    "@mui/base": "npm:5.0.0-beta.40"
-    "@mui/core-downloads-tracker": "npm:^5.16.0"
-    "@mui/system": "npm:^5.16.0"
-    "@mui/types": "npm:^7.2.14"
-    "@mui/utils": "npm:^5.16.0"
+    "@mui/core-downloads-tracker": "npm:^5.16.1"
+    "@mui/system": "npm:^5.16.1"
+    "@mui/types": "npm:^7.2.15"
+    "@mui/utils": "npm:^5.16.1"
    "@types/react-transition-group": "npm:^4.4.10"
    clsx: "npm:^2.1.0"
    csstype: "npm:^3.1.3"
    prop-types: "npm:^15.8.1"
-    react-is: "npm:^18.2.0"
+    react-is: "npm:^18.3.1"
    react-transition-group: "npm:^4.4.5"
  peerDependencies:
    "@emotion/react": ^11.5.0
@@ -1151,16 +1215,16 @@ __metadata:
      optional: true
    "@types/react":
      optional: true
-  checksum: 10c0/59a302ad3168a9768980f9bc8b18044876194ecebc51fd166ff002ad86df9c73f43409ed451916ed8cbbeb86447ec27b234c469f654d9d0313e36ef2d487a55a
+  checksum: 10c0/13baf645c276a97fade56ccce83ceaea95ee71cff56fea407cce576ff96b81115dacc5dd3d30a250047fc104e5ce63c28bdc095351e567407f9944af9d9daa83
  languageName: node
  linkType: hard

-"@mui/private-theming@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "@mui/private-theming@npm:5.16.0"
+"@mui/private-theming@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/private-theming@npm:5.16.1"
  dependencies:
    "@babel/runtime": "npm:^7.23.9"
-    "@mui/utils": "npm:^5.16.0"
+    "@mui/utils": "npm:^5.16.1"
    prop-types: "npm:^15.8.1"
  peerDependencies:
    "@types/react": ^17.0.0 || ^18.0.0
@@ -1168,13 +1232,13 @@ __metadata:
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/cd7c1888f45da3db701806a1d127010514815bb4acf502c3cf711e63d2307b18387bdc7a9f3815031210814b6a1fd977722e5cef2133e077e9bc2ac0bdb5504f
+  checksum: 10c0/8a95c7d59be1fd3ba8e49addb76870d5efe675a8f61ecb1558306053f0c71abad22f08d551e55fc48d5c012b0d1f1aefe924e0d3395485451ad1fe92a47adab2
  languageName: node
  linkType: hard

-"@mui/styled-engine@npm:^5.15.14":
-  version: 5.15.14
-  resolution: "@mui/styled-engine@npm:5.15.14"
+"@mui/styled-engine@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/styled-engine@npm:5.16.1"
  dependencies:
    "@babel/runtime": "npm:^7.23.9"
    "@emotion/cache": "npm:^11.11.0"
@@ -1189,19 +1253,19 @@ __metadata:
      optional: true
    "@emotion/styled":
      optional: true
-  checksum: 10c0/0d262ea0b3c117f865af1cd52b992592c24432e491b35e712159bb49adfd776ee9a532abbc4ab08889f308e75d30082a0fee809119d5d61a82b3277212655319
+  checksum: 10c0/fc011390c64ff970ad095e0a9e18f5ad777491fd49974233137b673fa9698d178c6b5f6346a28c1d8a1718dd453879ded4198bbc73e73dfcc8d5a90ea17760f6
  languageName: node
  linkType: hard

-"@mui/system@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "@mui/system@npm:5.16.0"
+"@mui/system@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/system@npm:5.16.1"
  dependencies:
    "@babel/runtime": "npm:^7.23.9"
-    "@mui/private-theming": "npm:^5.16.0"
-    "@mui/styled-engine": "npm:^5.15.14"
-    "@mui/types": "npm:^7.2.14"
-    "@mui/utils": "npm:^5.16.0"
+    "@mui/private-theming": "npm:^5.16.1"
+    "@mui/styled-engine": "npm:^5.16.1"
+    "@mui/types": "npm:^7.2.15"
+    "@mui/utils": "npm:^5.16.1"
    clsx: "npm:^2.1.0"
    csstype: "npm:^3.1.3"
    prop-types: "npm:^15.8.1"
@@ -1217,7 +1281,7 @@ __metadata:
      optional: true
    "@types/react":
      optional: true
-  checksum: 10c0/b5db097ba432653eba723424264204d3037ab1cdb30acc63b2d2fbcb98bae8999cbfd7ffff54173593dc2a4771558177602f01377da6f4134e7017f93a3624bf
+  checksum: 10c0/17b76d32d4ee1800910993d7309c36a8ea1982890ee952d1a301e5125a8ebe7bcdf3d8930fb385dd79712c4e3ea9e9e9547fac23b79dc874b60b33b0dbdffa8a
  languageName: node
  linkType: hard

@@ -1233,6 +1297,18 @@ __metadata:
  languageName: node
  linkType: hard

+"@mui/types@npm:^7.2.15":
+  version: 7.2.15
+  resolution: "@mui/types@npm:7.2.15"
+  peerDependencies:
+    "@types/react": ^17.0.0 || ^18.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 10c0/26c39674fe6f653a4c7406890b081b772e62efbd5b2754ab28bb8346819265d7c6496db8a8923230a84252ffd890e3d0b41642c151b78fdf8505336c92d78e14
+  languageName: node
+  linkType: hard
+
 "@mui/utils@npm:^5.15.14":
  version: 5.15.14
  resolution: "@mui/utils@npm:5.15.14"
@@ -1251,21 +1327,21 @@ __metadata:
  languageName: node
  linkType: hard

-"@mui/utils@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "@mui/utils@npm:5.16.0"
+"@mui/utils@npm:^5.16.1":
+  version: 5.16.1
+  resolution: "@mui/utils@npm:5.16.1"
  dependencies:
    "@babel/runtime": "npm:^7.23.9"
-    "@types/prop-types": "npm:^15.7.11"
+    "@types/prop-types": "npm:^15.7.12"
    prop-types: "npm:^15.8.1"
-    react-is: "npm:^18.2.0"
+    react-is: "npm:^18.3.1"
  peerDependencies:
    "@types/react": ^17.0.0 || ^18.0.0
    react: ^17.0.0 || ^18.0.0
  peerDependenciesMeta:
    "@types/react":
      optional: true
-  checksum: 10c0/0b56f9265a8ea686b50195448f1dea41c637d504c30da44c5f3f315bc81d24598f3b2acb281dd24d15831f7756dcaab285b7b891883bbec5809c54ef24affb49
+  checksum: 10c0/9a64bbfcd84474c9d18a79f3e236c4145d43983c3b1810cbcb6cf9d37d36f1bfeeb5a4f9ebf907050364b0a991caba28c481d2e6b2818e4e1c22729eeed24505
  languageName: node
  linkType: hard

@@ -1341,9 +1417,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@preact/preset-vite@npm:^2.8.3":
-  version: 2.8.3
-  resolution: "@preact/preset-vite@npm:2.8.3"
+"@preact/preset-vite@npm:^2.9.0":
+  version: 2.9.0
+  resolution: "@preact/preset-vite@npm:2.9.0"
  dependencies:
    "@babel/code-frame": "npm:^7.22.13"
    "@babel/plugin-transform-react-jsx": "npm:^7.22.15"
@@ -1361,7 +1437,7 @@ __metadata:
  peerDependencies:
    "@babel/core": 7.x
    vite: 2.x || 3.x || 4.x || 5.x
-  checksum: 10c0/984b47d24491d20ea9f0787adbef3515c3bd4cdfd77154cdb84e9038fabb5db09a0c76237557aff88b3da26cff6146ac616c2375579143fc511afcf7baf63927
+  checksum: 10c0/658e3dc048d1f1d8ad7cb1fef4a3db0f933be4e00d3d6cdfbd29fe7ec02341b3a26747520a5b261992923b3d3f49800c23a4d77da849e708a5c1ad9a920343b2
  languageName: node
  linkType: hard

@@ -1784,7 +1860,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/prop-types@npm:*, @types/prop-types@npm:^15.7.11":
+"@types/prop-types@npm:*, @types/prop-types@npm:^15.7.11, @types/prop-types@npm:^15.7.12":
  version: 15.7.12
  resolution: "@types/prop-types@npm:15.7.12"
  checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8
@@ -2002,14 +2078,14 @@ __metadata:
  dependencies:
    "@alova/adapter-xhr": "npm:^1.0.6"
    "@alova/scene-react": "npm:^1.6.1"
-    "@babel/core": "npm:^7.24.7"
+    "@babel/core": "npm:^7.24.8"
    "@emotion/react": "npm:^11.11.4"
    "@emotion/styled": "npm:^11.11.5"
-    "@eslint/js": "npm:^9.6.0"
-    "@mui/icons-material": "npm:^5.16.0"
-    "@mui/material": "npm:^5.16.0"
+    "@eslint/js": "npm:^9.7.0"
+    "@mui/icons-material": "npm:^5.16.1"
+    "@mui/material": "npm:^5.16.1"
    "@preact/compat": "npm:^17.1.2"
-    "@preact/preset-vite": "npm:^2.8.3"
+    "@preact/preset-vite": "npm:^2.9.0"
    "@table-library/react-table-library": "npm:4.1.7"
    "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
    "@types/babel__core": "npm:^7"
@@ -2018,17 +2094,17 @@ __metadata:
    "@types/react": "npm:^18.3.3"
    "@types/react-dom": "npm:^18.3.0"
    "@types/react-router-dom": "npm:^5.3.3"
-    alova: "npm:^2.21.3"
+    alova: "npm:^2.21.4"
    async-validator: "npm:^4.2.5"
    concurrently: "npm:^8.2.2"
-    eslint: "npm:^9.6.0"
+    eslint: "npm:^9.7.0"
    eslint-config-prettier: "npm:^9.1.0"
    history: "npm:^5.3.0"
    jwt-decode: "npm:^4.0.0"
    lodash-es: "npm:^4.17.21"
    mime-types: "npm:^2.1.35"
    preact: "npm:^10.22.1"
-    prettier: "npm:^3.3.2"
+    prettier: "npm:^3.3.3"
    react: "npm:latest"
    react-dom: "npm:latest"
    react-dropzone: "npm:^14.2.3"
@@ -2036,7 +2112,7 @@ __metadata:
    react-router-dom: "npm:^6.24.1"
    react-toastify: "npm:^10.0.5"
    rollup-plugin-visualizer: "npm:^5.12.0"
-    terser: "npm:^5.31.1"
+    terser: "npm:^5.31.2"
    typesafe-i18n: "npm:^5.26.2"
    typescript: "npm:^5.5.3"
    typescript-eslint: "npm:8.0.0-alpha.10"
@@ -2111,10 +2187,10 @@ __metadata:
  languageName: node
  linkType: hard

-"alova@npm:^2.21.3":
-  version: 2.21.3
-  resolution: "alova@npm:2.21.3"
-  checksum: 10c0/ce03ced33660f15ec667e24df5c7fbeff223dace95a7d50d657dd038f21dc865d8a9290914edbc5a980c8573daa4354ac714f97ae58650ea5b8fefd8fc2d313c
+"alova@npm:^2.21.4":
+  version: 2.21.4
+  resolution: "alova@npm:2.21.4"
+  checksum: 10c0/6600826747eecc85f750904cd5a9f75361bd5b542615b027fae072cafe72cb27b9f7b260a834063c0734a9b41a7aa8b15396a190f8ce9a46713d01b073296a50
  languageName: node
  linkType: hard

@@ -2373,6 +2449,20 @@ __metadata:
  languageName: node
  linkType: hard

+"browserslist@npm:^4.23.1":
+  version: 4.23.2
+  resolution: "browserslist@npm:4.23.2"
+  dependencies:
+    caniuse-lite: "npm:^1.0.30001640"
+    electron-to-chromium: "npm:^1.4.820"
+    node-releases: "npm:^2.0.14"
+    update-browserslist-db: "npm:^1.1.0"
+  bin:
+    browserslist: cli.js
+  checksum: 10c0/0217d23c69ed61cdd2530c7019bf7c822cd74c51f8baab18dd62457fed3129f52499f8d3a6f809ae1fb7bb3050aa70caa9a529cc36c7478427966dbf429723a5
+  languageName: node
+  linkType: hard
+
 "buffer-alloc-unsafe@npm:^1.1.0":
  version: 1.1.0
  resolution: "buffer-alloc-unsafe@npm:1.1.0"
@@ -2487,6 +2577,13 @@ __metadata:
  languageName: node
  linkType: hard

+"caniuse-lite@npm:^1.0.30001640":
+  version: 1.0.30001641
+  resolution: "caniuse-lite@npm:1.0.30001641"
+  checksum: 10c0/a065b641cfcc84b36955ee909bfd7313ad103d6a299f0fd261e0e4160e8f1cec79d685c5a9f11097a77687cf47154eddb8133163f2a34bcb8d73c45033a014d2
+  languageName: node
+  linkType: hard
+
 "caw@npm:^2.0.0, caw@npm:^2.0.1":
  version: 2.0.1
  resolution: "caw@npm:2.0.1"
@@ -3098,6 +3195,13 @@ __metadata:
  languageName: node
  linkType: hard

+"electron-to-chromium@npm:^1.4.820":
+  version: 1.4.827
+  resolution: "electron-to-chromium@npm:1.4.827"
+  checksum: 10c0/e37719d8f13da78eb2bc68184cdf73d167ecf413abc28afef2b0a5c55866293752fda980d83a5f42b5780781bde418b24c12e1c38f2662d25ed1c2f71880bc24
+  languageName: node
+  linkType: hard
+
 "emoji-regex@npm:^8.0.0":
  version: 8.0.0
  resolution: "emoji-regex@npm:8.0.0"
@@ -3493,13 +3597,13 @@ __metadata:
  languageName: node
  linkType: hard

-"eslint-scope@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "eslint-scope@npm:8.0.1"
+"eslint-scope@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "eslint-scope@npm:8.0.2"
  dependencies:
    esrecurse: "npm:^4.3.0"
    estraverse: "npm:^5.2.0"
-  checksum: 10c0/0ec40ab284e58ac7ef064ecd23c127e03d339fa57173c96852336c73afc70ce5631da21dc1c772415a37a421291845538dd69db83c68d611044c0fde1d1fa269
+  checksum: 10c0/477f820647c8755229da913025b4567347fd1f0bf7cbdf3a256efff26a7e2e130433df052bd9e3d014025423dc00489bea47eb341002b15553673379c1a7dc36
  languageName: node
  linkType: hard

@@ -3517,15 +3621,15 @@ __metadata:
  languageName: node
  linkType: hard

-"eslint@npm:^9.6.0":
-  version: 9.6.0
-  resolution: "eslint@npm:9.6.0"
+"eslint@npm:^9.7.0":
+  version: 9.7.0
+  resolution: "eslint@npm:9.7.0"
  dependencies:
    "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint-community/regexpp": "npm:^4.11.0"
    "@eslint/config-array": "npm:^0.17.0"
    "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.6.0"
+    "@eslint/js": "npm:9.7.0"
    "@humanwhocodes/module-importer": "npm:^1.0.1"
    "@humanwhocodes/retry": "npm:^0.3.0"
    "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3534,7 +3638,7 @@ __metadata:
    cross-spawn: "npm:^7.0.2"
    debug: "npm:^4.3.2"
    escape-string-regexp: "npm:^4.0.0"
-    eslint-scope: "npm:^8.0.1"
+    eslint-scope: "npm:^8.0.2"
    eslint-visitor-keys: "npm:^4.0.0"
    espree: "npm:^10.1.0"
    esquery: "npm:^1.5.0"
@@ -3557,7 +3661,7 @@ __metadata:
    text-table: "npm:^0.2.0"
  bin:
    eslint: bin/eslint.js
-  checksum: 10c0/82ea5ad3f28aaef89e2a98f4e6df0eae9d4e16ccd6d667c69977042e0b103fa5df98bf16d3df72d1ae77edd8c1dccfdf4afa2a55309aa8081a1bc54af6229826
+  checksum: 10c0/e2369a9534404f62f37ee5560e56fb84e0776a9c8f084550170017992772e7034d73571bdf4060e2fe9b836f136d45b07d50407d4b9361de720ee77794259274
  languageName: node
  linkType: hard

@@ -5999,12 +6103,12 @@ __metadata:
  languageName: node
  linkType: hard

-"prettier@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "prettier@npm:3.3.2"
+"prettier@npm:^3.3.3":
+  version: 3.3.3
+  resolution: "prettier@npm:3.3.3"
  bin:
    prettier: bin/prettier.cjs
-  checksum: 10c0/39ed27d17f0238da6dd6571d63026566bd790d3d0edac57c285fbab525982060c8f1e01955fe38134ab10f0951a6076da37f015db8173c02f14bc7f0803a384c
+  checksum: 10c0/b85828b08e7505716324e4245549b9205c0cacb25342a030ba8885aba2039a115dbcf75a0b7ca3b37bc9d101ee61fab8113fc69ca3359f2a226f1ecc07ad2e26
  languageName: node
  linkType: hard

@@ -6140,7 +6244,7 @@ __metadata:
  languageName: node
  linkType: hard

-"react-is@npm:^18.2.0":
+"react-is@npm:^18.2.0, react-is@npm:^18.3.1":
  version: 18.3.1
  resolution: "react-is@npm:18.3.1"
  checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072
@@ -7035,9 +7139,9 @@ __metadata:
  languageName: node
  linkType: hard

-"terser@npm:^5.31.1":
-  version: 5.31.1
-  resolution: "terser@npm:5.31.1"
+"terser@npm:^5.31.2":
+  version: 5.31.2
+  resolution: "terser@npm:5.31.2"
  dependencies:
    "@jridgewell/source-map": "npm:^0.3.3"
    acorn: "npm:^8.8.2"
@@ -7045,7 +7149,7 @@ __metadata:
    source-map-support: "npm:~0.5.20"
  bin:
    terser: bin/terser
-  checksum: 10c0/4d49a58f64c11f3742e779a0a03aff69972ca5739decb361d909d22c8f3f7d8e2ec982a928d987d56737ad50229e8ab3f62d8ba993e4b5f360a53ed487d3c06c
+  checksum: 10c0/5b72f58421f69267f67cb60cf4398282afcdec697e9b6f1909035cdf52d9960226fc1df5968e27ba96736b7a7ba76609d0b7b060ee5da7769553940726059b63
  languageName: node
  linkType: hard

@@ -7274,6 +7378,20 @@ __metadata:
  languageName: node
  linkType: hard

+"update-browserslist-db@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "update-browserslist-db@npm:1.1.0"
+  dependencies:
+    escalade: "npm:^3.1.2"
+    picocolors: "npm:^1.0.1"
+  peerDependencies:
+    browserslist: ">= 4.21.0"
+  bin:
+    update-browserslist-db: cli.js
+  checksum: 10c0/a7452de47785842736fb71547651c5bbe5b4dc1e3722ccf48a704b7b34e4dcf633991eaa8e4a6a517ffb738b3252eede3773bef673ef9021baa26b056d63a5b9
+  languageName: node
+  linkType: hard
+
 "uri-js@npm:^4.2.2":
  version: 4.4.1
  resolution: "uri-js@npm:4.4.1"