chore: release v2.3.0

refactor: 修改 Menu.recordRaw 和 Menu.recordMainRaw 类型里的 meta 为可选参数
fix: 修复标题显示异常
2026-10-06 23:53:14 +08:00 · 2022-11-28 00:35:20 +08:00 · 2022-11-27 23:40:16 +08:00 · 2022-11-27 23:37:03 +08:00 · 2022-11-27 17:50:31 +08:00 · 2022-11-27 04:09:30 +08:00
72 changed files with 2364 additions and 1552 deletions
@@ -23,7 +23,7 @@ module.exports = {
      { value: 'fix', name: 'fix:      🐛  修复缺陷 | A bug fix', emoji: ':bug:' },
      { value: 'docs', name: 'docs:     📝  文档更新 | Documentation only changes', emoji: ':memo:' },
      { value: 'style', name: 'style:    💄  代码格式 | Changes that do not affect the meaning of the code', emoji: ':lipstick:' },
-      { value: 'refactor', name: 'refactor: ♻️  代码重构 | A code change that neither fixes a bug nor adds a feature', emoji: ':recycle:' },
+      { value: 'refactor', name: 'refactor: ♻️   代码重构 | A code change that neither fixes a bug nor adds a feature', emoji: ':recycle:' },
      { value: 'perf', name: 'perf:     ⚡️  性能提升 | A code change that improves performance', emoji: ':zap:' },
      { value: 'test', name: 'test:     ✅  测试相关 | Adding missing tests or correcting existing tests', emoji: ':white_check_mark:' },
      { value: 'build', name: 'build:    📦️  构建相关 | Changes that affect the build system or external dependencies', emoji: ':package:' },
@@ -19,4 +19,69 @@ jobs:

      - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+  upload-archive:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Get Release
+        id: last_release
+        uses: joutvhu/get-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          latest: true
+
+      - name: Create Archive
+        uses: thedoctor0/zip-release@main
+        with:
+          type: 'zip'
+          filename: fantastic-admin.${{ steps.last_release.outputs.tag_name }}.zip
+          exclusions: '/.git/* /.github/*'
+
+      - name: Upload Archive To Release
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_id: ${{ steps.last_release.outputs.id }}
+          draft: false
+          file: fantastic-admin.${{ steps.last_release.outputs.tag_name }}.zip
+
+  upload-archive-example:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: example
+
+      - name: Get Release
+        id: last_release
+        uses: joutvhu/get-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          latest: true
+
+      - name: Create Archive
+        uses: thedoctor0/zip-release@main
+        with:
+          type: 'zip'
+          filename: fantastic-admin.example.${{ steps.last_release.outputs.tag_name }}.zip
+          exclusions: '/.git/* /.github/*'
+
+      - name: Upload Archive To Release
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_id: ${{ steps.last_release.outputs.id }}
+          draft: false
+          file: fantastic-admin.example.${{ steps.last_release.outputs.tag_name }}.zip
@@ -3,6 +3,8 @@ node_modules
 dist*
 dist-ssr
 *.local
+.eslintcache
+.stylelintcache
 src/assets/sprites/*.*
 !src/assets/sprites/.gitkeep
 public/icons
@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-pnpm lint-staged
@@ -1,5 +1,5 @@
 {
-  "src/**/*.{js,jsx,ts,tsx}": "eslint --fix",
-  "src/**/*.{css,scss}": "stylelint --fix --allow-empty-input",
-  "src/**/*.vue": ["eslint --fix", "stylelint --fix --allow-empty-input"]
+  "src/**/*.{js,jsx,ts,tsx}": "eslint --cache --fix",
+  "src/**/*.{css,scss}": "stylelint --cache --fix --allow-empty-input",
+  "src/**/*.vue": ["eslint --cache --fix", "stylelint --cache --fix --allow-empty-input"]
 }
@@ -4,6 +4,7 @@
    "mikestead.dotenv",
    "dbaeumer.vscode-eslint",
    "stylelint.vscode-stylelint",
-    "vue.volar"
+    "Vue.volar",
+    "Vue.vscode-typescript-vue-plugin",
  ]
 }
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.2",
+  "version": "2.3.0",
  "scripts": {
    "dev": "vite",
    "build:test": "vue-tsc --noEmit && vite build --mode test",
@@ -8,76 +8,81 @@
    "serve": "http-server ./dist -o",
    "svgo": "svgo -f src/assets/icons",
    "new": "plop",
-    "lint:eslint": "eslint src/**/*.{ts,tsx,vue} --fix",
-    "lint:stylelint": "stylelint src/**/*.{css,scss,vue} --fix",
-    "prepare": "husky install",
-    "postinstall": "esno scripts/prepare.js",
+    "lint": "npm-run-all -s lint:tsc lint:eslint lint:stylelint",
+    "lint:tsc": "vue-tsc --noEmit",
+    "lint:eslint": "eslint src/**/*.{ts,tsx,vue} --cache --fix",
+    "lint:stylelint": "stylelint src/**/*.{css,scss,vue} --cache --fix",
+    "postinstall": "simple-git-hooks && esno scripts/prepare.js",
    "preinstall": "npx only-allow pnpm",
    "commit": "git cz",
    "release": "bumpp"
  },
  "dependencies": {
    "@tinymce/tinymce-vue": "^5.0.0",
-    "@vueuse/core": "^9.3.0",
-    "@vueuse/integrations": "^9.3.0",
-    "axios": "^0.27.2",
-    "dayjs": "^1.11.5",
-    "element-plus": "^2.2.18",
-    "hotkeys-js": "^3.10.0",
+    "@vueuse/core": "^9.6.0",
+    "@vueuse/integrations": "^9.6.0",
+    "axios": "^1.2.0",
+    "dayjs": "^1.11.6",
+    "element-plus": "^2.2.25",
+    "hotkeys-js": "^3.10.1",
    "lodash-es": "^4.17.21",
    "mitt": "^3.0.0",
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
    "path-browserify": "^1.0.1",
    "path-to-regexp": "^6.2.1",
-    "pinia": "^2.0.23",
+    "pinia": "^2.0.26",
    "qs": "^6.11.0",
-    "tinymce": "^6.2.0",
-    "vue": "^3.2.41",
-    "vue-router": "^4.1.5"
+    "tinymce": "^6.3.0",
+    "vue": "^3.2.45",
+    "vue-router": "^4.1.6"
  },
  "devDependencies": {
-    "@antfu/eslint-config": "^0.27.0",
+    "@antfu/eslint-config": "^0.31.0",
    "@iconify-json/ep": "^1.1.8",
    "@iconify/vue": "^4.0.0",
    "@types/nprogress": "^0.2.0",
    "@types/path-browserify": "^1.0.0",
    "@types/qs": "^6.9.7",
-    "@vitejs/plugin-vue": "^3.1.2",
-    "@vitejs/plugin-vue-jsx": "^2.0.1",
-    "autoprefixer": "^10.4.12",
+    "@vitejs/plugin-vue": "^3.2.0",
+    "@vitejs/plugin-vue-jsx": "^2.1.1",
+    "autoprefixer": "^10.4.13",
    "bumpp": "^8.2.1",
-    "cz-git": "^1.3.11",
-    "eslint": "^8.25.0",
+    "cz-git": "^1.3.12",
+    "eslint": "^8.28.0",
    "esno": "^0.16.3",
    "fs-extra": "^10.1.0",
    "http-server": "^14.1.1",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^13.0.4",
+    "npm-run-all": "^4.1.5",
    "plop": "^3.1.1",
    "postcss-html": "^1.5.0",
-    "sass": "^1.55.0",
-    "stylelint": "^14.13.0",
-    "stylelint-config-standard": "^28.0.0",
-    "stylelint-config-standard-scss": "^5.0.0",
+    "sass": "^1.56.1",
+    "simple-git-hooks": "^2.8.1",
+    "stylelint": "^14.15.0",
+    "stylelint-config-standard": "^29.0.0",
+    "stylelint-config-standard-scss": "^6.1.0",
    "stylelint-config-standard-vue": "^1.0.0",
    "stylelint-scss": "^4.3.0",
-    "svgo": "^2.8.0",
-    "typescript": "^4.8.4",
-    "unplugin-auto-import": "^0.11.2",
-    "unplugin-vue-components": "^0.22.8",
-    "vite": "^3.1.8",
-    "vite-plugin-banner": "^0.5.0",
+    "svgo": "^3.0.2",
+    "typescript": "^4.9.3",
+    "unplugin-auto-import": "^0.12.0",
+    "unplugin-vue-components": "^0.22.11",
+    "vite": "^3.2.4",
+    "vite-plugin-banner": "^0.6.1",
    "vite-plugin-compression": "^0.5.1",
    "vite-plugin-html": "^3.2.0",
    "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-pages": "^0.26.0",
-    "vite-plugin-restart": "^0.2.0",
+    "vite-plugin-pages": "^0.27.1",
    "vite-plugin-spritesmith": "^0.1.1",
    "vite-plugin-svg-icons": "^2.0.1",
    "vite-plugin-vue-layouts": "^0.6.0",
    "vite-plugin-vue-setup-extend": "^0.4.0",
-    "vue-tsc": "^1.0.7"
+    "vue-tsc": "^1.0.9"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
+    "preserveUnused": true
  },
  "config": {
    "commitizen": {
@@ -1,13 +1,13 @@
 <script lang="ts" setup{{#if isGlobal}} name="{{ properCase name }}"{{/if}}>
-// const proxy = useCurrentInstance()
+// 逻辑代码
 </script>

 <template>
  <div>
-    <!-- 内容区 -->
+    <!-- 布局 -->
  </div>
 </template>

 <style lang="scss" scoped>
-// scss
+// 样式
 </style>
@@ -1,15 +1,13 @@
 <script lang="ts" setup name="{{ properCase componentName }}">
-// const proxy = useCurrentInstance()
-// const router = useRouter()
-// const route = useRoute()
+// 逻辑代码
 </script>

 <template>
  <div>
-    页面内容区域
+    <!-- 布局 -->
  </div>
 </template>

 <style lang="scss" scoped>
-// scss
+// 样式
 </style>
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -186,6 +203,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -215,6 +253,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.3);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.3);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -506,10 +551,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -205,6 +222,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -234,6 +272,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.1);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.1);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -525,10 +570,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -252,11 +252,24 @@ button::-moz-focus-inner {
  margin: 0;
  outline: none;
  padding: 4px 16px;
+  position: relative;
  text-align: center;
  text-decoration: none;
  text-transform: none;
  white-space: nowrap;
 }
