diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 6c579c98..d04bed04 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -70,8 +70,7 @@ function sideBarPlugins () { 'data-export', 'data-import', 'i18n', - 'mock', - 'timeago' + 'mock' ] } diff --git a/docs/zh/components/markdown.md b/docs/zh/components/markdown.md index ce9132ef..1a0f8235 100644 --- a/docs/zh/components/markdown.md +++ b/docs/zh/components/markdown.md @@ -5,7 +5,7 @@ | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 | | --- | --- | --- | --- | --- | --- | | url | markdown文件地址 | 非 | String | | 无 | -| md | markdown内容 | 非 | String | | 无 | +| source | markdown内容 | 非 | String | | 无 | | highlight | 代码高亮 | 非 | Boolean | | false | | baidupan | 百度网盘分享链接显示优化 | 非 | Boolean | | true | @@ -26,7 +26,7 @@ const md = `# Header text` - + ``` ## 百度网盘分享链接优化 diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md index d71c350e..961128fb 100644 --- a/docs/zh/guide/README.md +++ b/docs/zh/guide/README.md @@ -34,7 +34,7 @@ d2admin-vue-element（以下简称 d2admin）是一个管理系统前端模板 * 图表自适应可拖拽大小的卡片容器（示例） * 简化剪贴板操作 * 简化Cookie操作 -* 时间计算工具 +* 时间日期计算工具 * 导入 Excel （ xlsx 格式 + CSV 格式 ） * 数据导出 Excel （ xlsx 格式 + CSV 格式 ） * 数据导出文本 diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index 3b623983..f0b14fae 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -10,11 +10,14 @@ * [ 修改 ] 路由注册回归最简单的写法 * [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 `d2-app-loading` 前缀 * [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-` -* [ 修复 ] 修复 `highlight` 组件和 `markdown` 组件的样式冲突 +* [ 修复 ] 修复 `d2-highlight` 组件和 `d2-markdown` 组件的样式冲突 * [ 修改 ] 内置组件名称统一改为 `d2-` 前缀，统一使用横线连接 (kebab-case) 风格 * [ 修改 ] 顶栏 logo 阴影删除 * [ 新增 ] 主题系统 * [ 新增 ] 三个主题，分别为 `d2admin 经典`，`简约线条`，`流星` +* [ 修改 ] `d2-markdown` 组件 `md` 参数改名为 `source` +* [ 修改 ] 删除了 `d2-markdown` 组件中图片的白色背景 +* [ 修改 ] 删除 `timeago` 插件，更换为更强大的 `dayjs` ## v1.0.0 diff --git a/docs/zh/plugins/timeago.md b/docs/zh/plugins/timeago.md deleted file mode 100644 index 6f80a927..00000000 --- a/docs/zh/plugins/timeago.md +++ /dev/null @@ -1,49 +0,0 @@ -# 时间差计算 - -``` js -import timeago from 'timeago.js' -export default { - data () { - return { - // 打开页面时间 - openPageDate: new Date(), - // 打开页面已经过去的时间 - openPageDateAgo: '', - // 打开页面时间计时器 - dateTimeRangeTimer: null, - // 起止时间 - dateTimeRange: [new Date(2018, 0, 1, 0, 0), new Date()], - // 上面起止时间的计算结果 - dateTimeRangeAgo: '' - } - }, - mounted () { - // 刷新打开页面过去的时间 - this.refreshOpenPageDateAgo() - this.dateTimeRangeTimer = setInterval(this.refreshOpenPageDateAgo, 1000) - // 刷新起止时间的计算结果 - this.refreshDateTimeRangeAgo() - }, - beforeDestroy () { - // 清空计时器 - clearInterval(this.dateTimeRangeTimer) - }, - watch: { - dateTimeRange () { - // 刷新起止时间的计算结果 - this.refreshDateTimeRangeAgo() - } - }, - methods: { - // 计算打开页面过了多久 - refreshOpenPageDateAgo () { - this.openPageDateAgo = timeago().format(this.openPageDate, 'zh_CN') - }, - // 计算起止时间间隔 - refreshDateTimeRangeAgo () { - const timeagoInstance = timeago(this.dateTimeRange[1]) - this.dateTimeRangeAgo = timeagoInstance.format(this.dateTimeRange[0], 'zh_CN') - } - } -} -``` \ No newline at end of file diff --git a/package.json b/package.json index 9d756c5d..380540b8 100755 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "axios": "^0.17.1", "clipboard-polyfill": "^2.4.1", "countup.js": "^1.9.3", + "dayjs": "^1.6.7", "element-ui": "^2.0.11", "file-saver": "^1.3.3", "github-markdown-css": "^2.10.0", @@ -31,7 +32,6 @@ "path-posix": "^1.0.0", "quill": "^1.3.4", "simplemde": "^1.11.2", - "timeago.js": "^3.0.2", "vue": "^2.5.2", "vue-grid-layout": "^2.1.11", "vue-i18n": "^7.4.2", diff --git a/src/assets/style/fixed/markdown.scss b/src/assets/style/fixed/markdown.scss index cd71054f..32438f58 100644 --- a/src/assets/style/fixed/markdown.scss +++ b/src/assets/style/fixed/markdown.scss @@ -7,4 +7,7 @@ h1, h2 { border-bottom: none; } + img { + background-color: transparent; + } } \ No newline at end of file diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index 33be9df6..2ac20e74 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -40,40 +40,26 @@ } // 边距相关 -.#{$prefix}-m { margin: $margin; } -.#{$prefix}-mt { margin-top: $margin; } -.#{$prefix}-mr { margin-right: $margin; } -.#{$prefix}-mb { margin-bottom: $margin; } -.#{$prefix}-ml { margin-left: $margin; } +$sizes: (0, 10, 15, 20); -.#{$prefix}-m-10 { margin: 10px; } -.#{$prefix}-mt-10 { margin-top: 10px; } -.#{$prefix}-mr-10 { margin-right: 10px; } -.#{$prefix}-mb-10 { margin-bottom: 10px; } -.#{$prefix}-ml-10 { margin-left: 10px; } +@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-0 { margin: 0px; } -.#{$prefix}-mt-0 { margin-top: 0px; } -.#{$prefix}-mr-0 { margin-right: 0px; } -.#{$prefix}-mb-0 { margin-bottom: 0px; } -.#{$prefix}-ml-0 { margin-left: 0px; } +// 快速使用 +.#{$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}-p { padding: $margin; } -.#{$prefix}-pt { padding-top: $margin; } -.#{$prefix}-pr { padding-right: $margin; } -.#{$prefix}-pb { padding-bottom: $margin; } -.#{$prefix}-pl { padding-left: $margin; } - -.#{$prefix}-p-10 { padding: 10px; } -.#{$prefix}-pt-10 { padding-top: 10px; } -.#{$prefix}-pr-10 { padding-right: 10px; } -.#{$prefix}-pb-10 { padding-bottom: 10px; } -.#{$prefix}-pl-10 { padding-left: 10px; } - -.#{$prefix}-p-0 { padding: 0px; } -.#{$prefix}-pt-0 { padding-top: 0px; } -.#{$prefix}-pr-0 { padding-right: 0px; } -.#{$prefix}-pb-0 { padding-bottom: 0px; } -.#{$prefix}-pl-0 { padding-left: 0px; } +.#{$prefix}-p { padding: 20px; } +.#{$prefix}-pt { padding-top: 20px; } +.#{$prefix}-pr { padding-right: 20px; } +.#{$prefix}-pb { padding-bottom: 20px; } +.#{$prefix}-pl { padding-left: 20px; } diff --git a/src/assets/style/public.scss b/src/assets/style/public.scss index 2fb6ad62..66aef37c 100644 --- a/src/assets/style/public.scss +++ b/src/assets/style/public.scss @@ -1,5 +1,4 @@ @import '~@/assets/style/unit/_color.scss'; -@import '~@/assets/style/unit/_size.scss'; // 工具类名统一前缀 $prefix: d2; diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss index 075996d9..acd1b0b5 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -13,7 +13,7 @@ $theme-container-border-outer: 1px solid $color-border-1; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849; -$theme-menu-item-background-color-hover: #ecf5ff; +$theme-menu-item-background-color-hover: #EFEFEF; // 顶栏上的文字颜色 $theme-header-item-color: $color-text-normal; diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index 0c16d9f7..b1376e6d 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -8,7 +8,7 @@ $theme-bg-image: '/static/image/bg/star-squashed.jpg'; // container组件 $theme-container-background-color: rgba(#FFF, .9); $theme-container-header-footer-background-color: rgba(#FFF, .6); -$theme-container-border-inner: 1px solid #8fb0b1; +$theme-container-border-inner: 1px solid #cecece; $theme-container-border-outer: none; // 顶栏和侧边栏中展开的菜单 hover 状态下 diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index 93198426..17c418d2 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -71,16 +71,6 @@ .el-aside { transition: width .3s; overflow: inherit; - // 空菜单 - .d2-side-menu-empty { - background-color: rgba(#000, .03); - margin: $margin; - margin-top: 0px; - border-radius: 4px; - line-height: 100px; - text-align: center; - color: $color-text-sub; - } // [菜单] 正常状态 .el-menu { background-color: transparent; diff --git a/src/assets/style/unit/_size.scss b/src/assets/style/unit/_size.scss deleted file mode 100644 index c85cb481..00000000 --- a/src/assets/style/unit/_size.scss +++ /dev/null @@ -1 +0,0 @@ -$margin: 20px; \ No newline at end of file diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 84d2eb84..832402ac 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -45,15 +45,11 @@ export default {