修改冲突

node_modules/.package-lock.json

@@ -906,6 +906,17 @@
         }
       }
     },
+    "node_modules/@tinymce/tinymce-vue": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/-/tinymce-vue-5.1.1.tgz",
+      "integrity": "sha512-iO57HOWesFOhsaqjA5Ea6sDvQBmJJH3/dq00Uvg7metlct2kLF+ctRgoDsetLt6gmeZ7COPftr814/XzqnJ/dg==",
+      "dependencies": {
+        "tinymce": "^6.0.0 || ^5.5.1"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
     "node_modules/@transloadit/prettier-bytes": {
       "version": "0.0.7",
       "resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
@@ -9246,9 +9257,9 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
     "node_modules/tinymce": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-6.7.2.tgz",
-      "integrity": "sha512-6h/02jHmXyghekFzmzccZxUUEFtlPEKHxOd+gd49bjno3ybavZInPIaDd/pp2GeEwsFm20oGgJCL7UiebXm9dw=="
+      "version": "6.8.2",
+      "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-6.8.2.tgz",
+      "integrity": "sha512-Lho79o2Y1Yn+XdlTEkHTEkEmzwYWTXz7IUsvPwxJF3VTtgHUIAAuBab29kik+f2KED3rZvQavr9D7sHVMJ9x4A=="
     },
     "node_modules/tmp": {
       "version": "0.0.33",

package-lock.json

@@ -10,6 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
+        "@tinymce/tinymce-vue": "^5.1.1",
         "@vitejs/plugin-vue": "^4.2.3",
         "@vueuse/core": "^10.1.2",
         "@wangeditor/editor": "^5.1.23",
@@ -29,7 +30,7 @@
         "path-to-regexp": "^6.2.0",
         "pinia": "^2.1.6",
         "screenfull": "^6.0.0",
-        "tinymce": "^6.7.0",
+        "tinymce": "^6.8.1",
         "ts-md5": "^1.3.1",
         "uuid": "^9.0.1",
         "vue": "^3.3.1",
@@ -1299,6 +1300,17 @@
         }
       }
     },
+    "node_modules/@tinymce/tinymce-vue": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/-/tinymce-vue-5.1.1.tgz",
+      "integrity": "sha512-iO57HOWesFOhsaqjA5Ea6sDvQBmJJH3/dq00Uvg7metlct2kLF+ctRgoDsetLt6gmeZ7COPftr814/XzqnJ/dg==",
+      "dependencies": {
+        "tinymce": "^6.0.0 || ^5.5.1"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
     "node_modules/@transloadit/prettier-bytes": {
       "version": "0.0.7",
       "resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
@@ -9652,9 +9664,9 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
     "node_modules/tinymce": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-6.7.2.tgz",
-      "integrity": "sha512-6h/02jHmXyghekFzmzccZxUUEFtlPEKHxOd+gd49bjno3ybavZInPIaDd/pp2GeEwsFm20oGgJCL7UiebXm9dw=="
+      "version": "6.8.2",
+      "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-6.8.2.tgz",
+      "integrity": "sha512-Lho79o2Y1Yn+XdlTEkHTEkEmzwYWTXz7IUsvPwxJF3VTtgHUIAAuBab29kik+f2KED3rZvQavr9D7sHVMJ9x4A=="
     },
     "node_modules/tmp": {
       "version": "0.0.33",

src/router/index.ts

@@ -21,14 +21,13 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import("@/views/login/index.vue"),
     meta: { hidden: true },
   },
-<<<<<<< HEAD
-=======
+
 	{
     path: "/login/silentlogin",
     component: () => import("@/views/login/silentlogin.vue"),
     meta: { hidden: true },
   },
->>>>>>> v4
+
   {
     path: "/",
     component: Layout,