diff --git a/.env b/.env index 5b92fba..b081852 100644 --- a/.env +++ b/.env @@ -2,13 +2,13 @@ VITE_PORT = 80 # 网站标题 -VITE_GLOB_APP_TITLE = 芋道管理系统 +VITE_GLOB_APP_TITLE = 预警诊断系统 # 简称,用于配置文件名字 不要出现空格、数字开头等特殊字符 VITE_GLOB_APP_SHORT_NAME = Yudao_Admin # 租户开关 -VITE_GLOB_APP_TENANT_ENABLE = true +VITE_GLOB_APP_TENANT_ENABLE = false # 验证码的开关 VITE_GLOB_APP_CAPTCHA_ENABLE = true diff --git a/.husky/commit-msg b/.husky/commit-msg deleted file mode 100644 index 274d2d8..0000000 --- a/.husky/commit-msg +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# shellcheck source=./_/husky.sh -. "$(dirname "$0")/_/husky.sh" - -PATH="/usr/local/bin:$PATH" - -npx --no-install commitlint --edit "$1" diff --git a/.husky/common.sh b/.husky/common.sh deleted file mode 100644 index 9d5129b..0000000 --- a/.husky/common.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -command_exists () { - command -v "$1" >/dev/null 2>&1 -} - -# Workaround for Windows 10, Git Bash and Yarn -if command_exists winpty && test -t 1; then - exec < /dev/tty -fi diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100644 index f975aa7..0000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" -. "$(dirname "$0")/common.sh" - -[ -n "$CI" ] && exit 0 - -PATH="/usr/local/bin:$PATH" - -# Format and submit code according to lintstagedrc.js configuration -npm run lint:lint-staged diff --git a/package.json b/package.json index d08583c..d2545b1 100644 --- a/package.json +++ b/package.json @@ -40,13 +40,13 @@ "lint:stylelint": "stylelint \"**/*.{vue,css,less,scss}\" --fix --cache --cache-location node_modules/.cache/stylelint/", "lint:lint-staged": "lint-staged", "reinstall": "rimraf pnpm-lock.yaml && rimraf node_modules && npm run bootstrap", - "prepare": "husky install", "gen:icon": "esno ./build/generate/icon/index.ts" }, "dependencies": { "@ant-design/colors": "^7.0.0", "@ant-design/icons-vue": "^7.0.1", "@iconify/iconify": "^3.1.1", + "@unocss/eslint-plugin": "66.1.0-beta.12", "@videojs-player/vue": "^1.0.0", "@vue/runtime-core": "^3.3.8", "@vueuse/core": "^10.6.1", @@ -106,7 +106,6 @@ "eslint": "^8.53.0", "esno": "^4.0.0", "fs-extra": "^11.1.1", - "husky": "^8.0.3", "inquirer": "^9.2.12", "less": "^4.2.0", "lint-staged": "^15.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db218aa..cd29a14 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ importers: '@iconify/iconify': specifier: ^3.1.1 version: 3.1.1 + '@unocss/eslint-plugin': + specifier: 66.1.0-beta.12 + version: 66.1.0-beta.12(eslint@8.53.0)(typescript@5.2.2) '@videojs-player/vue': specifier: ^1.0.0 version: 1.0.0(@types/video.js@7.3.55)(video.js@7.21.5)(vue@3.3.8(typescript@5.2.2)) @@ -189,9 +192,6 @@ importers: fs-extra: specifier: ^11.1.1 version: 11.1.1 - husky: - specifier: ^8.0.3 - version: 8.0.3 inquirer: specifier: ^9.2.12 version: 9.2.12 @@ -1227,6 +1227,9 @@ packages: '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + '@jridgewell/sourcemap-codec@1.5.0': + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/trace-mapping@0.3.20': resolution: {integrity: sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==} @@ -1307,6 +1310,10 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} + '@pkgr/core@0.1.2': + resolution: {integrity: sha512-fdDH1LSGfZdTH2sxdpVMw31BanV28K/Gry0cVFxaNP77neJSkd82mM8ErPNYs9e+0O7SdHBLTDzDgwUuy18RnQ==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + '@pkgr/utils@2.4.2': resolution: {integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} @@ -1320,6 +1327,10 @@ packages: '@purge-icons/generated@0.9.0': resolution: {integrity: sha512-s2t+1oVtGDV6KtqfCXtUOhxfeYvOdDF90IVm+nMs/6bUP0HeGZLslguuL/AibpwtfL4FA/oCsIu/RhwapgAdJw==} + '@quansync/fs@0.1.2': + resolution: {integrity: sha512-ezIadUb1aFhwJLd++WVqVpi9rnlX8vnd4ju7saPhwLHJN1mJgOv0puePTGV+FbtSnWtwoHDT8lAm4kagDZmpCg==} + engines: {node: '>=20.0.0'} + '@rollup/plugin-babel@5.3.1': resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} engines: {node: '>= 10.0.0'} @@ -1560,6 +1571,10 @@ packages: resolution: {integrity: sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==} engines: {node: ^16.0.0 || >=18.0.0} + '@typescript-eslint/scope-manager@8.31.0': + resolution: {integrity: sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/type-utils@6.10.0': resolution: {integrity: sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1578,6 +1593,10 @@ packages: resolution: {integrity: sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==} engines: {node: ^16.0.0 || >=18.0.0} + '@typescript-eslint/types@8.31.0': + resolution: {integrity: sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/typescript-estree@6.10.0': resolution: {integrity: sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1596,6 +1615,12 @@ packages: typescript: optional: true + '@typescript-eslint/typescript-estree@8.31.0': + resolution: {integrity: sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <5.9.0' + '@typescript-eslint/utils@6.10.0': resolution: {integrity: sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1608,6 +1633,13 @@ packages: peerDependencies: eslint: ^7.0.0 || ^8.0.0 + '@typescript-eslint/utils@8.31.0': + resolution: {integrity: sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.9.0' + '@typescript-eslint/visitor-keys@6.10.0': resolution: {integrity: sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1616,6 +1648,10 @@ packages: resolution: {integrity: sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==} engines: {node: ^16.0.0 || >=18.0.0} + '@typescript-eslint/visitor-keys@8.31.0': + resolution: {integrity: sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -1636,9 +1672,16 @@ packages: resolution: {integrity: sha512-jrjvmcrrdiHHLqp6LBpHWs7VAnumFK3fEdMH7celRe+99CTOvRn73caUThyD2Ftt8rDIMejmteR1hqVBH51kug==} engines: {node: '>=14'} + '@unocss/config@66.1.0-beta.12': + resolution: {integrity: sha512-u0dcWKFK+DZQ6Z3Qim2qzj6I6tsdCwl8O86NRRNN4Yt0H9C7IHzYLykfo6jgFFxay47aUKCZevl+mNLPUktk9w==} + engines: {node: '>=14'} + '@unocss/core@0.57.3': resolution: {integrity: sha512-o6snDo5vwAenIqA+wjjI6BUsftJXXSqrPHYqplb+QX5bLfxW/OU1xhBRlnhiP0BOGGZXqgGEETU1ym8MM9bLwA==} + '@unocss/core@66.1.0-beta.12': + resolution: {integrity: sha512-8+KJAoqA7eHC5cBJtod1AqWqQbYKfhTvQEgVQzZJ2sTYNTuQz4qdzPhUgKF83wURUhznGkdDL1Jxc6YITB1KPg==} + '@unocss/eslint-config@0.57.3': resolution: {integrity: sha512-TeqQ38gO/0SteYsqjT1oqyuvLpZPgevHexF/1dhHKaBzYVmkPK5TJQyAlNQ/abXKbIO64y5cIvEnc2lPfCU4zQ==} engines: {node: '>=14'} @@ -1647,6 +1690,10 @@ packages: resolution: {integrity: sha512-S2xhVdfApBYz/ORhN2jdUPC6EFLczzEINRBoxcVHLlRaOydpsSgWZNux9WkP4zdifuCUM1VvfBJoMokHn+sEBA==} engines: {node: '>=14'} + '@unocss/eslint-plugin@66.1.0-beta.12': + resolution: {integrity: sha512-aGc8X1SsAREsbFDBGDNOGr7pL0HOX0E4P2xua/Xd4DOMZKF8AhoQk+V4G9Zd/4s0bRkyVA78JO3vgOvmfVyxJQ==} + engines: {node: '>=14'} + '@unocss/extractor-arbitrary-variants@0.57.3': resolution: {integrity: sha512-OmF+2TjJ97i7KOCR8wPgZK/pkp8Rcfo4tzqT/4jBUIi7rfDGZx/eE3aZKFpZSZlUuTH5cdReaKxymXQmJ4dibA==} @@ -1690,6 +1737,10 @@ packages: resolution: {integrity: sha512-koWXeRJHFt/SJdb3m7s/2+NrBCcUtl67SX7rSHJc99Z+dwZgIsPUfdfRKM4mZD43MayybvDrd1Wue2LNQg5R/g==} engines: {node: '>=14'} + '@unocss/rule-utils@66.1.0-beta.12': + resolution: {integrity: sha512-txhJO8pqut5FjGxhFC/OzqvLkeyeSaXgvZLaPaCTnpmuzt78ZTmqpszAHSchr9qCEXtBbK9dKHH78Zh10SRDLg==} + engines: {node: '>=14'} + '@unocss/scope@0.57.3': resolution: {integrity: sha512-hL0Gjd5getA6ziiOvu1M2Jw5e+FnD9rzu+t+4SnxWcpP+bZtu+LBrt5FeqrizwUHfE/723iuEvg16W5hjhGLQA==} @@ -2512,6 +2563,9 @@ packages: defu@6.1.3: resolution: {integrity: sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==} + defu@6.1.4: + resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} + delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} @@ -2828,6 +2882,10 @@ packages: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + eslint-visitor-keys@4.2.0: + resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint@8.53.0: resolution: {integrity: sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3226,11 +3284,6 @@ packages: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - husky@8.0.3: - resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==} - engines: {node: '>=14'} - hasBin: true - iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -3549,6 +3602,10 @@ packages: resolution: {integrity: sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==} hasBin: true + jiti@2.4.2: + resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} + hasBin: true + js-base64@2.6.4: resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==} @@ -3787,6 +3844,9 @@ packages: magic-string@0.25.9: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} + magic-string@0.30.17: + resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} + magic-string@0.30.5: resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} @@ -3899,6 +3959,10 @@ packages: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} + minimatch@9.0.5: + resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} + engines: {node: '>=16 || 14 >=14.17'} + minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -4323,6 +4387,9 @@ packages: resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} engines: {node: '>=0.6'} + quansync@0.2.10: + resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==} + query-string@4.3.4: resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==} engines: {node: '>=0.10.0'} @@ -4577,6 +4644,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.7.1: + resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} + engines: {node: '>=10'} + hasBin: true + serialize-javascript@4.0.0: resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} @@ -4885,6 +4957,10 @@ packages: resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==} engines: {node: ^14.18.0 || >=16.0.0} + synckit@0.9.2: + resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==} + engines: {node: ^14.18.0 || >=16.0.0} + table@6.8.1: resolution: {integrity: sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==} engines: {node: '>=10.0.0'} @@ -4977,6 +5053,12 @@ packages: peerDependencies: typescript: '>=4.2.0' + ts-api-utils@2.1.0: + resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==} + engines: {node: '>=18.12'} + peerDependencies: + typescript: '>=4.8.4' + tslib@2.3.0: resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==} @@ -5049,6 +5131,9 @@ packages: unconfig@0.3.11: resolution: {integrity: sha512-bV/nqePAKv71v3HdVUn6UefbsDKQWRX+bJIkiSm0+twIds6WiD2bJLWWT3i214+J/B4edufZpG2w7Y63Vbwxow==} + unconfig@7.3.2: + resolution: {integrity: sha512-nqG5NNL2wFVGZ0NA/aCFw0oJ2pxSf1lwg4Z5ill8wd7K4KX/rQbHlwbh+bjctXL5Ly1xtzHenHGOK0b+lG6JVg==} + undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} @@ -6556,6 +6641,8 @@ snapshots: '@jridgewell/sourcemap-codec@1.4.15': {} + '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/trace-mapping@0.3.20': dependencies: '@jridgewell/resolve-uri': 3.1.1 @@ -6661,6 +6748,8 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true + '@pkgr/core@0.1.2': {} + '@pkgr/utils@2.4.2': dependencies: cross-spawn: 7.0.3 @@ -6687,6 +6776,10 @@ snapshots: dependencies: '@iconify/iconify': 3.1.1 + '@quansync/fs@0.1.2': + dependencies: + quansync: 0.2.10 + '@rollup/plugin-babel@5.3.1(@babel/core@7.23.2)(rollup@2.79.1)': dependencies: '@babel/core': 7.23.2 @@ -6933,6 +7026,11 @@ snapshots: '@typescript-eslint/types': 6.9.1 '@typescript-eslint/visitor-keys': 6.9.1 + '@typescript-eslint/scope-manager@8.31.0': + dependencies: + '@typescript-eslint/types': 8.31.0 + '@typescript-eslint/visitor-keys': 8.31.0 + '@typescript-eslint/type-utils@6.10.0(eslint@8.53.0)(typescript@5.2.2)': dependencies: '@typescript-eslint/typescript-estree': 6.10.0(typescript@5.2.2) @@ -6949,6 +7047,8 @@ snapshots: '@typescript-eslint/types@6.9.1': {} + '@typescript-eslint/types@8.31.0': {} + '@typescript-eslint/typescript-estree@6.10.0(typescript@5.2.2)': dependencies: '@typescript-eslint/types': 6.10.0 @@ -6977,6 +7077,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.31.0(typescript@5.2.2)': + dependencies: + '@typescript-eslint/types': 8.31.0 + '@typescript-eslint/visitor-keys': 8.31.0 + debug: 4.3.4 + fast-glob: 3.3.2 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.7.1 + ts-api-utils: 2.1.0(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@6.10.0(eslint@8.53.0)(typescript@5.2.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) @@ -7005,6 +7119,17 @@ snapshots: - supports-color - typescript + '@typescript-eslint/utils@8.31.0(eslint@8.53.0)(typescript@5.2.2)': + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) + '@typescript-eslint/scope-manager': 8.31.0 + '@typescript-eslint/types': 8.31.0 + '@typescript-eslint/typescript-estree': 8.31.0(typescript@5.2.2) + eslint: 8.53.0 + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/visitor-keys@6.10.0': dependencies: '@typescript-eslint/types': 6.10.0 @@ -7015,6 +7140,11 @@ snapshots: '@typescript-eslint/types': 6.9.1 eslint-visitor-keys: 3.4.3 + '@typescript-eslint/visitor-keys@8.31.0': + dependencies: + '@typescript-eslint/types': 8.31.0 + eslint-visitor-keys: 4.2.0 + '@ungap/structured-clone@1.2.0': {} '@unocss/astro@0.57.3(rollup@4.4.0)(vite@4.5.0(@types/node@20.9.0)(less@4.2.0)(terser@5.24.0))': @@ -7050,8 +7180,15 @@ snapshots: '@unocss/core': 0.57.3 unconfig: 0.3.11 + '@unocss/config@66.1.0-beta.12': + dependencies: + '@unocss/core': 66.1.0-beta.12 + unconfig: 7.3.2 + '@unocss/core@0.57.3': {} + '@unocss/core@66.1.0-beta.12': {} + '@unocss/eslint-config@0.57.3(eslint@8.53.0)(typescript@5.2.2)': dependencies: '@unocss/eslint-plugin': 0.57.3(eslint@8.53.0)(typescript@5.2.2) @@ -7072,6 +7209,19 @@ snapshots: - supports-color - typescript + '@unocss/eslint-plugin@66.1.0-beta.12(eslint@8.53.0)(typescript@5.2.2)': + dependencies: + '@typescript-eslint/utils': 8.31.0(eslint@8.53.0)(typescript@5.2.2) + '@unocss/config': 66.1.0-beta.12 + '@unocss/core': 66.1.0-beta.12 + '@unocss/rule-utils': 66.1.0-beta.12 + magic-string: 0.30.17 + synckit: 0.9.2 + transitivePeerDependencies: + - eslint + - supports-color + - typescript + '@unocss/extractor-arbitrary-variants@0.57.3': dependencies: '@unocss/core': 0.57.3 @@ -7145,6 +7295,11 @@ snapshots: '@unocss/core': 0.57.3 magic-string: 0.30.5 + '@unocss/rule-utils@66.1.0-beta.12': + dependencies: + '@unocss/core': 66.1.0-beta.12 + magic-string: 0.30.17 + '@unocss/scope@0.57.3': {} '@unocss/transformer-attributify-jsx-babel@0.57.3': @@ -8045,6 +8200,8 @@ snapshots: defu@6.1.3: {} + defu@6.1.4: {} + delayed-stream@1.0.0: {} deprecation@2.3.1: {} @@ -8443,6 +8600,8 @@ snapshots: eslint-visitor-keys@3.4.3: {} + eslint-visitor-keys@4.2.0: {} + eslint@8.53.0: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) @@ -8934,8 +9093,6 @@ snapshots: human-signals@5.0.0: {} - husky@8.0.3: {} - iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2 @@ -9215,6 +9372,8 @@ snapshots: jiti@1.20.0: {} + jiti@2.4.2: {} + js-base64@2.6.4: {} js-tokens@4.0.0: {} @@ -9439,6 +9598,10 @@ snapshots: dependencies: sourcemap-codec: 1.4.8 + magic-string@0.30.17: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.0 + magic-string@0.30.5: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -9577,6 +9740,10 @@ snapshots: dependencies: brace-expansion: 2.0.1 + minimatch@9.0.5: + dependencies: + brace-expansion: 2.0.1 + minimist-options@4.1.0: dependencies: arrify: 1.0.1 @@ -10001,6 +10168,8 @@ snapshots: dependencies: side-channel: 1.0.4 + quansync@0.2.10: {} + query-string@4.3.4: dependencies: object-assign: 4.1.1 @@ -10269,6 +10438,8 @@ snapshots: dependencies: lru-cache: 6.0.0 + semver@7.7.1: {} + serialize-javascript@4.0.0: dependencies: randombytes: 2.1.0 @@ -10652,6 +10823,11 @@ snapshots: '@pkgr/utils': 2.4.2 tslib: 2.6.2 + synckit@0.9.2: + dependencies: + '@pkgr/core': 0.1.2 + tslib: 2.6.2 + table@6.8.1: dependencies: ajv: 8.12.0 @@ -10736,6 +10912,10 @@ snapshots: dependencies: typescript: 5.2.2 + ts-api-utils@2.1.0(typescript@5.2.2): + dependencies: + typescript: 5.2.2 + tslib@2.3.0: {} tslib@2.6.2: {} @@ -10811,6 +10991,13 @@ snapshots: jiti: 1.20.0 mlly: 1.4.2 + unconfig@7.3.2: + dependencies: + '@quansync/fs': 0.1.2 + defu: 6.1.4 + jiti: 2.4.2 + quansync: 0.2.10 + undici-types@5.26.5: {} unicode-canonical-property-names-ecmascript@2.0.0: {} diff --git a/public/favicon.ico b/public/favicon.ico index 522fa26..ad2408a 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon_yudao.ico b/public/favicon_yudao.ico new file mode 100644 index 0000000..522fa26 Binary files /dev/null and b/public/favicon_yudao.ico differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index ed86d4d..b7b77c1 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/logo_yudao.png b/src/assets/images/logo_yudao.png new file mode 100644 index 0000000..ed86d4d Binary files /dev/null and b/src/assets/images/logo_yudao.png differ diff --git a/src/locales/lang/zh-CN/sys.json b/src/locales/lang/zh-CN/sys.json index 8141a7b..bc164a1 100644 --- a/src/locales/lang/zh-CN/sys.json +++ b/src/locales/lang/zh-CN/sys.json @@ -81,9 +81,9 @@ "registerButton": "注册", "rememberMe": "记住我", "scanSign": "扫码后点击\"确认\",即可完成登录", - "signInDesc": "输入您的个人详细信息开始使用!", + "signInDesc": "开始使用!", "signInFormTitle": "登录", - "signInTitle": "开箱即用的中后台管理系统", + "signInTitle": "系统简介", "signUpFormTitle": "注册", "smsCode": "短信验证码", "smsPlaceholder": "请输入验证码", diff --git a/src/router/routes/modules/about.ts b/src/router/routes/modules/about.ts deleted file mode 100644 index f25398d..0000000 --- a/src/router/routes/modules/about.ts +++ /dev/null @@ -1,31 +0,0 @@ -import type { AppRouteModule } from '@/router/types' - -import { LAYOUT } from '@/router/constant' -import { t } from '@/hooks/web/useI18n' - -const about: AppRouteModule = { - path: '/about', - name: 'About', - component: LAYOUT, - redirect: '/about/index', - meta: { - hideChildrenInMenu: true, - icon: 'ant-design:pushpin-filled', - title: t('routes.dashboard.about'), - orderNo: 100000, - }, - children: [ - { - path: 'index', - name: 'AboutPage', - component: () => import('@/views/base/about/index.vue'), - meta: { - title: t('routes.dashboard.about'), - icon: 'ant-design:pushpin-filled', - hideMenu: true, - }, - }, - ], -} - -export default about diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 2e6f71a..d81f0f6 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -7,7 +7,8 @@ import { useAppStoreWithOut } from './app' import { store } from '@/store' import type { AppRouteRecordRaw, Menu } from '@/router/types' import { asyncRoutes } from '@/router/routes' -import about from '@/router/routes/modules/about' +// 为了去掉页面--关于 +// import about from '@/router/routes/modules/about' import dashboard from '@/router/routes/modules/dashboard' import { PAGE_NOT_FOUND_ROUTE } from '@/router/routes/basic' import { transformRouteToMenu } from '@/router/helper/menuHelper' @@ -226,14 +227,22 @@ export const usePermissionStore = defineStore('app-permission', { routeList = transformObjToRoute(routeList) // Background routing to menu structure // 后台路由到菜单结构 - const backMenuList = transformRouteToMenu([dashboard, ...routeList, about]) + const backMenuList = transformRouteToMenu([dashboard, ...routeList]) + + // 为了去掉页面--关于-- + // const backMenuList = transformRouteToMenu([dashboard, ...routeList, about]) + this.setBackMenuList(backMenuList) // remove meta.ignoreRoute item // 删除 meta.ignoreRoute 项 routeList = filter(routeList, routeRemoveIgnoreFilter) routeList = routeList.filter(routeRemoveIgnoreFilter) routeList = flatMultiLevelRoutes(routeList) - routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList, about] + + + routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList] + // 为了去掉页面--关于-- + // routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList, about] break } diff --git a/src/views/base/login/LoginForm.vue b/src/views/base/login/LoginForm.vue index aeccb4b..f8a3781 100644 --- a/src/views/base/login/LoginForm.vue +++ b/src/views/base/login/LoginForm.vue @@ -78,6 +78,7 @@ async function getTenantId() { } else { const res = await getTenantIdByName(formData.tenantName) + console.log(res) authUtil.setTenantId(res) } } @@ -159,11 +160,12 @@ async function handleLogin(params) {