es

.eslintrc.js

@@ -45,23 +45,7 @@ module.exports = {
         ],
         'no-eval': 2,
         semi: 1,
-<<<<<<< HEAD
-<<<<<<< HEAD
         indent: off,
-=======
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
-        indent: [
-            2,
-            4,
-            {
-                SwitchCase: 1,
-            },
-        ],
-<<<<<<< HEAD
->>>>>>> e94f5f44564039f665611f42b365b51740d0649c
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
         camelcase: 2,
         'vue/no-empty-component-block': 2, // 禁止<template> <script> <style>块为空
         'vue/html-self-closing': 0,

package.json

@@ -15,48 +15,48 @@
         "@vueup/vue-quill": "1.1.0",
         "@vueuse/core": "9.5.0",
         "@wangeditor/editor-for-vue": "^5.1.12",
-        "@zeronejs/utils": "^1.4.0",
+        "@zeronejs/utils": "^1.4.2",
         "axios": "0.27.2",
         "crypto-js": "^4.2.0",
-        "dayjs": "^1.11.11",
+        "dayjs": "^1.11.18",
         "echarts": "5.4.0",
-        "element-china-area-data": "^6.0.2",
+        "element-china-area-data": "^6.1.0",
         "element-plus": "2.2.27",
         "file-saver": "2.0.5",
         "fuse.js": "6.6.2",
-        "jodit": "^4.0.18",
+        "jodit": "^4.6.2",
         "js-cookie": "3.0.1",
         "jsencrypt": "3.3.1",
         "lodash": "^4.17.21",
         "nprogress": "0.2.0",
         "pinia": "2.0.22",
-        "terser": "^5.30.0",
-        "tinymce": "^6.8.3",
+        "terser": "^5.43.1",
+        "tinymce": "^6.8.6",
         "vue": "3.2.45",
         "vue-cropper": "1.0.3",
         "vue-router": "4.1.4"
     },
     "devDependencies": {
         "@types/crypto-js": "^4.2.2",
-        "@types/file-saver": "^2.0.5",
-        "@types/js-cookie": "^3.0.2",
-        "@types/node": "^18.7.15",
-        "@types/nprogress": "^0.2.0",
-        "@typescript-eslint/eslint-plugin": "^5.36.2",
-        "@typescript-eslint/parser": "^5.36.2",
+        "@types/file-saver": "^2.0.7",
+        "@types/js-cookie": "^3.0.6",
+        "@types/node": "^18.19.123",
+        "@types/nprogress": "^0.2.3",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
         "@vitejs/plugin-vue": "3.1.0",
-        "autoprefixer": "^10.4.8",
-        "eslint": "^8.23.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-vue": "^9.4.0",
-        "postcss": "^8.4.16",
+        "autoprefixer": "^10.4.21",
+        "eslint": "^8.57.1",
+        "eslint-config-prettier": "^8.10.2",
+        "eslint-plugin-vue": "^9.33.0",
+        "postcss": "^8.5.6",
         "sass": "1.56.1",
-        "tailwindcss": "^3.1.8",
-        "ts-node": "^10.9.1",
-        "tsconfig-paths": "^4.1.0",
-        "typescript": "^4.8.2",
+        "tailwindcss": "^3.4.17",
+        "ts-node": "^10.9.2",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^4.9.5",
         "unplugin-auto-import": "0.11.4",
-        "unplugin-vue-components": "^0.22.4",
+        "unplugin-vue-components": "^0.22.12",
         "vite": "3.2.3",
         "vite-plugin-compression": "^0.5.1",
         "vite-plugin-svg-icons": "2.0.1",