From 2112ed1faf8097ee136548d4972d3a784c399604 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 24 Jun 2018 22:43:11 +0800 Subject: [PATCH] no message Former-commit-id: 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 1eac930ecafafcd4bc3a3f863777e7ca08e94bd0 [formerly 9451c81818c835ec44069e292d80deebbc3ccc08]]]]] Former-commit-id: 6475c3dc7d71b833dabb73f1c6b47984e544b3b5 Former-commit-id: ed430fd6ccac7ebb4aacad1ebe4e6c99a427eb13 Former-commit-id: f36a435fec0eec783e5b76d18c0e217fc74345f7 [formerly 4cdb1c1b9efff274953ade88a98fe6008e7a1797] Former-commit-id: 90dea42f9c31d6d3348f451b62f578b3ac0dbbab Former-commit-id: 16cf6481273530911c552082c6cca18672e7033b Former-commit-id: 194b973addbb9b37b11a8d079e4ef1e928637da5 Former-commit-id: f115af20538dc239535cad43b2e2d977b849844a Former-commit-id: 884f97a7d2524a3d4618149d02e2992b35002629 --- docs/zh/guide/change-log.md | 1 + docs/zh/guide/question.md | 12 +++++- src/assets/style/public-class.scss | 40 +++++++++---------- .../d2-layout-main/components/-help/index.vue | 4 +- .../components/-menu-side/index.vue | 6 ++- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index 69077c81..c2faf544 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -32,6 +32,7 @@ * [ 新增 ] 顶栏联系方式 * [ 新增 ] 右键菜单组件 * [ 新增 ] 菜单配置支持空菜单（项目开发的时候有可能需要先把菜单做好查看效果） +* [ 优化 ] 页面左侧菜单滚动条优化 ## v1.0.0 diff --git a/docs/zh/guide/question.md b/docs/zh/guide/question.md index 39680fd3..9b224e84 100644 --- a/docs/zh/guide/question.md +++ b/docs/zh/guide/question.md @@ -1,5 +1,7 @@ # 常见问题 +本章总结收到的用户反馈问题，集中展示，方便后续用户自助解决问题 + ## 无法启动项目 首先建议您升级 node 版本 > 8，在以下环境测试可用 @@ -23,4 +25,12 @@ v8.11.1 ::: tip 推荐使用 [nrm](https://github.com/Pana/nrm) 管理 npm 源，不建议使用 cnpm -::: \ No newline at end of file +::: + +## 删除页面右上角 github 链接 + +在 `src/components/demo/d2-demo-page-cover/index.vue` 中删除相关代码即可 + +## el-scrollbar 组件 + +el-scrollbar 组件是 ElementUI 自带的一个隐藏组件，没有写入文档，详见 [https://github.com/ElemeFE/element/issues/2238](https://github.com/ElemeFE/element/issues/2238) \ No newline at end of file diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index b9a5db14..3466bf94 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -43,29 +43,29 @@ $sizes: (0, 10, 15, 20); @for $index from 1 to 5 { - .#{$prefix}-m-#{nth($sizes, $index)} { margin: #{nth($sizes, $index)}px; } - .#{$prefix}-mt-#{nth($sizes, $index)} { margin-top: #{nth($sizes, $index)}px; } - .#{$prefix}-mr-#{nth($sizes, $index)} { margin-right: #{nth($sizes, $index)}px; } - .#{$prefix}-mb-#{nth($sizes, $index)} { margin-bottom: #{nth($sizes, $index)}px; } - .#{$prefix}-ml-#{nth($sizes, $index)} { margin-left: #{nth($sizes, $index)}px; } + .#{$prefix}-m-#{nth($sizes, $index)} { margin: #{nth($sizes, $index)}px !important; } + .#{$prefix}-mt-#{nth($sizes, $index)} { margin-top: #{nth($sizes, $index)}px !important; } + .#{$prefix}-mr-#{nth($sizes, $index)} { margin-right: #{nth($sizes, $index)}px !important; } + .#{$prefix}-mb-#{nth($sizes, $index)} { margin-bottom: #{nth($sizes, $index)}px !important; } + .#{$prefix}-ml-#{nth($sizes, $index)} { margin-left: #{nth($sizes, $index)}px !important; } - .#{$prefix}-p-#{nth($sizes, $index)} { padding: #{nth($sizes, $index)}px; } - .#{$prefix}-pt-#{nth($sizes, $index)} { padding-top: #{nth($sizes, $index)}px; } - .#{$prefix}-pr-#{nth($sizes, $index)} { padding-right: #{nth($sizes, $index)}px; } - .#{$prefix}-pb-#{nth($sizes, $index)} { padding-bottom: #{nth($sizes, $index)}px; } - .#{$prefix}-pl-#{nth($sizes, $index)} { padding-left: #{nth($sizes, $index)}px; } + .#{$prefix}-p-#{nth($sizes, $index)} { padding: #{nth($sizes, $index)}px !important; } + .#{$prefix}-pt-#{nth($sizes, $index)} { padding-top: #{nth($sizes, $index)}px !important; } + .#{$prefix}-pr-#{nth($sizes, $index)} { padding-right: #{nth($sizes, $index)}px !important; } + .#{$prefix}-pb-#{nth($sizes, $index)} { padding-bottom: #{nth($sizes, $index)}px !important; } + .#{$prefix}-pl-#{nth($sizes, $index)} { padding-left: #{nth($sizes, $index)}px !important; } } // 快速使用 -.#{$prefix}-m { margin: 20px; } -.#{$prefix}-mt { margin-top: 20px; } -.#{$prefix}-mr { margin-right: 20px; } -.#{$prefix}-mb { margin-bottom: 20px; } -.#{$prefix}-ml { margin-left: 20px; } +.#{$prefix}-m { margin: 20px !important; } +.#{$prefix}-mt { margin-top: 20px !important; } +.#{$prefix}-mr { margin-right: 20px !important; } +.#{$prefix}-mb { margin-bottom: 20px !important; } +.#{$prefix}-ml { margin-left: 20px !important; } -.#{$prefix}-p { padding: 20px; } -.#{$prefix}-pt { padding-top: 20px; } -.#{$prefix}-pr { padding-right: 20px; } -.#{$prefix}-pb { padding-bottom: 20px; } -.#{$prefix}-pl { padding-left: 20px; } +.#{$prefix}-p { padding: 20px !important; } +.#{$prefix}-pt { padding-top: 20px !important; } +.#{$prefix}-pr { padding-right: 20px !important; } +.#{$prefix}-pb { padding-bottom: 20px !important; } +.#{$prefix}-pl { padding-left: 20px !important; } diff --git a/src/components/core/d2-layout-main/components/-help/index.vue b/src/components/core/d2-layout-main/components/-help/index.vue index 34f4817f..dfee67a1 100644 --- a/src/components/core/d2-layout-main/components/-help/index.vue +++ b/src/components/core/d2-layout-main/components/-help/index.vue @@ -11,11 +11,11 @@ - + - + diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue index 3dfd76e0..8a8013da 100644 --- a/src/components/core/d2-layout-main/components/-menu-side/index.vue +++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue @@ -1,6 +1,6 @@