From 75d5500f22353045a6cd5d5244242ba843feba91 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 9 Jun 2018 22:39:05 +0800 Subject: [PATCH] no message Former-commit-id: a8eedd7adb445496ea8c379c44d345177e48ba7e Former-commit-id: ee9798c5c6e9aec53895e9c83f605ce5052321c2 Former-commit-id: 4b13e4bf2f99ca15163fdc85eae32c561d55d3bc --- build/webpack.base.conf.js | 2 +- docs/zh/guide/change-log.md | 2 ++ src/assets/style/public.scss | 2 +- src/assets/style/theme/star/index.scss | 10 +++++----- src/assets/style/theme/theme.scss | 14 +++++++------- src/components/core/Container/index.vue | 4 ++-- src/components/core/ContainerFull/index.vue | 8 ++++---- src/components/core/IconSelect/index.vue | 4 ++-- src/components/core/IconSvg/index.vue | 2 +- .../HeaderRight/components/FullScreen.vue | 2 +- .../HeaderRight/components/UserDropdown.vue | 2 +- .../MainLayout/components/HeaderRight/index.vue | 2 +- .../core/MainLayout/components/SideMenu/index.vue | 2 +- src/components/demo/GithubLinkButton/index.vue | 4 ++-- src/components/demo/PageHeader/index.vue | 6 +++--- src/components/demo/PageIndexArticle/index.vue | 2 +- .../demo/chart/all/components/ChartCardHeader.vue | 2 +- src/pages/demo/chart/demo/PieBase.vue | 2 +- src/pages/demo/chart/demo/areaBase.vue | 2 +- src/pages/demo/chart/demo/barBase.vue | 2 +- src/pages/demo/chart/demo/columnBase.vue | 2 +- src/pages/demo/chart/demo/lineBase.vue | 2 +- src/pages/demo/chart/demo/lineStep.vue | 2 +- src/pages/demo/chart/demo/nightingaleRoseBase.vue | 2 +- src/pages/demo/chart/demo/radarBase.vue | 2 +- .../dynamicSize/components/ChartCardHeader.vue | 2 +- src/pages/demo/components/editor-quill/index.vue | 2 +- .../demo/components/editor-simpleMDE/index.vue | 2 +- src/pages/demo/components/highlight/index.vue | 10 +++++----- src/pages/demo/components/icon/icon.vue | 2 +- src/pages/demo/components/icon/list.vue | 4 ++-- src/pages/demo/components/icon/select.vue | 2 +- src/pages/demo/components/icon/svg.vue | 2 +- src/pages/demo/components/layout/grid.vue | 6 +++--- .../demo/plugins/clipboard-polyfill/index.vue | 6 +++--- src/pages/demo/plugins/export/table.vue | 4 ++-- src/pages/demo/plugins/export/txt.vue | 2 +- .../plugins/i18n/components/DemoI18nControl.vue | 2 +- src/pages/demo/plugins/import/csv.vue | 6 +++--- src/pages/demo/plugins/import/xlsx.vue | 6 +++--- src/pages/demo/plugins/js-cookie/index.vue | 4 ++-- src/pages/demo/plugins/mock/ajax.vue | 2 +- .../demo/plugins/mock/components/MockDemoCard.vue | 6 +++--- src/pages/demo/plugins/mock/dpd.vue | 2 +- src/pages/demo/plugins/mock/dtd.vue | 2 +- src/pages/demo/plugins/timeago/index.vue | 10 +++++----- 46 files changed, 86 insertions(+), 84 deletions(-) diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 44c21ea9..b1fe7c87 100755 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -57,7 +57,7 @@ module.exports = { loader: 'svg-sprite-loader', include: [resolve('src/assets/icons/svg')], options: { - symbolId: 'dd-[name]' + symbolId: 'd2-[name]' } }, { diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index a47b5d70..032ee1fa 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -8,6 +8,8 @@ * [ 修改 ] 顶栏和侧边栏菜单新的结构生成方式，新的方案使用 `数据` + `递归组件` 实现无限制多级菜单 * [ 修改 ] 路由注册回归最简单的写法 +* [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 `d2-app-loading` 前缀 +* [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-` ## v1.0.0 diff --git a/src/assets/style/public.scss b/src/assets/style/public.scss index 3ea57924..2fb6ad62 100644 --- a/src/assets/style/public.scss +++ b/src/assets/style/public.scss @@ -2,7 +2,7 @@ @import '~@/assets/style/unit/_size.scss'; // 工具类名统一前缀 -$prefix: dd; +$prefix: d2; // 禁止用户选中 鼠标变为手形 %unable-select { diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss index b8c4c0df..84e05a10 100644 --- a/src/assets/style/theme/star/index.scss +++ b/src/assets/style/theme/star/index.scss @@ -28,12 +28,12 @@ $theme-container-full-border-color: #d8dfea; .el-menu--horizontal .el-menu .el-submenu__title:hover { @include theme-menu-hover-style; } - // [组件] dd-container-full - .dd-container-full { - .dd-container-full__header { + // [组件] d2-container-full + .d2-container-full { + .d2-container-full__header { border-bottom: 1px solid $theme-container-full-border-color; } - .dd-container-full__footer { + .d2-container-full__footer { border-top: 1px solid $theme-container-full-border-color; } } @@ -80,7 +80,7 @@ $theme-container-full-border-color: #d8dfea; } } // 顶栏右侧 - .dd-header-right { + .d2-header-right { .btn-text { color: #FFF; } diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index aa74877c..3a07e49f 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -46,7 +46,7 @@ } } // 顶栏右侧的按钮 - .dd-header-right { + .d2-header-right { float: right; height: 60px; display: flex; @@ -64,7 +64,7 @@ transition: width .3s; overflow: inherit; // 空菜单 - .dd-side-menu-empty { + .d2-side-menu-empty { background-color: rgba(#000, .03); margin: $margin; margin-top: 0px; @@ -109,8 +109,8 @@ overflow: hidden; } } - // [组件] dd-container-full - .dd-container-full { + // [组件] d2-container-full + .d2-container-full { position: absolute; border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -120,7 +120,7 @@ &:hover { box-shadow: none; } - .dd-container-full__header { + .d2-container-full__header { position: absolute; top: 0px; left: 0px; @@ -128,7 +128,7 @@ padding: 18px 20px; box-sizing: border-box; } - .dd-container-full__body { + .d2-container-full__body { position: absolute; padding: 20px; left: 0px; @@ -136,7 +136,7 @@ bottom: 0px; overflow: auto; } - .dd-container-full__footer { + .d2-container-full__footer { position: absolute; bottom: 0px; left: 0px; diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue index 39e5a90a..f004270c 100644 --- a/src/components/core/Container/index.vue +++ b/src/components/core/Container/index.vue @@ -1,12 +1,12 @@