diff --git a/vue-admin-wonderful-next/package.json b/vue-admin-wonderful-next/package.json index e23dd50..0c786b3 100644 --- a/vue-admin-wonderful-next/package.json +++ b/vue-admin-wonderful-next/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "clipboard": "^2.0.6", - "element-plus": "^1.0.2-beta.31", + "element-plus": "^1.0.2-beta.32", "mitt": "^2.1.0", "nprogress": "^0.2.0", "screenfull": "^5.1.0", @@ -18,15 +18,15 @@ }, "devDependencies": { "@types/clipboard": "^2.0.1", - "@types/node": "^14.14.22", + "@types/node": "^14.14.27", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.6", - "@vitejs/plugin-vue": "^1.1.2", + "@vitejs/plugin-vue": "^1.1.4", "@vue/compiler-sfc": "^3.0.5", "dotenv": "^8.2.0", - "sass": "^1.32.5", - "sass-loader": "^10.1.1", - "typescript": "^4.1.3", - "vite": "^2.0.0-beta.50" + "sass": "^1.32.7", + "sass-loader": "^11.0.1", + "typescript": "^4.1.5", + "vite": "^2.0.0-beta.69" } } \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss index 0f13792..d5f5bd0 100644 --- a/vue-admin-wonderful-next/src/theme/app.scss +++ b/vue-admin-wonderful-next/src/theme/app.scss @@ -24,6 +24,26 @@ body, overflow: hidden; } +::-webkit-scrollbar-track-piece { + background-color: #f8f8f8; +} +// 滚动条的宽度 +::-webkit-scrollbar { + width: 7px; + height: 7px; +} +// 滚动条的设置 +::-webkit-scrollbar-thumb { + background-color: rgba(144, 147, 153, 0.3); + background-clip: padding-box; + min-height: 28px; + border-radius: 5px; + transition: 0.3s background-color; +} +::-webkit-scrollbar-thumb:hover { + background-color: rgba(144, 147, 153, 0.5); +} + /* 主布局样式 ------------------------------- */ .layout-container { @@ -139,6 +159,19 @@ body, .flex-margin { margin: auto; } +.flex-warp { + display: flex; + flex-wrap: wrap; + align-content: flex-start; + margin: 0 -5px; + .flex-warp-item { + padding: 5px; + .flex-warp-item-box { + width: 100%; + height: 100%; + } + } +} /* 宽高 100% ------------------------------- */ diff --git a/vue-admin-wonderful-next/src/theme/media/form.scss b/vue-admin-wonderful-next/src/theme/media/form.scss deleted file mode 100644 index 68a89a3..0000000 --- a/vue-admin-wonderful-next/src/theme/media/form.scss +++ /dev/null @@ -1,21 +0,0 @@ -@import './index.scss'; - -/* 页面宽度小于576px -------------------------------- */ -@media screen and (max-width: $xs) { -} - -/* 页面宽度小于768px -------------------------------- */ -@media screen and (max-width: $sm) { - .el-form { - .el-select { - width: 100%; - } - .el-input, - .el-textarea { - width: 100%; - max-width: 100% !important; - } - } -} diff --git a/vue-admin-wonderful-next/src/theme/media/home.scss b/vue-admin-wonderful-next/src/theme/media/home.scss new file mode 100644 index 0000000..ffddf85 --- /dev/null +++ b/vue-admin-wonderful-next/src/theme/media/home.scss @@ -0,0 +1,10 @@ +@import './index.scss'; + +/* 页面宽度小于768px +------------------------------- */ +@media screen and (max-width: $sm) { + .home-warning-media, + .home-dynamic-media { + margin-top: 15px; + } +} diff --git a/vue-admin-wonderful-next/src/theme/media/media.scss b/vue-admin-wonderful-next/src/theme/media/media.scss index baab8e4..9614ac9 100644 --- a/vue-admin-wonderful-next/src/theme/media/media.scss +++ b/vue-admin-wonderful-next/src/theme/media/media.scss @@ -1,5 +1,6 @@ @import './login.scss'; @import './error.scss'; @import './layout.scss'; -@import './form.scss'; @import './personal.scss'; +@import './tagsView.scss'; +@import './home.scss'; diff --git a/vue-admin-wonderful-next/src/theme/media/tagsView.scss b/vue-admin-wonderful-next/src/theme/media/tagsView.scss new file mode 100644 index 0000000..ffa544e --- /dev/null +++ b/vue-admin-wonderful-next/src/theme/media/tagsView.scss @@ -0,0 +1,11 @@ +@import './index.scss'; + +/* 页面宽度小于768px +------------------------------- */ +@media screen and (max-width: $sm) { + .tags-view-form { + .tags-view-form-col { + margin-bottom: 20px; + } + } +} diff --git a/vue-admin-wonderful-next/src/utils/setIconfont.ts b/vue-admin-wonderful-next/src/utils/setIconfont.ts index 4cd34e5..175a4bf 100644 --- a/vue-admin-wonderful-next/src/utils/setIconfont.ts +++ b/vue-admin-wonderful-next/src/utils/setIconfont.ts @@ -1,7 +1,7 @@ // 字体图标 url -const cssCdnUrlList: Array = ["//at.alicdn.com/t/font_2298093_anmim41evr5.css"] +const cssCdnUrlList: Array = ['//at.alicdn.com/t/font_2298093_ri4yz1f9b7o.css'] // 第三方 js url -const jsCdnUrlList: Array = [] +const jsCdnUrlList: Array = ['https://cdn.jsdelivr.net/npm/echarts@5.0.2/dist/echarts.min.js'] // 动态设置字体图标 export function setCssCdn() { diff --git a/vue-admin-wonderful-next/src/views/fun/tagsView/index.vue b/vue-admin-wonderful-next/src/views/fun/tagsView/index.vue index 5c979aa..8b9bbaf 100644 --- a/vue-admin-wonderful-next/src/views/fun/tagsView/index.vue +++ b/vue-admin-wonderful-next/src/views/fun/tagsView/index.vue @@ -1,19 +1,27 @@