hjq/mart-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新最新依赖、部分样式修改

Browse Source
This commit is contained in:
lyt 2024-03-17 22:54:08 +08:00
parent 7f4ccfd7fd
commit 2adc588982
13 changed files with 1709 additions and 1376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -2,6 +2,14 @@
🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支） 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
## 2.4.34
`2023.04.14`
- 🌟 更新 依赖更新最新版本
- 🎯 优化 演示界面 [列表自适应](https://lyt-top.gitee.io/vue-next-admin-preview/#/pages/listAdapt) 与 [图片懒加载](https://lyt-top.gitee.io/vue-next-admin-preview/#/pages/lazyImg)
- 🐞 修复 `font-awesome.min.css` 在线 `cdn` 无法访问问题，[在线 cdn](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/build/#_3-cdn-%E5%8A%A0%E9%80%9F)，感谢群友@Lauyping
## 2.4.33 ## 2.4.33
`2023.04.11` `2023.04.11`

4
README.md
View File

@ -83,9 +83,9 @@ cnpm run build
#### 💯 学习交流加 QQ 群 #### 💯 学习交流加 QQ 群
> 1 - 5 交流群已满，请加 vue-next-admin 交流群 6 > 1 - 4 交流群已满，请加 vue-next-admin 交流群 5
群号：761442083 群号：556254895
其它交流群请查看文档首页 [vueNextAdmin 解疑问](https://lyt-top.gitee.io/vue-next-admin-doc-preview/) 其它交流群请查看文档首页 [vueNextAdmin 解疑问](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)

2980
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

62
package.json
View File

@ -5,58 +5,58 @@
"author": "lyt_20201208", "author": "lyt_20201208",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite --force",
"build": "vite build", "build": "vite build",
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.1.0", "@element-plus/icons-vue": "^2.3.1",
"@wangeditor/editor": "^5.1.23", "@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12", "@wangeditor/editor-for-vue": "^5.1.12",
"axios": "^1.3.5", "axios": "^1.6.8",
"countup.js": "^2.6.0", "countup.js": "^2.8.0",
"cropperjs": "^1.5.13", "cropperjs": "^1.6.1",
"echarts": "^5.4.2", "echarts": "^5.5.0",
"echarts-gl": "^2.0.9", "echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.1.0", "echarts-wordcloud": "^2.1.0",
"element-plus": "^2.3.3", "element-plus": "^2.6.1",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.5",
"js-table2excel": "^1.0.3", "js-table2excel": "^1.1.2",
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.34", "pinia": "^2.1.7",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
"qs": "^6.11.1", "qs": "^6.12.0",
"screenfull": "^6.0.2", "screenfull": "^6.0.2",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.2",
"splitpanes": "^3.1.5", "splitpanes": "^3.1.5",
"vue": "^3.2.47", "vue": "^3.4.21",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-demi": "^0.13.11", "vue-demi": "^0.14.7",
"vue-grid-layout": "^3.0.0-beta1", "vue-grid-layout": "^3.0.0-beta1",
"vue-i18n": "^9.2.2", "vue-i18n": "^9.10.2",
"vue-router": "^4.1.6" "vue-router": "^4.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.15.11", "@types/node": "^20.11.28",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.1", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^5.58.0", "@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-vue": "^4.1.0", "@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.2.47", "@vue/compiler-sfc": "^3.4.21",
"eslint": "^8.38.0", "eslint": "^8.57.0",
"eslint-plugin-vue": "^9.10.0", "eslint-plugin-vue": "^9.23.0",
"prettier": "^2.8.7", "prettier": "^3.2.5",
"sass": "^1.61.0", "sass": "^1.72.0",
"typescript": "^5.0.4", "typescript": "^5.4.2",
"vite": "^4.2.1", "vite": "^5.1.6",
"vite-plugin-cdn-import": "^0.3.5", "vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-vue-setup-extend-plus": "^0.1.0", "vite-plugin-vue-setup-extend-plus": "^0.1.0",
"vue-eslint-parser": "^9.1.1" "vue-eslint-parser": "^9.4.2"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

1
src/assets/login-icon-two.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

14
src/i18n/index.ts
View File

@ -14,14 +14,14 @@ import { useThemeConfig } from '/@/stores/themeConfig';
*/ */
// element plus 自带国际化 // element plus 自带国际化
import enLocale from 'element-plus/lib/locale/lang/en'; import enLocale from 'element-plus/dist/locale/en';
import zhcnLocale from 'element-plus/lib/locale/lang/zh-cn'; import zhcnLocale from 'element-plus/dist/locale/zh-cn';
import zhtwLocale from 'element-plus/lib/locale/lang/zh-tw'; import zhtwLocale from 'element-plus/dist/locale/zh-tw';
// 定义变量内容 // 定义变量内容
const messages = {}; const messages: any = {};
const element = { en: enLocale, 'zh-cn': zhcnLocale, 'zh-tw': zhtwLocale }; const element: any = { en: enLocale, 'zh-cn': zhcnLocale, 'zh-tw': zhtwLocale };
const itemize = { en: [], 'zh-cn': [], 'zh-tw': [] }; const itemize: any = { en: [], 'zh-cn': [], 'zh-tw': [] };
const modules: Record<string, any> = import.meta.glob('./**/*.ts', { eager: true }); const modules: Record<string, any> = import.meta.glob('./**/*.ts', { eager: true });
// 对自动引入的 modules 进行分类 en、zh-cn、zh-tw // 对自动引入的 modules 进行分类 en、zh-cn、zh-tw
@ -33,7 +33,7 @@ for (const path in modules) {
} }
// 合并数组对象（非标准数组对象，数组中对象的每项 key、value 都不同） // 合并数组对象（非标准数组对象，数组中对象的每项 key、value 都不同）
function mergeArrObj<T>(list: T, key: string) { function mergeArrObj(list: any, key: string) {
let obj = {}; let obj = {};
list[key].forEach((i: EmptyObjectType) => { list[key].forEach((i: EmptyObjectType) => {
obj = Object.assign({}, obj, i); obj = Object.assign({}, obj, i);

2
src/layout/navBars/topBar/search.vue
View File

@ -102,6 +102,8 @@ defineExpose({
.layout-search-dialog { .layout-search-dialog {
position: relative; position: relative;
:deep(.el-dialog) { :deep(.el-dialog) {
background: unset;
box-shadow: unset;
.el-dialog__header, .el-dialog__header,
.el-dialog__body { .el-dialog__body {
display: none; display: none;

1
src/layout/upgrade/index.vue
View File

@ -86,6 +86,7 @@ onMounted(() => {
<style scoped lang="scss"> <style scoped lang="scss">
.upgrade-dialog { .upgrade-dialog {
:deep(.el-dialog) { :deep(.el-dialog) {
padding: 0 !important;
.el-dialog__body { .el-dialog__body {
padding: 0 !important; padding: 0 !important;
} }

3
src/types/global.d.ts vendored
View File

@ -7,6 +7,9 @@ declare module '@wangeditor/editor-for-vue';
declare module 'js-table2excel'; declare module 'js-table2excel';
declare module 'qs'; declare module 'qs';
declare module 'sortablejs'; declare module 'sortablejs';
declare module 'element-plus/dist/locale/en';
declare module 'element-plus/dist/locale/zh-cn';
declare module 'element-plus/dist/locale/zh-tw';
// 声明一个模块，防止引入文件时报错 // 声明一个模块，防止引入文件时报错
declare module '*.json'; declare module '*.json';

2
src/utils/getStyleSheets.ts
View File

@ -51,7 +51,7 @@ const getAwesomeIconfont = () => {
let sheetsList = []; let sheetsList = [];
let sheetsIconList = []; let sheetsIconList = [];
for (let i = 0; i < styles.length; i++) { for (let i = 0; i < styles.length; i++) {
if (styles[i].href && styles[i].href.indexOf('netdna.bootstrapcdn.com') > -1) { if (styles[i].href && styles[i].href.indexOf('https://cdn.jsdelivr.net') > -1) {
sheetsList.push(styles[i]); sheetsList.push(styles[i]);
} }
} }

2
src/utils/setIconfont.ts
View File

@ -1,7 +1,7 @@
// 字体图标 url // 字体图标 url
const cssCdnUrlList: Array<string> = [ const cssCdnUrlList: Array<string> = [
'//at.alicdn.com/t/c/font_2298093_rnp72ifj3ba.css', '//at.alicdn.com/t/c/font_2298093_rnp72ifj3ba.css',
'//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', 'https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css',
]; ];
// 第三方 js url // 第三方 js url
const jsCdnUrlList: Array<string> = []; const jsCdnUrlList: Array<string> = [];

3
src/views/pages/lazyImg/index.vue
View File

@ -99,6 +99,9 @@ onMounted(() => {
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
margin: 0 -5px; margin: 0 -5px;
.el-row {
width: 101%;
}
.flex-warp-item { .flex-warp-item {
padding: 5px; padding: 5px;
width: 100%; width: 100%;

3
src/views/pages/listAdapt/index.vue
View File

@ -93,6 +93,9 @@ const onHandleCurrentChange = (val: number) => {
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
margin: 0 -5px; margin: 0 -5px;
.el-row {
width: 101%;
}
.flex-warp-item { .flex-warp-item {
padding: 5px; padding: 5px;
width: 100%; width: 100%;