+.tox .tox-button::before {
+  border-radius: 6px;
+  bottom: -1px;
+  box-shadow: inset 0 0 0 2px #fff, 0 0 0 1px #006ce7, 0 0 0 3px rgba(0, 108, 231, 0.25);
+  content: '';
+  left: -1px;
+  opacity: 0;
+  pointer-events: none;
+  position: absolute;
+  right: -1px;
+  top: -1px;
+}
 .tox .tox-button[disabled] {
  background-color: #006ce7;
  background-image: none;
@@ -272,6 +285,9 @@ button::-moz-focus-inner {
  box-shadow: none;
  color: #fff;
 }
+.tox .tox-button:focus-visible:not(:disabled)::before {
+  opacity: 1;
+}
 .tox .tox-button:hover:not(:disabled) {
  background-color: #0060ce;
  background-image: none;
@@ -933,8 +949,9 @@ button::-moz-focus-inner {
  justify-content: space-between;
 }
 .tox .tox-comment__date {
-  color: rgba(255, 255, 255, 0.5);
+  color: #fff;
  font-size: 12px;
+  line-height: 18px;
 }
 .tox .tox-comment__body {
  color: #fff;
@@ -1093,20 +1110,30 @@ button::-moz-focus-inner {
 .tox .tox-user__avatar svg {
  fill: rgba(255, 255, 255, 0.5);
 }
+.tox .tox-user__avatar img {
+  border-radius: 50%;
+  height: 36px;
+  object-fit: cover;
+  vertical-align: middle;
+  width: 36px;
+}
 .tox .tox-user__name {
-  color: rgba(255, 255, 255, 0.5);
-  font-size: 12px;
+  color: #fff;
+  font-size: 14px;
  font-style: normal;
  font-weight: bold;
-  text-transform: uppercase;
+  line-height: 18px;
+  text-transform: none;
 }
-.tox:not([dir=rtl]) .tox-user__avatar svg {
+.tox:not([dir=rtl]) .tox-user__avatar svg,
+.tox:not([dir=rtl]) .tox-user__avatar img {
  margin-right: 8px;
 }
 .tox:not([dir=rtl]) .tox-user__avatar + .tox-user__name {
  margin-left: 8px;
 }
-.tox[dir=rtl] .tox-user__avatar svg {
+.tox[dir=rtl] .tox-user__avatar svg,
+.tox[dir=rtl] .tox-user__avatar img {
  margin-left: 8px;
 }
 .tox[dir=rtl] .tox-user__avatar + .tox-user__name {
@@ -1151,10 +1178,11 @@ button::-moz-focus-inner {
  width: 95vw;
  z-index: 2;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog {
    align-self: flex-start;
    margin: 8px auto;
+    max-height: calc(100vh - 8px * 2);
    width: calc(100vw - 16px);
  }
 }
@@ -1210,7 +1238,7 @@ button::-moz-focus-inner {
  text-align: left;
  text-transform: none;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body {
    flex-direction: column;
  }
@@ -1221,7 +1249,7 @@ button::-moz-focus-inner {
  flex-direction: column;
  padding: 16px 16px;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body-nav {
    flex-direction: row;
    -webkit-overflow-scrolling: touch;
@@ -1389,6 +1417,9 @@ button::-moz-focus-inner {
  padding-bottom: 8px;
  padding-top: 8px;
 }
+.tox .tox-dialog__iframe.tox-dialog__iframe--opaque {
+  background: #fff;
+}
 .tox .tox-dialog__popups {
  position: absolute;
  width: 100%;
@@ -1421,12 +1452,12 @@ button::-moz-focus-inner {
 .tox .tox-dialog-dock-transition.tox-dialog-dock-fadein {
  transition-delay: 0s;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav {
    margin-right: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child) {
    margin-left: 8px;
  }
@@ -1438,12 +1469,12 @@ button::-moz-focus-inner {
 .tox[dir=rtl] .tox-dialog__body {
  text-align: right;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav {
    margin-left: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child) {
    margin-right: 8px;
  }
@@ -1500,6 +1531,8 @@ body.tox-dialog__disable-scroll {
  overflow: hidden;
 }
 .tox .tox-editor-header {
+  display: grid;
+  grid-template-columns: 1fr min-content;
  z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -1581,8 +1614,7 @@ body.tox-dialog__disable-scroll {
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-menu {
-  border-color: #161f29;
-  box-shadow: none;
+  box-sizing: border-box;
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-autocompleter-highlight {
@@ -2073,6 +2105,12 @@ body.tox-dialog__disable-scroll {
 .tox .tox-menu.tox-collection.tox-collection--grid {
  padding: 8px;
 }
+@media only screen and (min-width: 768px ) {
+  .tox .tox-menu .tox-collection__item-label {
+    overflow-wrap: break-word;
+    word-break: normal;
+  }
+}
 .tox .tox-menu__label h1,
 .tox .tox-menu__label h2,
 .tox .tox-menu__label h3,
@@ -2085,16 +2123,45 @@ body.tox-dialog__disable-scroll {
  margin: 0;
 }
 .tox .tox-menubar {
-  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='transparent'/%3E%3C/svg%3E") left 0 top 0 #222F3E;
+  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px / 100% calc(100% - 39px) no-repeat;
  background-color: #222F3E;
  display: flex;
  flex: 0 0 auto;
  flex-shrink: 0;
  flex-wrap: wrap;
+  grid-column: 1 / -1;
+  grid-row: 1;
  padding: 0 11px 0 12px;
 }
-.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
-  border-top: 1px solid transparent;
+.tox .tox-promotion + .tox-menubar {
+  grid-column: 1;
+}
+.tox .tox-promotion {
+  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px / 100% calc(100% - 39px) no-repeat;
+  background-color: #222F3E;
+  grid-column: 2;
+  grid-row: 1;
+  padding-inline-end: 8px;
+  padding-inline-start: 4px;
+  padding-top: 5px;
+}
+.tox .tox-promotion-link {
+  align-items: unsafe center;
+  background-color: #E8F1F8;
+  border-radius: 5px;
+  color: #086BE6;
+  cursor: pointer;
+  display: flex;
+  font-size: 14px;
+  height: 26.6px;
+  padding: 4px 8px;
+  white-space: nowrap;
+}
+.tox .tox-promotion-link:hover {
+  background-color: #B4D7FF;
+}
+.tox .tox-promotion-link:focus {
+  background-color: #D9EDF7;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -2874,10 +2941,14 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
  transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
+.tox .tox-toolbar-overlord,
+.tox .tox-anchorbar {
+  grid-column: 1 / -1;
+}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
  border-top: 1px solid transparent;
-  margin-top: 0px;
+  margin-top: -1px;
  padding-bottom: 1px;
  padding-top: 1px;
 }
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -205,6 +222,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -234,6 +272,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.1);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.1);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -525,10 +570,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -205,6 +222,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -234,6 +272,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.1);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.1);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -525,10 +570,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -252,11 +252,24 @@ button::-moz-focus-inner {
  margin: 0;
  outline: none;
  padding: 4px 16px;
+  position: relative;
  text-align: center;
  text-decoration: none;
  text-transform: none;
  white-space: nowrap;
 }
+.tox .tox-button::before {
+  border-radius: 6px;
+  bottom: -1px;
+  box-shadow: inset 0 0 0 2px #fff, 0 0 0 1px #006ce7, 0 0 0 3px rgba(0, 108, 231, 0.25);
+  content: '';
+  left: -1px;
+  opacity: 0;
+  pointer-events: none;
+  position: absolute;
+  right: -1px;
+  top: -1px;
+}
 .tox .tox-button[disabled] {
  background-color: #006ce7;
  background-image: none;
@@ -272,6 +285,9 @@ button::-moz-focus-inner {
  box-shadow: none;
  color: #fff;
 }
+.tox .tox-button:focus-visible:not(:disabled)::before {
+  opacity: 1;
+}
 .tox .tox-button:hover:not(:disabled) {
  background-color: #0060ce;
  background-image: none;
@@ -933,8 +949,9 @@ button::-moz-focus-inner {
  justify-content: space-between;
 }
 .tox .tox-comment__date {
-  color: rgba(34, 47, 62, 0.7);
+  color: #222f3e;
  font-size: 12px;
+  line-height: 18px;
 }
 .tox .tox-comment__body {
  color: #222f3e;
@@ -1093,20 +1110,30 @@ button::-moz-focus-inner {
 .tox .tox-user__avatar svg {
  fill: rgba(34, 47, 62, 0.7);
 }
+.tox .tox-user__avatar img {
+  border-radius: 50%;
+  height: 36px;
+  object-fit: cover;
+  vertical-align: middle;
+  width: 36px;
+}
 .tox .tox-user__name {
-  color: rgba(34, 47, 62, 0.7);
-  font-size: 12px;
+  color: #222f3e;
+  font-size: 14px;
  font-style: normal;
  font-weight: bold;
-  text-transform: uppercase;
+  line-height: 18px;
+  text-transform: none;
 }
-.tox:not([dir=rtl]) .tox-user__avatar svg {
+.tox:not([dir=rtl]) .tox-user__avatar svg,
+.tox:not([dir=rtl]) .tox-user__avatar img {
  margin-right: 8px;
 }
 .tox:not([dir=rtl]) .tox-user__avatar + .tox-user__name {
  margin-left: 8px;
 }
-.tox[dir=rtl] .tox-user__avatar svg {
+.tox[dir=rtl] .tox-user__avatar svg,
+.tox[dir=rtl] .tox-user__avatar img {
  margin-left: 8px;
 }
 .tox[dir=rtl] .tox-user__avatar + .tox-user__name {
@@ -1151,10 +1178,11 @@ button::-moz-focus-inner {
  width: 95vw;
  z-index: 2;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog {
    align-self: flex-start;
    margin: 8px auto;
+    max-height: calc(100vh - 8px * 2);
    width: calc(100vw - 16px);
  }
 }
@@ -1210,7 +1238,7 @@ button::-moz-focus-inner {
  text-align: left;
  text-transform: none;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body {
    flex-direction: column;
  }
@@ -1221,7 +1249,7 @@ button::-moz-focus-inner {
  flex-direction: column;
  padding: 16px 16px;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body-nav {
    flex-direction: row;
    -webkit-overflow-scrolling: touch;
@@ -1389,6 +1417,9 @@ button::-moz-focus-inner {
  padding-bottom: 8px;
  padding-top: 8px;
 }
+.tox .tox-dialog__iframe.tox-dialog__iframe--opaque {
+  background: #fff;
+}
 .tox .tox-dialog__popups {
  position: absolute;
  width: 100%;
@@ -1421,12 +1452,12 @@ button::-moz-focus-inner {
 .tox .tox-dialog-dock-transition.tox-dialog-dock-fadein {
  transition-delay: 0s;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav {
    margin-right: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child) {
    margin-left: 8px;
  }
@@ -1438,12 +1469,12 @@ button::-moz-focus-inner {
 .tox[dir=rtl] .tox-dialog__body {
  text-align: right;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav {
    margin-left: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child) {
    margin-right: 8px;
  }
@@ -1500,6 +1531,8 @@ body.tox-dialog__disable-scroll {
  overflow: hidden;
 }
 .tox .tox-editor-header {
+  display: grid;
+  grid-template-columns: 1fr min-content;
  z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -1581,8 +1614,7 @@ body.tox-dialog__disable-scroll {
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-menu {
-  border-color: #eeeeee;
-  box-shadow: none;
+  box-sizing: border-box;
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-autocompleter-highlight {
@@ -2073,6 +2105,12 @@ body.tox-dialog__disable-scroll {
 .tox .tox-menu.tox-collection.tox-collection--grid {
  padding: 8px;
 }
+@media only screen and (min-width: 768px ) {
+  .tox .tox-menu .tox-collection__item-label {
+    overflow-wrap: break-word;
+    word-break: normal;
+  }
+}
 .tox .tox-menu__label h1,
 .tox .tox-menu__label h2,
 .tox .tox-menu__label h3,
@@ -2085,16 +2123,45 @@ body.tox-dialog__disable-scroll {
  margin: 0;
 }
 .tox .tox-menubar {
-  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='transparent'/%3E%3C/svg%3E") left 0 top 0 #fff;
+  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px / 100% calc(100% - 39px) no-repeat;
  background-color: #fff;
  display: flex;
  flex: 0 0 auto;
  flex-shrink: 0;
  flex-wrap: wrap;
+  grid-column: 1 / -1;
+  grid-row: 1;
  padding: 0 11px 0 12px;
 }
-.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
-  border-top: 1px solid transparent;
+.tox .tox-promotion + .tox-menubar {
+  grid-column: 1;
+}
+.tox .tox-promotion {
+  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px / 100% calc(100% - 39px) no-repeat;
+  background-color: #fff;
+  grid-column: 2;
+  grid-row: 1;
+  padding-inline-end: 8px;
+  padding-inline-start: 4px;
+  padding-top: 5px;
+}
+.tox .tox-promotion-link {
+  align-items: unsafe center;
+  background-color: #E8F1F8;
+  border-radius: 5px;
+  color: #086BE6;
+  cursor: pointer;
+  display: flex;
+  font-size: 14px;
+  height: 26.6px;
+  padding: 4px 8px;
+  white-space: nowrap;
+}
+.tox .tox-promotion-link:hover {
+  background-color: #B4D7FF;
+}
+.tox .tox-promotion-link:focus {
+  background-color: #D9EDF7;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -2874,10 +2941,14 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
  transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
+.tox .tox-toolbar-overlord,
+.tox .tox-anchorbar {
+  grid-column: 1 / -1;
+}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
  border-top: 1px solid transparent;
-  margin-top: 0px;
+  margin-top: -1px;
  padding-bottom: 1px;
  padding-top: 1px;
 }
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -186,6 +203,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -215,6 +253,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.3);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.3);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -506,10 +551,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -205,6 +222,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -234,6 +272,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.1);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.1);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -525,10 +570,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -252,11 +252,24 @@ button::-moz-focus-inner {
  margin: 0;
  outline: none;
  padding: 4px 16px;
+  position: relative;
  text-align: center;
  text-decoration: none;
  text-transform: none;
  white-space: nowrap;
 }
+.tox .tox-button::before {
+  border-radius: 3px;
+  bottom: -1px;
+  box-shadow: inset 0 0 0 2px #fff, 0 0 0 1px #207ab7, 0 0 0 3px rgba(32, 122, 183, 0.25);
+  content: '';
+  left: -1px;
+  opacity: 0;
+  pointer-events: none;
+  position: absolute;
+  right: -1px;
+  top: -1px;
+}
 .tox .tox-button[disabled] {
  background-color: #207ab7;
  background-image: none;
@@ -272,6 +285,9 @@ button::-moz-focus-inner {
  box-shadow: none;
  color: #fff;
 }
+.tox .tox-button:focus-visible:not(:disabled)::before {
+  opacity: 1;
+}
 .tox .tox-button:hover:not(:disabled) {
  background-color: #1c6ca1;
  background-image: none;
@@ -933,8 +949,9 @@ button::-moz-focus-inner {
  justify-content: space-between;
 }
 .tox .tox-comment__date {
-  color: rgba(255, 255, 255, 0.5);
+  color: #fff;
  font-size: 12px;
+  line-height: 18px;
 }
 .tox .tox-comment__body {
  color: #fff;
@@ -1093,20 +1110,30 @@ button::-moz-focus-inner {
 .tox .tox-user__avatar svg {
  fill: rgba(255, 255, 255, 0.5);
 }
+.tox .tox-user__avatar img {
+  border-radius: 50%;
+  height: 36px;
+  object-fit: cover;
+  vertical-align: middle;
+  width: 36px;
+}
 .tox .tox-user__name {
-  color: rgba(255, 255, 255, 0.5);
-  font-size: 12px;
+  color: #fff;
+  font-size: 14px;
  font-style: normal;
  font-weight: bold;
-  text-transform: uppercase;
+  line-height: 18px;
+  text-transform: none;
 }
-.tox:not([dir=rtl]) .tox-user__avatar svg {
+.tox:not([dir=rtl]) .tox-user__avatar svg,
+.tox:not([dir=rtl]) .tox-user__avatar img {
  margin-right: 8px;
 }
 .tox:not([dir=rtl]) .tox-user__avatar + .tox-user__name {
  margin-left: 8px;
 }
-.tox[dir=rtl] .tox-user__avatar svg {
+.tox[dir=rtl] .tox-user__avatar svg,
+.tox[dir=rtl] .tox-user__avatar img {
  margin-left: 8px;
 }
 .tox[dir=rtl] .tox-user__avatar + .tox-user__name {
@@ -1151,10 +1178,11 @@ button::-moz-focus-inner {
  width: 95vw;
  z-index: 2;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog {
    align-self: flex-start;
    margin: 8px auto;
+    max-height: calc(100vh - 8px * 2);
    width: calc(100vw - 16px);
  }
 }
@@ -1210,7 +1238,7 @@ button::-moz-focus-inner {
  text-align: left;
  text-transform: none;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body {
    flex-direction: column;
  }
@@ -1221,7 +1249,7 @@ button::-moz-focus-inner {
  flex-direction: column;
  padding: 16px 16px;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body-nav {
    flex-direction: row;
    -webkit-overflow-scrolling: touch;
@@ -1389,6 +1417,9 @@ button::-moz-focus-inner {
  padding-bottom: 8px;
  padding-top: 8px;
 }
+.tox .tox-dialog__iframe.tox-dialog__iframe--opaque {
+  background: #fff;
+}
 .tox .tox-dialog__popups {
  position: absolute;
  width: 100%;
@@ -1421,12 +1452,12 @@ button::-moz-focus-inner {
 .tox .tox-dialog-dock-transition.tox-dialog-dock-fadein {
  transition-delay: 0s;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav {
    margin-right: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child) {
    margin-left: 8px;
  }
@@ -1438,12 +1469,12 @@ button::-moz-focus-inner {
 .tox[dir=rtl] .tox-dialog__body {
  text-align: right;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav {
    margin-left: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child) {
    margin-right: 8px;
  }
@@ -1500,6 +1531,8 @@ body.tox-dialog__disable-scroll {
  overflow: hidden;
 }
 .tox .tox-editor-header {
+  display: grid;
+  grid-template-columns: 1fr min-content;
  z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -1581,8 +1614,7 @@ body.tox-dialog__disable-scroll {
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-menu {
-  border-color: #000000;
-  box-shadow: none;
+  box-sizing: border-box;
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-autocompleter-highlight {
@@ -2073,6 +2105,12 @@ body.tox-dialog__disable-scroll {
 .tox .tox-menu.tox-collection.tox-collection--grid {
  padding: 4px;
 }
+@media only screen and (min-width: 768px ) {
+  .tox .tox-menu .tox-collection__item-label {
+    overflow-wrap: break-word;
+    word-break: normal;
+  }
+}
 .tox .tox-menu__label h1,
 .tox .tox-menu__label h2,
 .tox .tox-menu__label h3,
@@ -2091,10 +2129,39 @@ body.tox-dialog__disable-scroll {
  flex: 0 0 auto;
  flex-shrink: 0;
  flex-wrap: wrap;
+  grid-column: 1 / -1;
+  grid-row: 1;
  padding: 0 4px 0 4px;
 }
-.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
-  border-top: 1px solid #000000;
+.tox .tox-promotion + .tox-menubar {
+  grid-column: 1;
+}
+.tox .tox-promotion {
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;
+  background-color: #222f3e;
+  grid-column: 2;
+  grid-row: 1;
+  padding-inline-end: 8px;
+  padding-inline-start: 4px;
+  padding-top: 5px;
+}
+.tox .tox-promotion-link {
+  align-items: unsafe center;
+  background-color: #E8F1F8;
+  border-radius: 5px;
+  color: #086BE6;
+  cursor: pointer;
+  display: flex;
+  font-size: 14px;
+  height: 26.6px;
+  padding: 4px 8px;
+  white-space: nowrap;
+}
+.tox .tox-promotion-link:hover {
+  background-color: #B4D7FF;
+}
+.tox .tox-promotion-link:focus {
+  background-color: #D9EDF7;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -2874,10 +2941,14 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
  transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
+.tox .tox-toolbar-overlord,
+.tox .tox-anchorbar {
+  grid-column: 1 / -1;
+}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
  border-top: 1px solid #000000;
-  margin-top: 0;
+  margin-top: -1px;
  padding-bottom: 0px;
  padding-top: 0px;
 }
@@ -3087,6 +3158,12 @@ body.tox-dialog__disable-scroll {
  border: 1px solid #000000;
  padding: 0;
 }
+.tox .tox-pop .tox-pop__dialog .tox-toolbar {
+  padding: 0;
+}
+.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid #000000;
+}
 .tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,
 .tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child {
  border-top: 1px solid #000000;
@@ -3117,3 +3194,6 @@ body.tox-dialog__disable-scroll {
  padding-bottom: 0;
  padding-right: 0;
 }
+.tox .tox-button::before {
+  display: none;
+}
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -205,6 +222,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -234,6 +272,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.1);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.1);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -525,10 +570,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -21,11 +21,28 @@
 .mce-content-body .mce-item-anchor[data-mce-selected] {
  outline-offset: 1px;
 }
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
+.tox-comments-visible .tox-comment[contenteditable="false"]:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #ffe89d;
 }
-.tox-comments-visible .tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
-  background-color: #ffe168;
+.tox-comments-visible .tox-comment[contenteditable="false"][data-mce-annotation-active="true"]:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] img:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > audio:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] > video:not([data-mce-selected]),
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"] span.mce-preview-object:not([data-mce-selected]) {
+  outline: 3px solid #fed635;
+}
+.tox-comments-visible span.tox-comment:not([data-mce-selected]) {
+  background-color: #ffe89d;
+  outline: none;
+}
+.tox-comments-visible span.tox-comment[data-mce-annotation-active="true"]:not([data-mce-selected="inline-boundary"]) {
+  background-color: #fed635;
 }
 .tox-checklist > li:not(.tox-checklist--hidden) {
  list-style: none;
@@ -205,6 +222,27 @@ pre[class*="language-"] {
 .tox-cursor-format-painter {
  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
 }
+div.mce-footnotes hr {
+  margin-inline-end: auto;
+  margin-inline-start: 0;
+  width: 25%;
+}
+div.mce-footnotes li > a.mce-footnotes-backlink {
+  text-decoration: none;
+}
+@media print {
+  sup.mce-footnote a {
+    color: black;
+    text-decoration: none;
+  }
+  div.mce-footnotes {
+    break-inside: avoid;
+    width: 100%;
+  }
+  div.mce-footnotes li > a.mce-footnotes-backlink {
+    display: none;
+  }
+}
 .mce-content-body figure.align-left {
  float: left;
 }
@@ -234,6 +272,13 @@ pre[class*="language-"] {
 .mce-preview-object[data-mce-selected="2"] .mce-shim {
  display: none;
 }
+.mce-content-body .mce-mergetag:hover {
+  background-color: rgba(0, 108, 231, 0.1);
+}
+.mce-content-body .mce-mergetag-affix {
+  background-color: rgba(0, 108, 231, 0.1);
+  color: #006ce7;
+}
 .mce-object {
  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
  border: 1px dashed #aaa;
@@ -525,10 +570,10 @@ pre[class*="language-"] {
    border-color: rgba(0, 84, 180, 0.7);
  }
 }
-.mce-content-body img::-moz-selection {
+.mce-content-body img[data-mce-selected]::-moz-selection {
  background: none;
 }
-.mce-content-body img::selection {
+.mce-content-body img[data-mce-selected]::selection {
  background: none;
 }
 .ephox-snooker-resizer-bar {
@@ -252,11 +252,24 @@ button::-moz-focus-inner {
  margin: 0;
  outline: none;
  padding: 4px 16px;
+  position: relative;
  text-align: center;
  text-decoration: none;
  text-transform: none;
  white-space: nowrap;
 }
+.tox .tox-button::before {
+  border-radius: 3px;
+  bottom: -1px;
+  box-shadow: inset 0 0 0 2px #fff, 0 0 0 1px #207ab7, 0 0 0 3px rgba(32, 122, 183, 0.25);
+  content: '';
+  left: -1px;
+  opacity: 0;
+  pointer-events: none;
+  position: absolute;
+  right: -1px;
+  top: -1px;
+}
 .tox .tox-button[disabled] {
  background-color: #207ab7;
  background-image: none;
@@ -272,6 +285,9 @@ button::-moz-focus-inner {
  box-shadow: none;
  color: #fff;
 }
+.tox .tox-button:focus-visible:not(:disabled)::before {
+  opacity: 1;
+}
 .tox .tox-button:hover:not(:disabled) {
  background-color: #1c6ca1;
  background-image: none;
@@ -933,8 +949,9 @@ button::-moz-focus-inner {
  justify-content: space-between;
 }
 .tox .tox-comment__date {
-  color: rgba(34, 47, 62, 0.7);
+  color: #222f3e;
  font-size: 12px;
+  line-height: 18px;
 }
 .tox .tox-comment__body {
  color: #222f3e;
@@ -1093,20 +1110,30 @@ button::-moz-focus-inner {
 .tox .tox-user__avatar svg {
  fill: rgba(34, 47, 62, 0.7);
 }
+.tox .tox-user__avatar img {
+  border-radius: 50%;
+  height: 36px;
+  object-fit: cover;
+  vertical-align: middle;
+  width: 36px;
+}
 .tox .tox-user__name {
-  color: rgba(34, 47, 62, 0.7);
-  font-size: 12px;
+  color: #222f3e;
+  font-size: 14px;
  font-style: normal;
  font-weight: bold;
-  text-transform: uppercase;
+  line-height: 18px;
+  text-transform: none;
 }
-.tox:not([dir=rtl]) .tox-user__avatar svg {
+.tox:not([dir=rtl]) .tox-user__avatar svg,
+.tox:not([dir=rtl]) .tox-user__avatar img {
  margin-right: 8px;
 }
 .tox:not([dir=rtl]) .tox-user__avatar + .tox-user__name {
  margin-left: 8px;
 }
-.tox[dir=rtl] .tox-user__avatar svg {
+.tox[dir=rtl] .tox-user__avatar svg,
+.tox[dir=rtl] .tox-user__avatar img {
  margin-left: 8px;
 }
 .tox[dir=rtl] .tox-user__avatar + .tox-user__name {
@@ -1151,10 +1178,11 @@ button::-moz-focus-inner {
  width: 95vw;
  z-index: 2;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog {
    align-self: flex-start;
    margin: 8px auto;
+    max-height: calc(100vh - 8px * 2);
    width: calc(100vw - 16px);
  }
 }
@@ -1210,7 +1238,7 @@ button::-moz-focus-inner {
  text-align: left;
  text-transform: none;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body {
    flex-direction: column;
  }
@@ -1221,7 +1249,7 @@ button::-moz-focus-inner {
  flex-direction: column;
  padding: 16px 16px;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox .tox-dialog__body-nav {
    flex-direction: row;
    -webkit-overflow-scrolling: touch;
@@ -1389,6 +1417,9 @@ button::-moz-focus-inner {
  padding-bottom: 8px;
  padding-top: 8px;
 }
+.tox .tox-dialog__iframe.tox-dialog__iframe--opaque {
+  background: #fff;
+}
 .tox .tox-dialog__popups {
  position: absolute;
  width: 100%;
@@ -1421,12 +1452,12 @@ button::-moz-focus-inner {
 .tox .tox-dialog-dock-transition.tox-dialog-dock-fadein {
  transition-delay: 0s;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav {
    margin-right: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child) {
    margin-left: 8px;
  }
@@ -1438,12 +1469,12 @@ button::-moz-focus-inner {
 .tox[dir=rtl] .tox-dialog__body {
  text-align: right;
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav {
    margin-left: 0;
  }
 }
-@media only screen and (max-width:767px) {
+@media only screen and (max-width: 767px ) {
  body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child) {
    margin-right: 8px;
  }
@@ -1500,6 +1531,8 @@ body.tox-dialog__disable-scroll {
  overflow: hidden;
 }
 .tox .tox-editor-header {
+  display: grid;
+  grid-template-columns: 1fr min-content;
  z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -1510,7 +1543,7 @@ body.tox-dialog__disable-scroll {
  transition: box-shadow 0.5s;
 }
 .tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header {
-  border-top: 1px solid #c1c1c1;
+  border-top: 1px solid #cccccc;
  box-shadow: none;
 }
 .tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header {
@@ -1581,8 +1614,7 @@ body.tox-dialog__disable-scroll {
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-menu {
-  border-color: #cccccc;
-  box-shadow: none;
+  box-sizing: border-box;
  max-width: 25em;
 }
 .tox .tox-autocompleter .tox-autocompleter-highlight {
@@ -2073,6 +2105,12 @@ body.tox-dialog__disable-scroll {
 .tox .tox-menu.tox-collection.tox-collection--grid {
  padding: 4px;
 }
+@media only screen and (min-width: 768px ) {
+  .tox .tox-menu .tox-collection__item-label {
+    overflow-wrap: break-word;
+    word-break: normal;
+  }
+}
 .tox .tox-menu__label h1,
 .tox .tox-menu__label h2,
 .tox .tox-menu__label h3,
@@ -2091,10 +2129,39 @@ body.tox-dialog__disable-scroll {
  flex: 0 0 auto;
  flex-shrink: 0;
  flex-wrap: wrap;
+  grid-column: 1 / -1;
+  grid-row: 1;
  padding: 0 4px 0 4px;
 }
-.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
-  border-top: 1px solid #cccccc;
+.tox .tox-promotion + .tox-menubar {
+  grid-column: 1;
+}
+.tox .tox-promotion {
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;
+  background-color: #fff;
+  grid-column: 2;
+  grid-row: 1;
+  padding-inline-end: 8px;
+  padding-inline-start: 4px;
+  padding-top: 5px;
+}
+.tox .tox-promotion-link {
+  align-items: unsafe center;
+  background-color: #E8F1F8;
+  border-radius: 5px;
+  color: #086BE6;
+  cursor: pointer;
+  display: flex;
+  font-size: 14px;
+  height: 26.6px;
+  padding: 4px 8px;
+  white-space: nowrap;
+}
+.tox .tox-promotion-link:hover {
+  background-color: #B4D7FF;
+}
+.tox .tox-promotion-link:focus {
+  background-color: #D9EDF7;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -2874,10 +2941,14 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
  transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
+.tox .tox-toolbar-overlord,
+.tox .tox-anchorbar {
+  grid-column: 1 / -1;
+}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
  border-top: 1px solid #cccccc;
-  margin-top: 0;
+  margin-top: -1px;
  padding-bottom: 0px;
  padding-top: 0px;
 }
@@ -3087,6 +3158,12 @@ body.tox-dialog__disable-scroll {
  border: 1px solid #cccccc;
  padding: 0;
 }
+.tox .tox-pop .tox-pop__dialog .tox-toolbar {
+  padding: 0;
+}
+.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid #cccccc;
+}
 .tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,
 .tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child {
  border-top: 1px solid #cccccc;
@@ -3117,3 +3194,6 @@ body.tox-dialog__disable-scroll {
  padding-bottom: 0;
  padding-right: 0;
 }
+.tox .tox-button::before {
+  display: none;
+}
@@ -67,14 +67,12 @@ watch([
  () => settingsStore.title,
 ], () => {
  if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
-    const title = settingsStore.title
+    const title = typeof settingsStore.title === 'function' ? settingsStore.title() : settingsStore.title
    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
  }
  else {
    document.title = import.meta.env.VITE_APP_TITLE
  }
-}, {
-  immediate: true,
 })

 onMounted(() => {
@@ -1,9 +1,11 @@
 import axios from 'axios'
 // import qs from 'qs'
+import { ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'

 const toLogin = () => {
+  useUserStore().logout()
  router.push({
    path: '/login',
    query: {
@@ -14,7 +16,7 @@ const toLogin = () => {

 const api = axios.create({
  baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
-  timeout: 10000,
+  timeout: 1000 * 60,
  responseType: 'json',
 })

@@ -47,11 +49,7 @@ api.interceptors.response.use(
     * 请求出错时 error 会返回错误信息
     */
    if (response.data.status === 1) {
-      if (response.data.error === '') {
-        // 请求成功并且没有报错
-        return Promise.resolve(response.data)
-      }
-      else {
+      if (response.data.error !== '') {
        // 这里做错误提示，如果使用了 element plus 则可以使用 Message 进行提示
        // ElMessage.error(options)
        return Promise.reject(response.data)
@@ -60,6 +58,7 @@ api.interceptors.response.use(
    else {
      toLogin()
    }
+    return Promise.resolve(response.data)
  },
  (error) => {
    let message = error.message
@@ -2,7 +2,6 @@
 export {}
 declare global {
  const EffectScope: typeof import('vue')['EffectScope']
-  const ElMessage: typeof import('element-plus/es')['ElMessage']
  const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
  const computed: typeof import('vue')['computed']
  const createApp: typeof import('vue')['createApp']
@@ -30,6 +29,8 @@ declare global {
  const nextTick: typeof import('vue')['nextTick']
  const onActivated: typeof import('vue')['onActivated']
  const onBeforeMount: typeof import('vue')['onBeforeMount']
+  const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
+  const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
  const onDeactivated: typeof import('vue')['onDeactivated']
@@ -46,6 +47,7 @@ declare global {
  const readonly: typeof import('vue')['readonly']
  const ref: typeof import('vue')['ref']
  const resolveComponent: typeof import('vue')['resolveComponent']
+  const resolveDirective: typeof import('vue')['resolveDirective']
  const setActivePinia: typeof import('pinia')['setActivePinia']
  const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']
  const shallowReactive: typeof import('vue')['shallowReactive']
@@ -61,7 +63,8 @@ declare global {
  const useAuth: typeof import('./utils/composables/useAuth')['default']
  const useCssModule: typeof import('vue')['useCssModule']
  const useCssVars: typeof import('vue')['useCssVars']
-  const useCurrentInstance: typeof import('./utils/composables/useCurrentInstance')['default']
+  const useGlobalProperties: typeof import('./utils/composables/useGlobalProperties')['default']
+  const useLink: typeof import('vue-router')['useLink']
  const useMainPage: typeof import('./utils/composables/useMainPage')['default']
  const useMenu: typeof import('./utils/composables/useMenu')['default']
  const useRoute: typeof import('vue-router')['useRoute']
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="FileUpload">
-import { UploadUserFile } from 'element-plus'
+import { ElMessage, UploadUserFile } from 'element-plus'
 import type { UploadProps } from 'element-plus'

 const props = defineProps({
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="ImageUpload">
 import type { UploadProps } from 'element-plus'
+import { ElMessage } from 'element-plus'

 const props = defineProps({
  action: {
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="ImagesUpload">
 import type { UploadProps } from 'element-plus'
+import { ElMessage } from 'element-plus'

 const props = defineProps({
  action: {
@@ -9,6 +9,8 @@ defineProps({
    default: '',
  },
 })
+
+const slots = useSlots()
 </script>

 <template>
@@ -23,7 +25,7 @@ defineProps({
        </slot>
      </div>
    </div>
-    <div class="sub">
+    <div v-if="slots.default" class="sub">
      <slot />
    </div>
  </div>
@@ -65,4 +67,15 @@ defineProps({
    flex: none;
  }
 }
+
+[data-mode="mobile"] {
+  .header {
+    flex-direction: column;
+
+    .main {
+      margin-right: auto;
+      margin-bottom: 20px;
+    }
+  }
+}
 </style>
@@ -4,6 +4,9 @@ import type { RouteRecordRaw, RouteMeta, NavigationGuard } from 'vue-router'
 type RecursiveRequired<T> = {
  [P in keyof T]-?: RecursiveRequired<T[P]>
 }
+type RecursivePartial<T> = {
+  [P in keyof T]?: RecursivePartial<T[P]>
+}

 declare namespace Settings {
  interface app {
@@ -49,15 +52,15 @@ declare namespace Settings {
     */
    routeBaseOn?: 'frontend' | 'backend' | 'filesystem'
  }
-  interface dashboard {
+  interface home {
    /**
-     * 是否开启控制台页面
+     * 是否开启主页页面
     * @默认值 `true`
     */
    enable?: boolean
    /**
-     * 控制台名称
-     * @默认值 `'控制台'`
+     * 主页名称
+     * @默认值 `'主页'`
     */
    title?: string
  }
@@ -186,8 +189,8 @@ declare namespace Settings {
  interface all {
    /** 应用设置 */
    app?: app
-    /** 控制台设置 */
-    dashboard?: dashboard
+    /** 主页设置 */
+    home?: home
    /** 布局设置 */
    layout?: layout
    /** 导航栏设置 */
@@ -207,7 +210,7 @@ declare namespace Settings {

 declare module 'vue-router' {
  interface RouteMeta {
-    title: string | Function
+    title?: string | Function
    i18n?: string
    icon?: string
    activeIcon?: string
@@ -222,12 +225,8 @@ declare module 'vue-router' {
 }

 declare namespace Route {
-  interface recordRaw extends Omit<RouteRecordRaw, 'meta' | 'children'> {
-    meta: RouteMeta
-    children?: recordRaw[]
-  }
  interface recordMainRaw {
-    meta: {
+    meta?: {
      title?: string | Function
      icon?: string
      auth?: string | string[]
@@ -236,7 +235,7 @@ declare namespace Route {
  }
  interface breadcrumb {
    path: string
-    title: string | Function
+    title?: string | Function
    hide: boolean
  }
 }
@@ -245,8 +244,8 @@ declare namespace Menu {
  /** 原始 */
  interface recordRaw {
    path?: string
-    meta: {
-      title: string
+    meta?: {
+      title?: string
      icon?: string
      defaultOpened?: boolean
      auth?: string | string[]
@@ -256,7 +255,7 @@ declare namespace Menu {
  }
  /** 主导航 */
  interface recordMainRaw {
-    meta: {
+    meta?: {
      title?: string
      icon?: string
      auth?: string | string[]
@@ -1,9 +1,10 @@
 <script lang="ts" setup name="AppSetting">
 import { useClipboard } from '@vueuse/core'
+import { ElMessage } from 'element-plus'
+import { cloneDeep } from 'lodash-es'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
-import globalSettingsDefault from '@/settings.default'

 const route = useRoute()

@@ -12,14 +13,13 @@ const menuStore = useMenuStore()

 const isShow = ref(false)

-const settings = ref(globalSettingsDefault)
-
-watch(() => settings, () => {
-  settingsStore.updateSettings(settings.value)
-  menuStore.setActived(0)
-  settings.value.menu.menuMode !== 'single' && menuStore.setActived(route.fullPath)
-}, {
-  deep: true,
+watch(() => settingsStore.menu.menuMode, (value) => {
+  if (value === 'single') {
+    menuStore.setActived(0)
+  }
+  else {
+    menuStore.setActived(route.fullPath)
+  }
 })

 onMounted(() => {
@@ -37,7 +37,11 @@ watch(copied, (val) => {
 })

 function handleCopy() {
-  copy(JSON.stringify(settings.value, null, 4))
+  const settings: any = cloneDeep(settingsStore.$state)
+  delete settings.subMenuCollapseLastStatus
+  delete settings.mode
+  delete settings.title
+  copy(JSON.stringify(settings, null, 2))
 }
 </script>

@@ -47,9 +51,9 @@ function handleCopy() {
      <el-alert title="应用配置可实时预览效果，但只是临时生效，要想真正作用于项目，可以点击下方的“复制配置”按钮，并将配置粘贴到 src/settings.ts 文件中。同时建议在生产环境隐藏应用配置功能。" type="error" :closable="false" />
      <el-divider>颜色主题</el-divider>
      <div class="color-scheme">
-        <div class="switch" :class="settings.app.colorScheme" @click="settings.app.colorScheme = settings.app.colorScheme === 'dark' ? 'light' : 'dark'">
+        <div class="switch" :class="settingsStore.app.colorScheme" @click="settingsStore.app.colorScheme = settingsStore.app.colorScheme === 'dark' ? 'light' : 'dark'">
          <el-icon class="icon">
-            <svg-icon :name="settings.app.colorScheme === 'light' ? 'ep:sunny' : 'ep:moon'" />
+            <svg-icon :name="settingsStore.app.colorScheme === 'light' ? 'ep:sunny' : 'ep:moon'" />
          </el-icon>
        </div>
      </div>
@@ -58,7 +62,7 @@ function handleCopy() {
      </el-divider>
      <div v-if="settingsStore.mode === 'pc'" class="menu-mode">
        <el-tooltip content="侧边栏模式（含主导航）" placement="top" :show-after="500">
-          <div class="mode mode-side" :class="{ active: settings.menu.menuMode === 'side' }" @click="settings.menu.menuMode = 'side'">
+          <div class="mode mode-side" :class="{ active: settingsStore.menu.menuMode === 'side' }" @click="settingsStore.menu.menuMode = 'side'">
            <div class="mode-container" />
            <el-icon>
              <svg-icon name="ep:check" />
@@ -66,7 +70,7 @@ function handleCopy() {
          </div>
        </el-tooltip>
        <el-tooltip content="顶部模式" placement="top" :show-after="500">
-          <div class="mode mode-head" :class="{ active: settings.menu.menuMode === 'head' }" @click="settings.menu.menuMode = 'head'">
+          <div class="mode mode-head" :class="{ active: settingsStore.menu.menuMode === 'head' }" @click="settingsStore.menu.menuMode = 'head'">
            <div class="mode-container" />
            <el-icon>
              <svg-icon name="ep:check" />
@@ -74,7 +78,7 @@ function handleCopy() {
          </div>
        </el-tooltip>
        <el-tooltip content="侧边栏模式（不含主导航）" placement="top" :show-after="500">
-          <div class="mode mode-single" :class="{ active: settings.menu.menuMode === 'single' }" @click="settings.menu.menuMode = 'single'">
+          <div class="mode mode-single" :class="{ active: settingsStore.menu.menuMode === 'single' }" @click="settingsStore.menu.menuMode = 'single'">
            <div class="mode-container" />
            <el-icon>
              <svg-icon name="ep:check" />
@@ -92,7 +96,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.menu.switchMainMenuAndPageJump" :disabled="['single'].includes(settings.menu.menuMode)" />
+        <el-switch v-model="settingsStore.menu.switchMainMenuAndPageJump" :disabled="['single'].includes(settingsStore.menu.menuMode)" />
      </div>
      <div class="setting-item">
        <div class="label">
@@ -103,32 +107,32 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.menu.subMenuUniqueOpened" />
+        <el-switch v-model="settingsStore.menu.subMenuUniqueOpened" />
      </div>
      <div class="setting-item">
        <div class="label">
          次导航是否折叠
        </div>
-        <el-switch v-model="settings.menu.subMenuCollapse" />
+        <el-switch v-model="settingsStore.menu.subMenuCollapse" />
      </div>
      <div v-if="settingsStore.mode === 'pc'" class="setting-item">
        <div class="label">
          显示次导航折叠按钮
        </div>
-        <el-switch v-model="settings.menu.enableSubMenuCollapseButton" />
+        <el-switch v-model="settingsStore.menu.enableSubMenuCollapseButton" />
      </div>
      <div class="setting-item">
        <div class="label">
          是否启用快捷键
        </div>
-        <el-switch v-model="settings.menu.enableHotkeys" :disabled="['single'].includes(settingsStore.menu.menuMode)" />
+        <el-switch v-model="settingsStore.menu.enableHotkeys" :disabled="['single'].includes(settingsStore.menu.menuMode)" />
      </div>
      <el-divider>顶栏</el-divider>
      <div class="setting-item">
        <div class="label">
          是否固定
        </div>
-        <el-switch v-model="settings.topbar.fixed" />
+        <el-switch v-model="settingsStore.topbar.fixed" />
      </div>
      <el-divider>工具栏</el-divider>
      <div v-if="settingsStore.mode === 'pc'" class="setting-item">
@@ -140,7 +144,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.toolbar.enableFullscreen" />
+        <el-switch v-model="settingsStore.toolbar.enableFullscreen" />
      </div>
      <div class="setting-item">
        <div class="label">
@@ -151,7 +155,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.toolbar.enablePageReload" />
+        <el-switch v-model="settingsStore.toolbar.enablePageReload" />
      </div>
      <div class="setting-item">
        <div class="label">
@@ -162,7 +166,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.toolbar.enableColorScheme" />
+        <el-switch v-model="settingsStore.toolbar.enableColorScheme" />
      </div>
      <el-divider v-if="settingsStore.mode === 'pc'">
        面包屑导航
@@ -171,7 +175,7 @@ function handleCopy() {
        <div class="label">
          是否启用
        </div>
-        <el-switch v-model="settings.breadcrumb.enable" />
+        <el-switch v-model="settingsStore.breadcrumb.enable" />
      </div>
      <el-divider>导航搜索</el-divider>
      <div class="setting-item">
@@ -183,62 +187,62 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.navSearch.enable" />
+        <el-switch v-model="settingsStore.navSearch.enable" />
      </div>
      <div class="setting-item">
        <div class="label">
          是否启用快捷键
        </div>
-        <el-switch v-model="settings.navSearch.enableHotkeys" :disabled="!settings.navSearch.enable" />
+        <el-switch v-model="settingsStore.navSearch.enableHotkeys" :disabled="!settingsStore.navSearch.enable" />
      </div>
      <el-divider>底部版权</el-divider>
      <div class="setting-item">
        <div class="label">
          是否启用
        </div>
-        <el-switch v-model="settings.copyright.enable" />
+        <el-switch v-model="settingsStore.copyright.enable" />
      </div>
      <div class="setting-item">
        <div class="label">
          日期
        </div>
-        <el-input v-model="settings.copyright.dates" size="small" :disabled="!settings.copyright.enable" />
+        <el-input v-model="settingsStore.copyright.dates" size="small" :disabled="!settingsStore.copyright.enable" />
      </div>
      <div class="setting-item">
        <div class="label">
          公司
        </div>
-        <el-input v-model="settings.copyright.company" size="small" :disabled="!settings.copyright.enable" />
+        <el-input v-model="settingsStore.copyright.company" size="small" :disabled="!settingsStore.copyright.enable" />
      </div>
      <div class="setting-item">
        <div class="label">
          网址
        </div>
-        <el-input v-model="settings.copyright.website" size="small" :disabled="!settings.copyright.enable" />
+        <el-input v-model="settingsStore.copyright.website" size="small" :disabled="!settingsStore.copyright.enable" />
      </div>
      <div class="setting-item">
        <div class="label">
          备案
        </div>
-        <el-input v-model="settings.copyright.beian" size="small" :disabled="!settings.copyright.enable" />
+        <el-input v-model="settingsStore.copyright.beian" size="small" :disabled="!settingsStore.copyright.enable" />
      </div>
-      <el-divider>控制台</el-divider>
+      <el-divider>主页</el-divider>
      <div class="setting-item">
        <div class="label">
          是否开启
-          <el-tooltip content="该功能开启时，登录成功默认进入控制台页面，反之则默认进入导航栏里第一个导航页面" placement="top">
+          <el-tooltip content="该功能开启时，登录成功默认进入主页，反之则默认进入导航栏里第一个导航页面" placement="top">
            <el-icon>
              <svg-icon name="ep:question-filled" />
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.dashboard.enable" />
+        <el-switch v-model="settingsStore.home.enable" />
      </div>
      <div class="setting-item">
        <div class="label">
-          控制台名称
+          主页名称
        </div>
-        <el-input v-model="settings.dashboard.title" size="small" />
+        <el-input v-model="settingsStore.home.title" size="small" />
      </div>
      <el-divider>其它</el-divider>
      <div class="setting-item">
@@ -250,7 +254,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-radio-group v-model="settings.app.elementSize" size="small">
+        <el-radio-group v-model="settingsStore.app.elementSize" size="small">
          <el-radio-button label="large">
            较大
          </el-radio-button>
@@ -266,7 +270,7 @@ function handleCopy() {
        <div class="label">
          是否启用权限
        </div>
-        <el-switch v-model="settings.app.enablePermission" />
+        <el-switch v-model="settingsStore.app.enablePermission" />
      </div>
      <div class="setting-item">
        <div class="label">
@@ -277,7 +281,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.app.enableProgress" />
+        <el-switch v-model="settingsStore.app.enableProgress" />
      </div>
      <div class="setting-item">
        <div class="label">
@@ -288,7 +292,7 @@ function handleCopy() {
            </el-icon>
          </el-tooltip>
        </div>
-        <el-switch v-model="settings.app.enableDynamicTitle" />
+        <el-switch v-model="settingsStore.app.enableDynamicTitle" />
      </div>
      <template v-if="isSupported" #footer>
        <el-button type="primary" @click="handleCopy">
@@ -30,10 +30,10 @@ function handlerMouserScroll(event: WheelEvent) {
            <template v-for="(item, index) in menuStore.allMenus" :key="index">
              <div v-if="item.children && item.children.length !== 0" class="item-container" :class="{ active: index === menuStore.actived }">
                <div class="item" @click="switchTo(index)">
-                  <el-icon>
-                    <svg-icon v-if="item.meta.icon" :name="item.meta.icon" />
+                  <el-icon v-if="item.meta?.icon">
+                    <svg-icon :name="item.meta.icon" />
                  </el-icon>
-                  <span v-if="item.meta.title">{{ item.meta.title }}</span>
+                  <span v-if="item.meta?.title">{{ item.meta.title }}</span>
                </div>
              </div>
            </template>
@@ -22,15 +22,15 @@ const to = computed(() => {
  const rtn: {
    name?: string
  } = {}
-  if (settingsStore.dashboard.enable) {
-    rtn.name = 'dashboard'
+  if (settingsStore.home.enable) {
+    rtn.name = 'home'
  }
  return rtn
 })
 </script>

 <template>
-  <router-link :to="to" class="title" :class="{ 'is-link': settingsStore.dashboard.enable }" :title="title">
+  <router-link :to="to" class="title" :class="{ 'is-link': settingsStore.home.enable }" :title="title">
    <img v-if="showLogo" :src="logo" class="logo">
    <span v-if="showTitle">{{ title }}</span>
  </router-link>
@@ -58,6 +58,7 @@ const to = computed(() => {
  .logo {
    width: 30px;
    height: 30px;
+    object-fit: contain;

    & + span {
      margin-left: 10px;
@@ -19,12 +19,12 @@ const { switchTo } = useMenu()
          <div
            v-if="item.children && item.children.length !== 0" :key="index" class="item" :class="{
              active: index === menuStore.actived,
-            }" :title="item.meta.title" @click="switchTo(index)"
+            }" :title="item.meta?.title ?? '[ 无标题 ]'" @click="switchTo(index)"
          >
-            <el-icon>
-              <svg-icon v-if="item.meta.icon" :name="item.meta.icon" />
+            <el-icon v-if="item.meta?.icon">
+              <svg-icon :name="item.meta.icon" />
            </el-icon>
-            <span>{{ item.meta.title }}</span>
+            <span>{{ item.meta?.title ?? '[ 无标题 ]' }}</span>
          </div>
        </template>
      </div>
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="Search">
 import { cloneDeep } from 'lodash-es'
 import hotkeys from 'hotkeys-js'
+import type { RouteRecordRaw } from 'vue-router'
 import { isExternalLink } from '@/utils'
 import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
@@ -16,8 +17,8 @@ const menuStore = useMenuStore()

 interface listTypes {
  icon?: string
-  title: string
-  breadcrumb: string[]
+  title?: string | Function
+  breadcrumb: (string | Function | undefined)[]
  path: string
 }

@@ -38,13 +39,37 @@ const resultList = computed(() => {
  let result = []
  result = sourceList.value.filter((item) => {
    let flag = false
-    if (item.title.includes(searchInput.value)) {
-      flag = true
+    if (item.title) {
+      if (typeof item.title === 'function') {
+        if (item.title().includes(searchInput.value)) {
+          flag = true
+        }
+      }
+      else {
+        if (item.title.includes(searchInput.value)) {
+          flag = true
+        }
+      }
    }
    if (item.path.includes(searchInput.value)) {
      flag = true
    }
-    if (item.breadcrumb.some(b => b.includes(searchInput.value))) {
+    if (item.breadcrumb.some((b) => {
+      let flag = false
+      if (b) {
+        if (typeof b === 'function') {
+          if (b().includes(searchInput.value)) {
+            flag = true
+          }
+        }
+        else {
+          if (b.includes(searchInput.value)) {
+            flag = true
+          }
+        }
+      }
+      return flag
+    })) {
      flag = true
    }
    return flag
@@ -109,23 +134,23 @@ onMounted(() => {
  }
 })

-function hasChildren(item: Route.recordRaw) {
+function hasChildren(item: RouteRecordRaw) {
  let flag = true
-  if (item.children && item.children.every(i => i.meta.sidebar === false)) {
+  if (item.children?.every(i => i.meta?.sidebar === false)) {
    flag = false
  }
  return flag
 }
-function getSourceList(arr: Route.recordRaw[], basePath?: string, icon?: string, breadcrumb?: string[]) {
+function getSourceList(arr: RouteRecordRaw[], basePath?: string, icon?: string, breadcrumb?: (string | Function | undefined)[]) {
  arr.forEach((item) => {
-    if (item.meta.sidebar !== false) {
+    if (item.meta?.sidebar !== false) {
      const breadcrumbTemp = cloneDeep(breadcrumb) || []
      if (item.children && hasChildren(item)) {
-        breadcrumbTemp.push(typeof item.meta.title === 'function' ? item.meta.title() : item.meta.title)
-        getSourceList(item.children, basePath ? [basePath, item.path].join('/') : item.path, item.meta.icon || icon, breadcrumbTemp)
+        breadcrumbTemp.push(item.meta?.title)
+        getSourceList(item.children, basePath ? [basePath, item.path].join('/') : item.path, item.meta?.icon ?? icon, breadcrumbTemp)
      }
      else {
-        breadcrumbTemp.push(typeof item.meta.title === 'function' ? item.meta.title() : item.meta.title)
+        breadcrumbTemp.push(item.meta?.title)
        let path = ''
        if (isExternalLink(item.path)) {
          path = item.path
@@ -134,8 +159,8 @@ function getSourceList(arr: Route.recordRaw[], basePath?: string, icon?: string,
          path = basePath ? [basePath, item.path].join('/') : item.path
        }
        sourceList.value.push({
-          icon: item.meta.icon || icon,
-          title: typeof item.meta.title === 'function' ? item.meta.title() : item.meta.title,
+          icon: item.meta?.icon ?? icon,
+          title: item.meta?.title,
          breadcrumb: breadcrumbTemp,
          path,
        })
@@ -143,18 +168,18 @@ function getSourceList(arr: Route.recordRaw[], basePath?: string, icon?: string,
    }
  })
 }
-function getSourceListByMenus(arr: Menu.recordRaw[], icon?: string, breadcrumb?: string[]) {
+function getSourceListByMenus(arr: Menu.recordRaw[], icon?: string, breadcrumb?: (string | Function | undefined)[]) {
  arr.forEach((item) => {
    const breadcrumbTemp = cloneDeep(breadcrumb) || []
    if (item.children && item.children.length > 0) {
-      breadcrumbTemp.push(item.meta.title)
-      getSourceListByMenus(item.children, item.meta.icon, breadcrumbTemp)
+      breadcrumbTemp.push(item.meta?.title)
+      getSourceListByMenus(item.children, item.meta?.icon ?? icon, breadcrumbTemp)
    }
    else {
-      breadcrumbTemp.push(item.meta.title)
+      breadcrumbTemp.push(item.meta?.title)
      sourceList.value.push({
-        icon: item.meta.icon || icon,
-        title: item.meta.title,
+        icon: item.meta?.icon ?? icon,
+        title: item.meta?.title,
        path: item.path as string,
        breadcrumb: breadcrumbTemp,
      })
@@ -265,11 +290,11 @@ function pageJump(url: string) {
          </el-icon>
          <div class="info">
            <div class="title">
-              {{ item.title }}
+              {{ item.title ?? '[ 无标题 ]' }}
            </div>
            <div class="breadcrumb">
              <span v-for="(bc, bcIndex) in item.breadcrumb" :key="bcIndex">
-                {{ bc }}
+                {{ bc ?? '[ 无标题 ]' }}
                <el-icon>
                  <svg-icon name="ep:arrow-right" />
                </el-icon>
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="SidebarItem">
 // import SidebarItem from './index.vue'
 import { isExternalLink, resolveRoutePath } from '@/utils'
+import useSettingsStore from '@/store/modules/settings'
 import type { Menu } from '@/global'

 const props = defineProps({
@@ -14,10 +15,12 @@ const props = defineProps({
  },
 })

+const settingsStore = useSettingsStore()
+
 const hasChildren = computed(() => {
  let flag = true
  if (props.item.children) {
-    if (props.item.children.every(item => item.meta.sidebar === false)) {
+    if (props.item.children.every(item => item.meta?.sidebar === false)) {
      flag = false
    }
  }
@@ -32,23 +35,23 @@ const hasChildren = computed(() => {
  <div class="sidebar-item">
    <router-link v-if="!hasChildren" v-slot="{ href, navigate, isActive, isExactActive }" custom :to="resolveRoutePath(basePath, item.path || '')">
      <a :href="isExternalLink(resolveRoutePath(basePath, item.path || '')) ? resolveRoutePath(basePath, item.path || '') : href" :class="[isActive && 'router-link-active', isExactActive && 'router-link-exact-active']" :target="isExternalLink(resolveRoutePath(basePath, item.path || '')) ? '_blank' : '_self'" @click="navigate">
-        <el-menu-item :title="item.meta.title" :index="resolveRoutePath(basePath, item.path || '')">
-          <el-icon v-if="item.meta.icon" class="title-icon">
+        <el-menu-item :title="item.meta?.title ?? '[ 无标题 ]'" :index="resolveRoutePath(basePath, item.path || '')">
+          <el-icon v-if="item.meta?.icon" class="title-icon">
            <svg-icon :name="item.meta.icon" />
          </el-icon>
-          <span class="title">{{ item.meta.title }}</span>
+          <span class="title">{{ item.meta?.title ?? '[ 无标题 ]' }}</span>
        </el-menu-item>
      </a>
    </router-link>
-    <el-sub-menu v-else :title="item.meta.title" :index="resolveRoutePath(basePath, item.path || '')">
+    <el-sub-menu v-else :title="item.meta?.title ?? '[ 无标题 ]'" :index="settingsStore.app.routeBaseOn !== 'filesystem' ? resolveRoutePath(basePath, item.path || '') : JSON.stringify(item)">
      <template #title>
-        <el-icon v-if="item.meta.icon" class="title-icon">
+        <el-icon v-if="item.meta?.icon" class="title-icon">
          <svg-icon :name="item.meta.icon" />
        </el-icon>
-        <span class="title">{{ item.meta.title }}</span>
+        <span class="title">{{ item.meta?.title ?? '[ 无标题 ]' }}</span>
      </template>
      <template v-for="route in item.children">
-        <SidebarItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <SidebarItem v-if="route.meta?.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
      </template>
    </el-sub-menu>
  </div>
@@ -30,7 +30,7 @@ function onSidebarScroll(e: Event) {
    >
      <transition-group name="sub-sidebar">
        <template v-for="(route, index) in menuStore.sidebarMenus">
-          <SidebarItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" />
+          <SidebarItem v-if="route.meta?.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" />
        </template>
      </transition-group>
    </el-menu>
@@ -12,11 +12,11 @@ const userStore = useUserStore()
 const mainPage = useMainPage()
 const { isFullscreen, toggle } = useFullscreen()

-function userCommand(command: 'dashboard' | 'setting' | 'hotkeys' | 'logout') {
+function userCommand(command: 'home' | 'setting' | 'hotkeys' | 'logout') {
  switch (command) {
-    case 'dashboard':
+    case 'home':
      router.push({
-        name: 'dashboard',
+        name: 'home',
      })
      break
    case 'setting':
@@ -85,8 +85,8 @@ function pro() {
      </div>
      <template #dropdown>
        <el-dropdown-menu class="user-dropdown">
-          <el-dropdown-item v-if="settingsStore.dashboard.enable" command="dashboard">
-            控制台
+          <el-dropdown-item v-if="settingsStore.home.enable" command="home">
+            {{ settingsStore.home.title }}
          </el-dropdown-item>
          <el-dropdown-item command="setting">
            个人设置
@@ -16,10 +16,10 @@ const enableSubMenuCollapseButton = computed(() => {

 const breadcrumbList = computed(() => {
  const breadcrumbList = []
-  if (settingsStore.dashboard.enable) {
+  if (settingsStore.home.enable) {
    breadcrumbList.push({
-      path: '/dashboard',
-      title: settingsStore.dashboard.title,
+      path: '/',
+      title: settingsStore.home.title,
    })
  }
  if (route.meta.breadcrumbNeste) {
@@ -61,7 +61,7 @@ function pathCompile(path: string) {
      <el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
        <transition-group name="breadcrumb">
          <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
-            {{ item.title }}
+            {{ item.title ?? '[ 无标题 ]' }}
          </el-breadcrumb-item>
        </transition-group>
      </el-breadcrumb>
@@ -3,7 +3,7 @@ import type { Menu } from '@/global'
 const menus: Menu.recordRaw = {
  meta: {
    title: '多级导航',
-    icon: 'heroicons-solid:menu-alt-3',
+    icon: 'sidebar-menu',
  },
  children: [
    {
@@ -30,22 +30,22 @@ router.beforeEach(async (to, from, next) => {
    if (routeStore.isGenerate) {
      // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
      settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
-      // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+      // 如果已登录状态下，进入登录页会强制跳转到主页
      if (to.name === 'login') {
        next({
-          name: 'dashboard',
+          name: 'home',
          replace: true,
        })
      }
-      // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
-      else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+      // 如果未开启主页，但进入的是主页，则会进入侧边栏导航第一个模块
+      else if (!settingsStore.home.enable && to.name === 'home') {
        if (menuStore.sidebarMenus.length > 0) {
          next({
            path: menuStore.sidebarMenusFirstDeepestPath,
            replace: true,
          })
        }
-        // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+        // 如果侧边栏导航第一个模块无法命中，则还是进入主页
        else {
          next()
        }
@@ -104,7 +104,7 @@ router.beforeEach(async (to, from, next) => {
      next({
        name: 'login',
        query: {
-          redirect: to.fullPath,
+          redirect: to.fullPath !== '/' ? to.fullPath : undefined,
        },
      })
    }
@@ -119,7 +119,12 @@ router.afterEach((to, from) => {
  const keepAliveStore = useKeepAliveStore()
  settingsStore.app.enableProgress && (isLoading.value = false)
  // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  if (settingsStore.app.routeBaseOn !== 'filesystem') {
+    settingsStore.setTitle(to.meta.breadcrumbNeste?.at(-1)?.title)
+  }
+  else {
+    settingsStore.setTitle(to.meta.title)
+  }
  // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
  if (to.meta.cache) {
    const componentName = to.matched.at(-1)?.components?.default.name
@@ -1,8 +1,8 @@
-import type { Route } from '@/global'
+import type { RouteRecordRaw } from 'vue-router'

 const Layout = () => import('@/layouts/index.vue')

-const routes: Route.recordRaw = {
+const routes: RouteRecordRaw = {
  path: '/breadcrumb_example',
  component: Layout,
  redirect: '/breadcrumb_example/list1',
@@ -1,8 +1,8 @@
-import type { Route } from '@/global'
+import type { RouteRecordRaw } from 'vue-router'

 const Layout = () => import('@/layouts/index.vue')

-const routes: Route.recordRaw = {
+const routes: RouteRecordRaw = {
  path: '/multilevel_menu_example',
  component: Layout,
  redirect: '/multilevel_menu_example/page',
@@ -1,19 +1,13 @@
 import { setupLayouts } from 'virtual:generated-layouts'
 import generatedRoutes from 'virtual:generated-pages'
+import type { RouteRecordRaw } from 'vue-router'
 import MultilevelMenuExample from './modules/multilevel.menu.example'
 import BreadcrumbExample from './modules/breadcrumb.example'
 import type { Route } from '@/global'
 import useSettingsStore from '@/store/modules/settings'

 // 固定路由（默认路由）
-const constantRoutes: Route.recordRaw[] = [
-  {
-    path: '/',
-    redirect: '/dashboard',
-    meta: {
-      title: '',
-    },
-  },
+const constantRoutes: RouteRecordRaw[] = [
  {
    path: '/login',
    name: 'login',
@@ -33,35 +27,33 @@ const constantRoutes: Route.recordRaw[] = [
 ]

 // 系统路由
-const systemRoutes: Route.recordRaw[] = [
+const systemRoutes: RouteRecordRaw[] = [
  {
-    path: '/dashboard',
+    path: '/',
    component: () => import('@/layouts/index.vue'),
    meta: {
-      title: () => useSettingsStore().dashboard.title,
+      title: () => useSettingsStore().home.title,
      breadcrumb: false,
    },
    children: [
      {
        path: '',
-        name: 'dashboard',
+        name: 'home',
        component: () => import('@/views/index.vue'),
        meta: {
-          title: () => useSettingsStore().dashboard.title,
+          title: () => useSettingsStore().home.title,
+          breadcrumb: false,
+        },
+      },
+      {
+        path: 'reload',
+        name: 'reload',
+        component: () => import('@/views/reload.vue'),
+        meta: {
+          title: '重新加载',
          breadcrumb: false,
        },
      },
-    ],
-  },
-  {
-    path: '/personal',
-    component: () => import('@/layouts/index.vue'),
-    redirect: '/personal/setting',
-    meta: {
-      title: '个人中心',
-      breadcrumb: false,
-    },
-    children: [
      {
        path: 'setting',
        name: 'personalSetting',
@@ -81,25 +73,6 @@ const systemRoutes: Route.recordRaw[] = [
      },
    ],
  },
-  {
-    path: '/reload',
-    component: () => import('@/layouts/index.vue'),
-    meta: {
-      title: '重新加载',
-      breadcrumb: false,
-    },
-    children: [
-      {
-        path: '',
-        name: 'reload',
-        component: () => import('@/views/reload.vue'),
-        meta: {
-          title: '重新加载',
-          breadcrumb: false,
-        },
-      },
-    ],
-  },
 ]

 // 动态路由（异步路由、导航栏路由）
@@ -122,7 +95,7 @@ const constantRoutesByFilesystem = generatedRoutes.filter((item) => {

 const asyncRoutesByFilesystem = setupLayouts(generatedRoutes.filter((item) => {
  return item.meta?.enabled !== false && item.meta?.constant !== true && item.meta?.layout !== false
-})) as Route.recordRaw[]
+}))

 export {
  constantRoutes,
@@ -12,9 +12,9 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
    enableDynamicTitle: false,
    routeBaseOn: 'frontend',
  },
-  dashboard: {
+  home: {
    enable: true,
-    title: '控制台',
+    title: '主页',
  },
  layout: {
    enableMobileAdaptation: false,
@@ -12,13 +12,9 @@ function getDeepestPath(menu: Menu.recordRaw, rootPath = '') {
  let retnPath = ''
  if (menu.path !== undefined) {
    if (menu.children) {
-      if (
-        menu.children.some((item) => {
-          return item.meta.sidebar !== false
-        })
-      ) {
+      if (menu.children.some(item => item.meta?.sidebar !== false)) {
        for (let i = 0; i < menu.children.length; i++) {
-          if (menu.children[i].meta.sidebar !== false) {
+          if (menu.children[i].meta?.sidebar !== false) {
            retnPath = getDeepestPath(menu.children[i], resolveRoutePath(rootPath, menu.path))
            break
          }
@@ -39,9 +35,9 @@ function hasPermission(permissions: string[], menu: Menu.recordMainRaw | Menu.re
  let isAuth = false
  if (menu.meta && menu.meta.auth) {
    isAuth = permissions.some((auth) => {
-      return typeof menu.meta.auth === 'string'
+      return typeof menu.meta?.auth === 'string'
        ? menu.meta.auth === auth
-        : typeof menu.meta.auth === 'object'
+        : typeof menu.meta?.auth === 'object'
          ? menu.meta.auth.includes(auth)
          : false
    })
@@ -72,7 +68,7 @@ function filterAsyncMenus<T extends Menu.recordMainRaw[] | Menu.recordRaw[]>(men
 function getDefaultOpenedPaths(menus: Menu.recordRaw[], rootPath = '') {
  const defaultOpenedPaths: string[] = []
  menus.forEach((item) => {
-    if (item.path && item.meta.defaultOpened && item.children) {
+    if (item.path && item.meta?.defaultOpened && item.children) {
      defaultOpenedPaths.push(resolveRoutePath(rootPath, item.path))
      const childrenDefaultOpenedPaths = getDefaultOpenedPaths(item.children, resolveRoutePath(rootPath, item.path))
      if (childrenDefaultOpenedPaths.length > 0) {
@@ -1,4 +1,5 @@
 import { cloneDeep } from 'lodash-es'
+import type { RouteRecordRaw } from 'vue-router'
 import useSettingsStore from './settings'
 import useUserStore from './user'
 import api from '@/api'
@@ -6,13 +7,13 @@ import { resolveRoutePath } from '@/utils'
 import { systemRoutes } from '@/router/routes'
 import type { Route } from '@/global'

-function hasPermission(permissions: string[], route: Route.recordMainRaw | Route.recordRaw) {
+function hasPermission(permissions: string[], route: Route.recordMainRaw | RouteRecordRaw) {
  let isAuth = false
  if (route.meta?.auth) {
    isAuth = permissions.some((auth) => {
-      return typeof route.meta.auth === 'string'
+      return typeof route.meta?.auth === 'string'
        ? route.meta.auth === auth
-        : typeof route.meta.auth === 'object'
+        : typeof route.meta?.auth === 'object'
          ? route.meta.auth.includes(auth)
          : false
    })
@@ -23,7 +24,7 @@ function hasPermission(permissions: string[], route: Route.recordMainRaw | Route
  return isAuth
 }

-function filterAsyncRoutes<T extends Route.recordMainRaw[] | Route.recordRaw[]>(routes: T, permissions: string[]): T {
+function filterAsyncRoutes<T extends Route.recordMainRaw[] | RouteRecordRaw[]>(routes: T, permissions: string[]): T {
  const res: any = []
  routes.forEach((route) => {
    if (hasPermission(permissions, route)) {
@@ -59,31 +60,34 @@ function formatBackRoutes(routes: any, views = import.meta.glob('../../views/**/
 }

 // 将多层嵌套路由处理成两层，保留顶层和最子层路由，中间层级将被拍平
-function flatAsyncRoutes<T extends Route.recordRaw>(routes: T): T {
+function flatAsyncRoutes<T extends RouteRecordRaw>(routes: T): T {
  if (routes.children) {
    routes.children = flatAsyncRoutesRecursive(routes.children, [{
      path: routes.path,
-      title: routes.meta.title,
-      hide: !routes.meta.breadcrumb && routes.meta.breadcrumb === false,
+      title: routes.meta?.title,
+      hide: !routes.meta?.breadcrumb && routes.meta?.breadcrumb === false,
    }], routes.path)
  }
  return routes
 }
-function flatAsyncRoutesRecursive(routes: Route.recordRaw[], breadcrumb: Route.breadcrumb[] = [], baseUrl = ''): Route.recordRaw[] {
-  const res: Route.recordRaw[] = []
+function flatAsyncRoutesRecursive(routes: RouteRecordRaw[], breadcrumb: Route.breadcrumb[] = [], baseUrl = ''): RouteRecordRaw[] {
+  const res: RouteRecordRaw[] = []
  routes.forEach((route) => {
    if (route.children) {
      const childrenBaseUrl = resolveRoutePath(baseUrl, route.path)
      const tmpBreadcrumb = cloneDeep(breadcrumb)
-      if (route.meta.breadcrumb !== false) {
+      if (route.meta?.breadcrumb !== false) {
        tmpBreadcrumb.push({
          path: childrenBaseUrl,
-          title: route.meta.title,
-          hide: !route.meta.breadcrumb && route.meta.breadcrumb === false,
+          title: route.meta?.title,
+          hide: !route.meta?.breadcrumb,
        })
      }
      const tmpRoute = cloneDeep(route)
      tmpRoute.path = childrenBaseUrl
+      if (!tmpRoute.meta) {
+        tmpRoute.meta = {}
+      }
      tmpRoute.meta.breadcrumbNeste = tmpBreadcrumb
      delete tmpRoute.children
      res.push(tmpRoute)
@@ -109,9 +113,12 @@ function flatAsyncRoutesRecursive(routes: Route.recordRaw[], breadcrumb: Route.b
      const tmpBreadcrumb = cloneDeep(breadcrumb)
      tmpBreadcrumb.push({
        path: tmpRoute.path,
-        title: tmpRoute.meta.title,
-        hide: !tmpRoute.meta.breadcrumb && tmpRoute.meta.breadcrumb === false,
+        title: tmpRoute.meta?.title,
+        hide: !tmpRoute.meta?.breadcrumb && tmpRoute.meta?.breadcrumb === false,
      })
+      if (!tmpRoute.meta) {
+        tmpRoute.meta = {}
+      }
      tmpRoute.meta.breadcrumbNeste = tmpBreadcrumb
      res.push(tmpRoute)
    }
@@ -126,14 +133,14 @@ const useRouteStore = defineStore(
    state: () => ({
      isGenerate: false,
      routes: [] as Route.recordMainRaw[],
-      fileSystemRoutes: [] as Route.recordRaw[],
+      fileSystemRoutes: [] as RouteRecordRaw[],
      currentRemoveRoutes: [] as Function[],
    }),
    getters: {
      // 扁平化路由（将三级及以上路由数据拍平成二级）
      flatRoutes: (state) => {
        const settingsStore = useSettingsStore()
-        const routes: Route.recordRaw[] = []
+        const routes: RouteRecordRaw[] = []
        if (state.routes) {
          if (settingsStore.app.routeBaseOn !== 'filesystem') {
            state.routes.forEach((item) => {
@@ -171,7 +178,7 @@ const useRouteStore = defineStore(
          }
          // 设置 routes 数据
          this.isGenerate = true
-          this.routes = accessedRoutes.filter(item => item.children?.length !== 0)
+          this.routes = accessedRoutes.filter(item => item.children?.length !== 0) as any
          resolve()
        })
      },
@@ -195,13 +202,13 @@ const useRouteStore = defineStore(
            }
            // 设置 routes 数据
            this.isGenerate = true
-            this.routes = accessedRoutes.filter(item => item.children.length !== 0)
+            this.routes = accessedRoutes.filter(item => item.children.length !== 0) as any
            resolve()
          })
        })
      },
      // 根据权限动态生成路由（文件系统生成）
-      generateRoutesAtFilesystem(asyncRoutes: Route.recordRaw[]) {
+      generateRoutesAtFilesystem(asyncRoutes: RouteRecordRaw[]) {
        // eslint-disable-next-line no-async-promise-executor
        return new Promise<void>(async (resolve) => {
          const settingsStore = useSettingsStore()
@@ -217,7 +224,7 @@ const useRouteStore = defineStore(
          }
          // 设置 routes 数据
          this.isGenerate = true
-          this.fileSystemRoutes = accessedRoutes.filter(item => item.children?.length !== 0)
+          this.fileSystemRoutes = accessedRoutes.filter(item => item.children?.length !== 0) as any
          resolve()
        })
      },
@@ -1,3 +1,5 @@
+import { defaultsDeep } from 'lodash-es'
+import type { RouteMeta } from 'vue-router'
 import type { RecursiveRequired, Settings } from '@/global'
 import settings from '@/settings'
 import settingsDefault from '@/settings.default'
@@ -5,20 +7,16 @@ import settingsDefault from '@/settings.default'
 interface SettingsStore extends RecursiveRequired<Settings.all> {
  subMenuCollapseLastStatus: boolean
  mode: 'pc' | 'mobile'
-  title: string
+  title?: RouteMeta['title']
 }

-// 合并配置
-Object.keys(settingsDefault).forEach((key) => {
-  Object.assign(settingsDefault[key as keyof Settings.all], settings[key as keyof Settings.all])
-})
-
 const useSettingsStore = defineStore(
  // 唯一ID
  'settings',
  {
    state: (): SettingsStore => ({
-      ...settingsDefault,
+      // 合并配置
+      ...defaultsDeep(settings, settingsDefault),
      // 侧边栏是否收起（用于记录 pc 模式下最后的状态）
      subMenuCollapseLastStatus: settingsDefault.menu.subMenuCollapse,
      // 显示模式，支持：mobile、pc
@@ -28,7 +26,7 @@ const useSettingsStore = defineStore(
    }),
    actions: {
      // 设置网页标题
-      setTitle(title: string) {
+      setTitle(title: SettingsStore['title']) {
        this.title = title
      },
      // 设置访问模式
@@ -60,7 +58,9 @@ const useSettingsStore = defineStore(
      },
      // 更新应用配置
      updateSettings(data: Settings.all) {
-        Object.assign(this, data)
+        Object.keys(data).forEach((key) => {
+          this[key as keyof Settings.all] = defaultsDeep(data[key as keyof Settings.all], this[key as keyof Settings.all])
+        })
      },
    },
  },
@@ -1,6 +1,6 @@
 import type { ComponentInternalInstance } from 'vue'

-export default function useCurrentInstance() {
+export default function useGlobalProperties() {
  const { appContext } = getCurrentInstance() as ComponentInternalInstance
  return appContext.config.globalProperties
 }
@@ -7,11 +7,10 @@ meta:
 </route>

 <script lang="ts" setup>
-import { onBeforeRouteLeave } from 'vue-router'
 const router = useRouter()

 const data = ref({
-  inter: null as NodeJS.Timer | null,
+  inter: NaN,
  countdown: 5,
 })

@@ -1,7 +1,7 @@
 <route lang="yaml">
-name: dashboard
+name: home
 meta:
-  title: 控制台
+  title: 主页
 </route>

 <script lang="ts" setup>
@@ -60,7 +60,7 @@ const oneStepAdminInfo = ref({
          <div>注：在作者就职的公司，本框架已在电商、直播、OA、ERP等多个不同领域的中后台系统中应用并稳定运行</div>
        </div>
      </template>
-      <el-button-group style="margin-right: 10px;">
+      <el-button-group>
        <el-button type="success" size="large" plain @click="open('https://hooray.gitee.io/fantastic-admin/')">
          开发文档
        </el-button>
@@ -7,6 +7,7 @@ meta:

 <script lang="ts" setup name="Login">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'

 const route = useRoute()
@@ -6,6 +6,7 @@ meta:

 <script lang="ts" setup name="PersonalEditPassword">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'

 const route = useRoute()
@@ -7,6 +7,7 @@ meta:

 <script lang="ts" setup name="PersonalSetting">
 import type { UploadProps } from 'element-plus'
+import { ElMessage } from 'element-plus'

 const router = useRouter()

@@ -11,8 +11,7 @@ export default ({ mode, command }) => {
  // 全局 scss 资源
  const scssResources = []
  fs.readdirSync('src/assets/styles/resources').forEach((dirname) => {
-    if (fs.statSync(`src/assets/styles/resources/${dirname}`).isFile())
-      scssResources.push(`@use "src/assets/styles/resources/${dirname}" as *;`)
+    if (fs.statSync(`src/assets/styles/resources/${dirname}`).isFile()) { scssResources.push(`@use "src/assets/styles/resources/${dirname}" as *;`) }
  })
  // css 精灵图相关
  fs.readdirSync('src/assets/sprites').forEach((dirname) => {
@@ -50,16 +49,6 @@ export default ({ mode, command }) => {
        lastBuildTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
      }),
    },
-    optimizeDeps: {
-      include: [
-        'element-plus',
-        'element-plus/es',
-        'element-plus/es/components/message/style/css',
-        'element-plus/es/components/notification/style/css',
-        'element-plus/es/components/message-box/style/css',
-        'element-plus/es/components/loading/style/css',
-      ],
-    },
    plugins: createVitePlugins(env, command === 'build'),
    resolve: {
      alias: {
@@ -1,5 +1,4 @@
 import autoImport from 'unplugin-auto-import/vite'
-import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'

 export default function createAutoImport() {
  return autoImport({
@@ -12,8 +11,5 @@ export default function createAutoImport() {
    dirs: [
      './src/utils/composables/**',
    ],
-    resolvers: [
-      ElementPlusResolver(),
-    ],
  })
 }
@@ -1,20 +1,22 @@
 import { createHtmlPlugin } from 'vite-plugin-html'

-const copyright_common_style = 'font-size: 14px; margin-bottom: 2px; padding: 6px 8px; color: #fff;'
-const copyright_main_style = `${copyright_common_style} background: #e24329;`
-const copyright_sub_style = `${copyright_common_style} background: #707070;`
-
 export default function createHtml(env, isBuild) {
  const { VITE_APP_TITLE, VITE_APP_DEBUG_TOOL } = env
-  const copyrightScript = `
+  let copyrightScript = ''
+  if (isBuild) {
+    const copyright_common_style = 'font-size: 14px; margin-bottom: 2px; padding: 6px 8px; color: #fff;'
+    const copyright_main_style = `${copyright_common_style} background: #e24329;`
+    const copyright_sub_style = `${copyright_common_style} background: #707070;`
+    copyrightScript += `
 <script>
 if ((navigator.language || navigator.browserLanguage).toLowerCase() === 'zh-cn') {
-  console.info('%c由%cFantastic-admin%c提供技术支持', '${copyright_sub_style}', '${copyright_main_style}', '${copyright_sub_style}', '\\nhttps://gitee.com/hooray/fantastic-admin');
+  console.info('%c由%cFantastic-admin%c驱动', '${copyright_sub_style}', '${copyright_main_style}', '${copyright_sub_style}', '\\nhttps://gitee.com/hooray/fantastic-admin');
 } else {
  console.info('%cPowered by%cFantastic-admin', '${copyright_sub_style}', '${copyright_main_style}', '\\nhttps://github.com/hooray/fantastic-admin');
 }
 </script>
-  `
+    `
+  }
  let devtoolScript = ''
  switch (VITE_APP_DEBUG_TOOL) {
    case 'eruda':
@@ -54,7 +56,7 @@ if ((navigator.language || navigator.browserLanguage).toLowerCase() === 'zh-cn')
 })()
 </script>
  `
-  const html = createHtmlPlugin({
+  return createHtmlPlugin({
    inject: {
      data: {
        title: VITE_APP_TITLE,
@@ -65,5 +67,4 @@ if ((navigator.language || navigator.browserLanguage).toLowerCase() === 'zh-cn')
    },
    minify: isBuild,
  })
-  return html
 }
@@ -2,7 +2,6 @@ import type { PluginOption } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import vueJsx from '@vitejs/plugin-vue-jsx'

-import createRestart from './restart'
 import createHtml from './html'
 import createAutoImport from './auto-import'
 import createComponents from './components'
@@ -22,7 +21,6 @@ export default function createVitePlugins(viteEnv, isBuild = false) {
    }),
    vueJsx(),
  ]
-  !isBuild && vitePlugins.push(createRestart())
  vitePlugins.push(createHtml(viteEnv, isBuild))
  vitePlugins.push(createAutoImport())
  vitePlugins.push(createComponents())
@@ -1,14 +0,0 @@
-import fs from 'node:fs'
-import ViteRestart from 'vite-plugin-restart'
-
-export default function createRestart() {
-  const pluginsFile: string[] = []
-  fs.readdirSync('vite/plugins').forEach((dirname) => {
-    if (fs.statSync(`vite/plugins/${dirname}`).isFile()) {
-      pluginsFile.push(`vite/plugins/${dirname}`)
-    }
-  })
-  return ViteRestart({
-    restart: pluginsFile,
-  })
-}
Author	SHA1	Message	Date
hooray	ffb3c85b83	chore: release v2.3.0	2022-11-28 00:35:20 +08:00
hooray	ca1ea48dc6	refactor: 修改 Menu.recordRaw 和 Menu.recordMainRaw 类型里的 meta 为可选参数	2022-11-27 23:40:16 +08:00
hooray	5c6494931b	fix: 修复标题显示异常	2022-11-27 23:37:03 +08:00
hooray	e24431c38a	refactor!: 移除自定义 Route.recordRaw 类型，改用 RouteRecordRaw 类型	2022-11-27 17:50:31 +08:00
hooray	f85a911b8e	fix: 修复文件系统路由模式下，全局搜索列表 icon 显示不全	2022-11-27 04:09:30 +08:00
hooray	776fe7a944	feat: 路由`meta.title`修改为非必须	2022-11-27 03:52:22 +08:00
hooray	ce099b3bea	chore: release v2.2.0	2022-11-26 15:37:52 +08:00
hooray	eff431a09d	chore: 更新依赖	2022-11-26 09:42:50 +08:00
hooray	501a8955c3	chore: 更新依赖	2022-11-19 21:37:54 +08:00
hooray	f0a523f505	fix: 修复文件系统路由下，次导航无法按层级依次展开	2022-11-19 09:11:03 +08:00
hooray	b2e33ca05f	refactor!: 控制台修改为主页，路由调整为根路由从原有 /dashboard 路由调整为 / 根路由	2022-11-19 09:10:30 +08:00
hooray	a401b1f5bf	refactor: 优化 PageHeader 组件在移动端下的展示	2022-11-13 00:51:02 +08:00
hooray	07a13b004e	chore: release v2.1.3	2022-11-11 10:09:02 +08:00
hooray	defd87869e	ci: 优化 release 产物	2022-11-11 10:06:45 +08:00
hooray	051e6a99e1	chore: release v2.1.1	2022-11-10 19:54:08 +08:00
hooray	5f3855cc82	chore: 更新依赖	2022-11-10 19:49:23 +08:00
hooray	6489e8b94a	ci: 优化 release 发布工作流	2022-11-10 19:30:30 +08:00
hooray	98ca00326a	chore: husky 替换为 simple-git-hooks	2022-11-09 16:05:52 +08:00
hooray	fc033c8693	chore: 更新依赖	2022-11-08 00:38:40 +08:00
hooray	57b18c2710	feat: logo 支持非正方形图片	2022-11-04 17:24:16 +08:00
hooray	d667088c89	chore: release v2.1.0	2022-10-30 04:14:59 +08:00
hooray	41b3cd7a8e	chore: 更新依赖	2022-10-29 18:46:32 +08:00
hooray	8e9a1e5683	chore: 更新依赖	2022-10-25 08:33:13 +08:00
hooray	05939a99ee	chore: 调整 copyright 信息和展示逻辑	2022-10-25 08:27:07 +08:00
hooray	84e1581dcf	chore: 移除 vite-plugin-restart	2022-10-25 08:25:12 +08:00
hooray	4a2538cfe3	refactor: 优化配置项合并	2022-10-25 08:23:20 +08:00
hooray	c091c685e8	refactor!: useCurrentInstance() 重命名为 useGlobalProperties()	2022-10-23 14:25:18 +08:00
hooray	613972f4a1	refactor: 将 element plus 反馈组件改为手动引入	2022-10-23 14:18:17 +08:00
hooray	d860fe74c3	chore: 给 eslint 和 stylelint 命令增加 --cache 设置	2022-10-23 14:04:53 +08:00
hooray	ffa8943267	chore: 重建 pnpm-lock.yaml 文件	2022-10-23 14:03:08 +08:00
hooray	babd6c9c2a	chore: 更新依赖	2022-10-23 13:59:59 +08:00
hooray	7250872ac0	chore: 增加 vscode 推荐扩展	2022-10-22 00:50:57 +08:00
hooray	7f42710a55	ci: 增加 vue-tsc 校验脚本	2022-10-21 03:59:06 +08:00
hooray	fe6d81c08d	fix: 修复类型报错	2022-10-16 07:11:04 +08:00
hooray	1842f10172	ci: 调整 commit 配置	2022-10-16 07:10:12 +08:00
hooray	5bbde8d102	refactor: 优化拦截器	2022-10-16 06:48:53 +08:00
hooray	8771b33834	chore: 更新依赖	2022-10-16 06:00:43 +08:00
hooray	842519768e	chore: 更新 tinymce 主题样式和汉化文件	2022-10-16 05:59:19 +08:00