diff --git a/.env.production b/.env.production
index d4bf382..b0a7302 100644
--- a/.env.production
+++ b/.env.production
@@ -23,12 +23,12 @@ VITE_BASE_API_RETRY=5
VITE_BASE_API_RETRY_DELAY=3000
# 是否在打包时使用cdn替换本地库 替换 true 不替换 false
-VITE_CDN=false
+VITE_CDN=true
# 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件）
# 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
# 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
-VITE_COMPRESSION="gzip"
+VITE_COMPRESSION="none"
# 开发环境读取配置文件路径
VITE_PUBLIC_PATH=/
diff --git a/build/buildEnv.ts b/build/buildEnv.ts
index 7e68d7a..074a3c2 100644
--- a/build/buildEnv.ts
+++ b/build/buildEnv.ts
@@ -30,6 +30,7 @@ export const buildEnvironment = () => {
// 规定触发警告的 chunk 大小, 当某个代码分块的大小超过该限制时，Vite 会发出警告
chunkSizeWarningLimit: 2000,
rollupOptions: {
+ external: [],
input: {
index: pathResolve('../index.html', import.meta.url),
},
@@ -41,7 +42,7 @@ export const buildEnvironment = () => {
manualChunks: id => {
// 如果是包含在包中则打包成 vendor
if (id.includes('node_modules')) {
- return 'vendor';
+ return `vendor`;
}
},
},
diff --git a/build/cdn.ts b/build/cdn.ts
index 0ed697b..49ca6e4 100644
--- a/build/cdn.ts
+++ b/build/cdn.ts
@@ -7,54 +7,55 @@ import { Plugin as importToCDN } from 'vite-plugin-cdn-import';
*/
export const cdn = importToCDN({
//（prodUrl解释： name: 对应下面modules的name，version: 自动读取本地package.json中dependencies依赖中对应包的版本号，path: 对应下面modules的path，当然也可写完整路径，会替换prodUrl）
- prodUrl: 'https://cdn.bootcdn.net/ajax/libs/{name}/{version}/{path}',
+ // prodUrl: 'https://cdn.bootcdn.net/ajax/libs/{name}/{version}/{path}',
+ prodUrl: 'https://unpkg.com/{name}@{version}/{path}',
modules: [
{
name: 'vue',
var: 'Vue',
- path: 'vue.global.prod.min.js',
+ path: 'dist/vue.global.prod.js',
},
{
name: 'vue-router',
var: 'VueRouter',
- path: 'vue-router.global.min.js',
+ path: 'dist/vue-router.global.js',
},
{
name: 'vue-i18n',
var: 'VueI18n',
- path: 'vue-i18n.runtime.global.prod.min.js',
+ path: 'dist/vue-i18n.global.prod.js',
},
// 项目中没有直接安装vue-demi，但是pinia用到了，所以需要在引入pinia前引入vue-demi（https://github.com/vuejs/pinia/blob/v2/packages/pinia/package.json#L77）
{
name: 'vue-demi',
var: 'VueDemi',
- path: 'index.iife.min.js',
+ path: 'lib/index.iife.js',
},
{
name: 'pinia',
var: 'Pinia',
- path: 'pinia.iife.min.js',
+ path: 'dist/pinia.iife.js',
},
{
name: 'element-plus',
var: 'ElementPlus',
- path: 'index.full.min.js',
- css: 'index.min.css',
+ path: 'dist/index.full.js',
+ css: 'dist/index.css',
},
{
name: 'axios',
var: 'axios',
- path: 'axios.min.js',
+ path: 'dist/axios.min.js',
},
{
name: 'dayjs',
var: 'dayjs',
path: 'dayjs.min.js',
},
- // {
- // name: "echarts",
- // var: "echarts",
- // path: "echarts.min.js"
- // }
+ {
+ name: 'echarts',
+ var: 'echarts',
+ path: 'dist/echarts.min.js',
+ },
],
});
diff --git a/build/server.ts b/build/server.ts
index 7da899e..016dc2a 100644
--- a/build/server.ts
+++ b/build/server.ts
@@ -15,6 +15,11 @@ export const serverOptions = (mode: string) => {
changeOrigin: true,
rewrite: (path: string) => path.replace(/^\/api/, '/admin'),
},
+ '/admin': {
+ target: VITE_APP_URL,
+ changeOrigin: true,
+ rewrite: (path: string) => path.replace(/^\/admin/, '/admin'),
+ },
'/mock': {
target: VITE_APP_URL,
changeOrigin: true,
diff --git a/index.html b/index.html
index ba16e8b..c6f9a51 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,8 @@
bunny-admin
+
+
diff --git a/package.json b/package.json
index fc51960..6f99234 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
"@vue-flow/core": "^1.33.6",
"@vueuse/core": "^10.9.0",
"@vueuse/motion": "^2.1.0",
- "@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
@@ -74,7 +73,7 @@
"js-cookie": "^3.0.5",
"jsbarcode": "^3.11.6",
"localforage": "^1.10.0",
- "md-editor-v3": "^4.21.1",
+ "md-editor-v3": "^4.21.2",
"mint-filter": "^4.0.3",
"mitt": "^3.0.1",
"mqtt": "4.3.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a0b8856..ee45afc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,9 +35,6 @@ importers:
'@vueuse/motion':
specifier: ^2.1.0
version: 2.2.3(rollup@4.21.1)(vue@3.4.38(typescript@5.5.4))
- '@wangeditor/editor':
- specifier: ^5.1.23
- version: 5.1.23
'@wangeditor/editor-for-vue':
specifier: ^5.1.12
version: 5.1.12(@wangeditor/editor@5.1.23)(vue@3.4.38(typescript@5.5.4))
@@ -84,8 +81,8 @@ importers:
specifier: ^1.10.0
version: 1.10.0
md-editor-v3:
- specifier: ^4.21.1
- version: 4.21.1(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(vue@3.4.38(typescript@5.5.4))
+ specifier: ^4.21.2
+ version: 4.21.2(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(vue@3.4.38(typescript@5.5.4))
mint-filter:
specifier: ^4.0.3
version: 4.0.3
@@ -551,8 +548,8 @@ packages:
resolution: {integrity: sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==}
engines: {node: '>=6.9.0'}
- '@codemirror/autocomplete@6.18.1':
- resolution: {integrity: sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==}
+ '@codemirror/autocomplete@6.18.2':
+ resolution: {integrity: sha512-wJGylKtMFR/Ds6Gh01+OovXE/pncPiKZNNBKuC39pKnH+XK5d9+WsNqcrdxPjFPFTigRBqse0rfxw9UxrfyhPg==}
peerDependencies:
'@codemirror/language': ^6.0.0
'@codemirror/state': ^6.0.0
@@ -634,8 +631,8 @@ packages:
'@codemirror/lint@6.8.2':
resolution: {integrity: sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==}
- '@codemirror/search@6.5.6':
- resolution: {integrity: sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==}
+ '@codemirror/search@6.5.7':
+ resolution: {integrity: sha512-6+iLsXvITWKHYlkgHPCs/qiX4dNzn8N78YfhOFvPtPYCkuXqZq10rAfsUMhOq7O/1VjJqdXRflyExlfVcu/9VQ==}
'@codemirror/state@6.4.1':
resolution: {integrity: sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==}
@@ -1117,8 +1114,8 @@ packages:
'@lezer/lr@1.4.2':
resolution: {integrity: sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==}
- '@lezer/markdown@1.3.1':
- resolution: {integrity: sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==}
+ '@lezer/markdown@1.3.2':
+ resolution: {integrity: sha512-Wu7B6VnrKTbBEohqa63h5vxXjiC4pO5ZQJ/TDbhJxPQaaIoRD/6UVDhSDtVsCwVZV12vvN9KxuLL3ATMnlG0oQ==}
'@lezer/php@1.0.2':
resolution: {integrity: sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==}
@@ -3449,8 +3446,8 @@ packages:
mathml-tag-names@2.1.3:
resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
- md-editor-v3@4.21.1:
- resolution: {integrity: sha512-887rjL0jJBdu8yA7jHU472gEaLlJ4kH8POzG/qYRLtIN72RuAOuKTiDfJVdnrSqMgpIrXYgVgVt36luQpo/zMA==}
+ md-editor-v3@4.21.2:
+ resolution: {integrity: sha512-msC30hd5fEX1XXu/VofmG3uI2db+Xydr4kN2tFNO+9awg5GStwKU9E9MlojewR8Wm6eaUQiCVvxbySAyO0HCHg==}
peerDependencies:
vue: ^3.2.47
@@ -5614,7 +5611,7 @@ snapshots:
'@babel/helper-validator-identifier': 7.24.7
to-fast-properties: 2.0.0
- '@codemirror/autocomplete@6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)':
+ '@codemirror/autocomplete@6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)':
dependencies:
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
@@ -5644,7 +5641,7 @@ snapshots:
'@codemirror/lang-css@6.3.0(@codemirror/view@6.34.1)':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@lezer/common': 1.2.3
@@ -5654,7 +5651,7 @@ snapshots:
'@codemirror/lang-go@6.0.1(@codemirror/view@6.34.1)':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@lezer/common': 1.2.3
@@ -5664,7 +5661,7 @@ snapshots:
'@codemirror/lang-html@6.4.9':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/lang-css': 6.3.0(@codemirror/view@6.34.1)
'@codemirror/lang-javascript': 6.2.2
'@codemirror/language': 6.10.3
@@ -5681,7 +5678,7 @@ snapshots:
'@codemirror/lang-javascript@6.2.2':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/lint': 6.8.2
'@codemirror/state': 6.4.1
@@ -5706,7 +5703,7 @@ snapshots:
'@codemirror/lang-liquid@6.2.1':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/lang-html': 6.4.9
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
@@ -5717,13 +5714,13 @@ snapshots:
'@codemirror/lang-markdown@6.3.0':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/lang-html': 6.4.9
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@codemirror/view': 6.34.1
'@lezer/common': 1.2.3
- '@lezer/markdown': 1.3.1
+ '@lezer/markdown': 1.3.2
'@codemirror/lang-php@6.0.1':
dependencies:
@@ -5735,7 +5732,7 @@ snapshots:
'@codemirror/lang-python@6.1.6(@codemirror/view@6.34.1)':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@lezer/common': 1.2.3
@@ -5760,7 +5757,7 @@ snapshots:
'@codemirror/lang-sql@6.8.0(@codemirror/view@6.34.1)':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@lezer/common': 1.2.3
@@ -5787,7 +5784,7 @@ snapshots:
'@codemirror/lang-xml@6.1.0':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@codemirror/view': 6.34.1
@@ -5796,7 +5793,7 @@ snapshots:
'@codemirror/lang-yaml@6.1.1(@codemirror/view@6.34.1)':
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/language': 6.10.3
'@codemirror/state': 6.4.1
'@lezer/common': 1.2.3
@@ -5851,7 +5848,7 @@ snapshots:
'@codemirror/view': 6.34.1
crelt: 1.0.6
- '@codemirror/search@6.5.6':
+ '@codemirror/search@6.5.7':
dependencies:
'@codemirror/state': 6.4.1
'@codemirror/view': 6.34.1
@@ -6387,7 +6384,7 @@ snapshots:
dependencies:
'@lezer/common': 1.2.3
- '@lezer/markdown@1.3.1':
+ '@lezer/markdown@1.3.2':
dependencies:
'@lezer/common': 1.2.3
'@lezer/highlight': 1.2.1
@@ -7426,11 +7423,11 @@ snapshots:
codemirror@6.0.1(@lezer/common@1.2.3):
dependencies:
- '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
+ '@codemirror/autocomplete': 6.18.2(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)
'@codemirror/commands': 6.7.1
'@codemirror/language': 6.10.3
'@codemirror/lint': 6.8.2
- '@codemirror/search': 6.5.6
+ '@codemirror/search': 6.5.7
'@codemirror/state': 6.4.1
'@codemirror/view': 6.34.1
transitivePeerDependencies:
@@ -9018,7 +9015,7 @@ snapshots:
mathml-tag-names@2.1.3: {}
- md-editor-v3@4.21.1(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(vue@3.4.38(typescript@5.5.4)):
+ md-editor-v3@4.21.2(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(vue@3.4.38(typescript@5.5.4)):
dependencies:
'@codemirror/lang-markdown': 6.3.0
'@codemirror/language-data': 6.5.1(@codemirror/view@6.34.1)
diff --git a/src/assets/images/tip/loading.gif b/src/assets/images/loading.gif
similarity index 100%
rename from src/assets/images/tip/loading.gif
rename to src/assets/images/loading.gif
diff --git a/src/assets/images/tip/403.png b/src/assets/images/tip/403.png
deleted file mode 100644
index 2a93b82..0000000
Binary files a/src/assets/images/tip/403.png and /dev/null differ
diff --git a/src/assets/images/tip/404.png b/src/assets/images/tip/404.png
deleted file mode 100644
index 3b6c493..0000000
Binary files a/src/assets/images/tip/404.png and /dev/null differ
diff --git a/src/assets/images/tip/500.png b/src/assets/images/tip/500.png
deleted file mode 100644
index bf1a896..0000000
Binary files a/src/assets/images/tip/500.png and /dev/null differ
diff --git a/src/assets/images/tip/503.png b/src/assets/images/tip/503.png
deleted file mode 100644
index e45330c..0000000
Binary files a/src/assets/images/tip/503.png and /dev/null differ
diff --git a/src/assets/images/tip/image-loading-error1.png b/src/assets/images/tip/image-loading-error1.png
deleted file mode 100644
index 0cb5de5..0000000
Binary files a/src/assets/images/tip/image-loading-error1.png and /dev/null differ
diff --git a/src/assets/images/tip/image-loading-error2.png b/src/assets/images/tip/image-loading-error2.png
deleted file mode 100644
index 42759bc..0000000
Binary files a/src/assets/images/tip/image-loading-error2.png and /dev/null differ
diff --git a/src/assets/images/tip/image-loading.png b/src/assets/images/tip/image-loading.png
deleted file mode 100644
index 86ca46b..0000000
Binary files a/src/assets/images/tip/image-loading.png and /dev/null differ
diff --git a/src/assets/images/tip/login-first.png b/src/assets/images/tip/login-first.png
deleted file mode 100644
index 786ef0f..0000000
Binary files a/src/assets/images/tip/login-first.png and /dev/null differ
diff --git a/src/assets/images/tip/推送失败.png b/src/assets/images/tip/推送失败.png
deleted file mode 100644
index 6baaa22..0000000
Binary files a/src/assets/images/tip/推送失败.png and /dev/null differ
diff --git a/src/assets/images/tip/推送成功.png b/src/assets/images/tip/推送成功.png
deleted file mode 100644
index aac7d1f..0000000
Binary files a/src/assets/images/tip/推送成功.png and /dev/null differ
diff --git a/src/assets/images/tip/搜索不到信息.png b/src/assets/images/tip/搜索不到信息.png
deleted file mode 100644
index 85d3555..0000000
Binary files a/src/assets/images/tip/搜索不到信息.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无任务.png b/src/assets/images/tip/暂无任务.png
deleted file mode 100644
index b7121b9..0000000
Binary files a/src/assets/images/tip/暂无任务.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无信号.png b/src/assets/images/tip/暂无信号.png
deleted file mode 100644
index 5a513d6..0000000
Binary files a/src/assets/images/tip/暂无信号.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无充值记录.png b/src/assets/images/tip/暂无充值记录.png
deleted file mode 100644
index e3241cf..0000000
Binary files a/src/assets/images/tip/暂无充值记录.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无内容.png b/src/assets/images/tip/暂无内容.png
deleted file mode 100644
index f5e7522..0000000
Binary files a/src/assets/images/tip/暂无内容.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无搜索结果.png b/src/assets/images/tip/暂无搜索结果.png
deleted file mode 100644
index a334f1d..0000000
Binary files a/src/assets/images/tip/暂无搜索结果.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无消息.png b/src/assets/images/tip/暂无消息.png
deleted file mode 100644
index 96707a3..0000000
Binary files a/src/assets/images/tip/暂无消息.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无详情页.png b/src/assets/images/tip/暂无详情页.png
deleted file mode 100644
index a07f160..0000000
Binary files a/src/assets/images/tip/暂无详情页.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无邀请.png b/src/assets/images/tip/暂无邀请.png
deleted file mode 100644
index cb6c697..0000000
Binary files a/src/assets/images/tip/暂无邀请.png and /dev/null differ
diff --git a/src/assets/images/tip/暂无阅读.png b/src/assets/images/tip/暂无阅读.png
deleted file mode 100644
index 3a0ecbc..0000000
Binary files a/src/assets/images/tip/暂无阅读.png and /dev/null differ
diff --git a/src/assets/images/tip/正在建设中.png b/src/assets/images/tip/正在建设中.png
deleted file mode 100644
index 0166f1d..0000000
Binary files a/src/assets/images/tip/正在建设中.png and /dev/null differ
diff --git a/src/components/Editor/MarkdownPreview.vue b/src/components/Editor/MarkdownPreview.vue
deleted file mode 100644
index 95e930b..0000000
--- a/src/components/Editor/MarkdownPreview.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
diff --git a/src/components/Upload/ImageLoading.vue b/src/components/Upload/ImageLoading.vue
new file mode 100644
index 0000000..a4cae67
--- /dev/null
+++ b/src/components/Upload/ImageLoading.vue
@@ -0,0 +1,3 @@
+
+ 
+
diff --git a/src/components/Upload/UploadDialogImage.vue b/src/components/Upload/UploadDialogImage.vue
index 8faaf47..9cc96d0 100644
--- a/src/components/Upload/UploadDialogImage.vue
+++ b/src/components/Upload/UploadDialogImage.vue
@@ -2,7 +2,7 @@
- 
+
@@ -18,6 +18,7 @@ import { ElMessage, UploadRawFile, UploadRequestOptions } from 'element-plus';
import { onMounted, ref } from 'vue';
import { SystemEnum } from '@/enums/upload';
import { fetchUploadFile } from '@/api/v1/system/system';
+import ImageLoading from '@/components/Upload/ImageLoading.vue';
const props = defineProps({
imageUrl: String,
diff --git a/src/enums/baseConstant.ts b/src/enums/baseConstant.ts
index 208f0e2..0b4aa9a 100644
--- a/src/enums/baseConstant.ts
+++ b/src/enums/baseConstant.ts
@@ -1,9 +1,7 @@
import { computed } from 'vue';
import { $t } from '@/plugins/i18n';
-/**
- * * 是否默认
- */
+/** 是否默认 */
export const isDefaultOptions = [
{ value: true, label: '是' },
{ value: false, label: '否' },
@@ -40,8 +38,8 @@ export const isReadStatus = [
{ value: 'false', label: $t('unread') },
];
-/**
- * * 分页默认数组个数
- */
+/** 分页默认数组个数 */
export const pageSizes: number[] = [15, 30, 50, 100, 150];
export const tableSelectButtonClass = computed(() => ['!h-[20px]', 'reset-margin', '!text-gray-500', 'dark:!text-white', 'dark:hover:!text-primary']);
+// export const UserAvatar = 'http://116.196.101.14:9000/auth-admin/avatar/user.jpg';
+export const UserAvatar = 'https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83eoj0hHXhgJNOTSOFsS4uZs8x1ConecaVOB8eIl115xmJZcT4oCicvia7wMEufibKtTLqiaJeanU2Lpg3w/132';
diff --git a/src/enums/index.ts b/src/enums/index.ts
index 0d945d6..da72bf1 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -6,52 +6,6 @@ export const menuTypeOptions: Array = [
{ label: '外链', value: 2 },
];
-export const showLinkOptions: Array = [
- { label: '显示', tip: '会在菜单中显示', value: true },
- { label: '隐藏', tip: '不会在菜单中显示', value: false },
-];
-
-export const fixedTagOptions: Array = [
- {
- label: '固定',
- tip: '当前菜单名称固定显示在标签页且不可关闭',
- value: true,
- },
- {
- label: '不固定',
- tip: '当前菜单名称不固定显示在标签页且可关闭',
- value: false,
- },
-];
-
-export const keepAliveOptions: Array = [
- { label: '缓存', tip: '会保存该页面的整体状态，刷新后会清空状态', value: true },
- {
- label: '不缓存',
- tip: '不会保存该页面的整体状态',
- value: false,
- },
-];
-
-export const hiddenTagOptions: Array = [
- { label: '允许', tip: '当前菜单名称或自定义信息允许添加到标签页', value: false },
- {
- label: '禁止',
- tip: '当前菜单名称或自定义信息禁止添加到标签页',
- value: true,
- },
-];
-
-export const showParentOptions: Array = [
- { label: '显示', tip: '会显示父级菜单', value: true },
- { label: '隐藏', tip: '不会显示父级菜单', value: false },
-];
-
-export const frameLoadingOptions: Array = [
- { label: '开启', tip: '有首次加载动画', value: true },
- { label: '关闭', tip: '无首次加载动画', value: false },
-];
-
export const frameSureOptions: Array = [
{ label: '是', tip: '有首次加载动画', value: true },
{ label: '否', tip: '无首次加载动画', value: false },
diff --git a/src/enums/upload.ts b/src/enums/upload.ts
index 55cc89c..44d5be0 100644
--- a/src/enums/upload.ts
+++ b/src/enums/upload.ts
@@ -1,9 +1,5 @@
// 系统枚举变量
export enum SystemEnum {
IMAGE_SIZE = 5 * 1024 * 1024,
- FILE_SIZE = 10 * 1024 * 1024,
IMAGE_MESSAGE = '文件不能大于5M',
- FILE_MESSAGE = '文件不能大于10M',
- // Base64
- Base64 = 'data:text/plain;base64,',
}
diff --git a/src/layout/hooks/useNav.ts b/src/layout/hooks/useNav.ts
index 17a681f..39f5979 100644
--- a/src/layout/hooks/useNav.ts
+++ b/src/layout/hooks/useNav.ts
@@ -2,7 +2,6 @@ import { storeToRefs } from 'pinia';
import { getConfig } from '@/config';
import { useRouter } from 'vue-router';
import { emitter } from '@/utils/mitt';
-import Avatar from '@/assets/user.jpg';
import { getTopMenu } from '@/router/utils';
import { useFullscreen } from '@vueuse/core';
import type { routeMetaType } from '../types';
@@ -16,6 +15,7 @@ import { usePermissionStoreHook } from '@/store/permission';
import ExitFullscreen from '@iconify-icons/ri/fullscreen-exit-fill';
import Fullscreen from '@iconify-icons/ri/fullscreen-fill';
import { $t } from '@/plugins/i18n';
+import { UserAvatar } from '@/enums/baseConstant';
const errorInfo = 'The current routing configuration is incorrect, please check the configuration';
@@ -39,7 +39,7 @@ export function useNav() {
/** 头像（如果头像为空则使用 src/assets/user.jpg ） */
const userAvatar = computed(() => {
- return isAllEmpty(useUserStoreHook()?.avatar) ? Avatar : useUserStoreHook()?.avatar;
+ return isAllEmpty(useUserStoreHook()?.avatar) ? UserAvatar : useUserStoreHook()?.avatar;
});
/** 昵称（如果昵称为空则显示用户名） */
diff --git a/src/store/system/adminUser.ts b/src/store/system/adminUser.ts
index 70efb6e..06b71d5 100644
--- a/src/store/system/adminUser.ts
+++ b/src/store/system/adminUser.ts
@@ -5,6 +5,7 @@ import { storePagination } from '@/store/useStorePagination';
import {
fetchAddAdminUser,
fetchDeleteAdminUser,
+ fetchForcedOffline,
fetchGetAdminUserList,
fetchQueryUser,
fetchUpdateAdminUser,
@@ -118,5 +119,11 @@ export const useAdminUserStore = defineStore('adminUserStore', {
const result = await fetchUpdateUserStatusByAdmin(data);
return storeMessage(result);
},
+
+ /** 强制用户下线 */
+ async forcedOffline(data: any) {
+ const result = await fetchForcedOffline(data);
+ return storeMessage(result);
+ },
},
});
diff --git a/src/views/message-management/message-detail/detail-message-id.vue b/src/views/message-management/message-detail/detail-message-id.vue
index e89c7fd..82de9ff 100644
--- a/src/views/message-management/message-detail/detail-message-id.vue
+++ b/src/views/message-management/message-detail/detail-message-id.vue
@@ -2,7 +2,8 @@
import { useRoute } from 'vue-router';
import { onMounted } from 'vue';
import 'plus-pro-components/es/components/check-card-group/style/css';
-import MarkdownPreview from '@/components/Editor/MarkdownPreview.vue';
+import { MdPreview } from 'md-editor-v3';
+import 'md-editor-v3/lib/preview.css';
import { useMessageUserStore } from '@/store/message/messageUser';
const route = useRoute();
@@ -38,7 +39,7 @@ onMounted(() => {
{{ messageUserStore.messageDetail?.updateTime }}
By：{{ messageUserStore.messageDetail?.sendNickname }}
-
+
diff --git a/src/views/message-management/message-editing/message-editor-from.vue b/src/views/message-management/message-editing/message-editor-from.vue
index 8819732..828dd86 100644
--- a/src/views/message-management/message-editing/message-editor-from.vue
+++ b/src/views/message-management/message-editing/message-editor-from.vue
@@ -12,6 +12,7 @@ import { message } from '@/utils/message';
import { useMessageSendStore } from '@/store/message/messageSend';
import { usePublicHooks } from '@/views/hooks';
import { Plus } from '@element-plus/icons-vue';
+import ImageLoading from '@/components/Upload/ImageLoading.vue';
const formRef = ref();
// 用户是否停用样式
@@ -103,7 +104,7 @@ onMounted(() => {
-
+
diff --git a/src/views/message-management/message-editing/rich-editor.vue b/src/views/message-management/message-editing/rich-editor.vue
index 9dd22ca..5690aed 100644
--- a/src/views/message-management/message-editing/rich-editor.vue
+++ b/src/views/message-management/message-editing/rich-editor.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/welcome/components/web-read-me.vue b/src/views/welcome/components/web-read-me.vue
index 9b5548c..3bf6655 100644
--- a/src/views/welcome/components/web-read-me.vue
+++ b/src/views/welcome/components/web-read-me.vue
@@ -1,7 +1,8 @@
-
+