From 8894c8ff0efc9fe2f2b97b0586c6a1390d5cf367 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 09:41:13 +0800 Subject: [PATCH 01/15] no message Former-commit-id: 3d8b84d439ca4cf54609a6c059fe9ee9a3071560 [formerly 24bb1920143dc12298095db7b4210dc589af76a4] [formerly 3d8b84d439ca4cf54609a6c059fe9ee9a3071560 [formerly 24bb1920143dc12298095db7b4210dc589af76a4] [formerly 3d8b84d439ca4cf54609a6c059fe9ee9a3071560 [formerly 24bb1920143dc12298095db7b4210dc589af76a4] [formerly 24bb1920143dc12298095db7b4210dc589af76a4 [formerly 7013c3efaa3532b7de6db287437f2fadb8c51904 [formerly 87ecac8a182ae7e7aed1bf8bf4ba74a9dc8217f7]]]]] Former-commit-id: f0fa9f1f9c743ec5099da23363653e290ab5113f Former-commit-id: af47c5ef4efd3d1a96eb9e8dccb63b6595375aa4 Former-commit-id: 1b47b41f1e5dfeda2896eba1089a420e42502165 [formerly a384404fc91435d8807ad54156de07d672be49e7] Former-commit-id: 26e55b5443490fb69c1f5acd69feb1298ab562d3 Former-commit-id: 50f66a9767f2407868accfac845ab3c9b90b6090 Former-commit-id: 04d9cba34672ccc4cf6d4105e571d431277bdbde Former-commit-id: 5b827bd2db0a7acfd51fa1d9216caec70999e174 Former-commit-id: fc2ea12785947aa58b42bf2ef186d0ef1291c1c9 --- package.json | 1 + src/menu/index.js | 1 + src/pages/demo/plugins/better-scroll/index.vue | 5 +++++ src/router/index.js.REMOVED.git-id | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/pages/demo/plugins/better-scroll/index.vue diff --git a/package.json b/package.json index d4f0f0f0..fa74fbf1 100755 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "@antv/data-set": "^0.8.5", "@antv/g2": "^3.0.4", "axios": "^0.17.1", + "better-scroll": "^1.12.1", "clipboard-polyfill": "^2.4.1", "countup.js": "^1.9.3", "dayjs": "^1.6.7", diff --git a/src/menu/index.js b/src/menu/index.js index bd54a5a2..6409ec50 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -38,6 +38,7 @@ const demoPlugins = { { path: `${pre}i18n/demo2`, title: '示例2' } ] }, + { path: `${pre}better-scroll`, title: '滚动扩展' }, { path: `${pre}build`, title: '环境区分' }, { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' }, { path: `${pre}day`, title: '日期计算' }, diff --git a/src/pages/demo/plugins/better-scroll/index.vue b/src/pages/demo/plugins/better-scroll/index.vue new file mode 100644 index 00000000..9a898568 --- /dev/null +++ b/src/pages/demo/plugins/better-scroll/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id index 90adffa6..a63cd4eb 100644 --- a/src/router/index.js.REMOVED.git-id +++ b/src/router/index.js.REMOVED.git-id @@ -1 +1 @@ -98262236d74b49a612e6be6ba8cac9307d0fc023 \ No newline at end of file +acce436f0c364afef426fe354636e19bbafdc5cd \ No newline at end of file From 0244114c87d3fba97c827f54dd831707b9c797f8 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 10:00:13 +0800 Subject: [PATCH 02/15] no message Former-commit-id: 753ffe544be5ab472fcb9e83ed82b57fb0dda4a4 [formerly 753ffe544be5ab472fcb9e83ed82b57fb0dda4a4 [formerly 753ffe544be5ab472fcb9e83ed82b57fb0dda4a4 [formerly 753ffe544be5ab472fcb9e83ed82b57fb0dda4a4 [formerly c0f8c370fed7a92ac1a0b4833948878722b954fd [formerly edd5cc521a1e47b69fe9674f0fd9d9249d8a71f5]]]]] Former-commit-id: c68870822b25fbdd9ba3ecb9fe03e7d7c05c326d Former-commit-id: 78411d0a76ff19872a628d80248252ea013a2502 Former-commit-id: 6ecd8979e3b9edcff14863f978d0d083ecfcdc9a [formerly 7b3df154cbec98fbe2bb677347f9605cf9bb1ae0] Former-commit-id: 6cc33e33ac1c2efc08aaf4b6deef9ca750f6f75c Former-commit-id: 4d816943ff608c1a16617563bc83c94e1c30d431 Former-commit-id: c816d141ccd21156dbf83d78a1cb83992544f68c Former-commit-id: aa66078fe1512dd58d6bf7aac629ab786d696f91 Former-commit-id: 285981be1ae6059c62797b79ea00da50b771cf1d --- src/menu/index.js | 8 +++++++- .../demo/plugins/better-scroll/{index.vue => base.vue} | 2 +- src/router/index.js.REMOVED.git-id | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) rename src/pages/demo/plugins/better-scroll/{index.vue => base.vue} (76%) diff --git a/src/menu/index.js b/src/menu/index.js index 6409ec50..f5046c46 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -38,7 +38,13 @@ const demoPlugins = { { path: `${pre}i18n/demo2`, title: '示例2' } ] }, - { path: `${pre}better-scroll`, title: '滚动扩展' }, + { + path: `${pre}better-scroll`, + title: '滚动扩展', + children: [ + { path: `${pre}better-scroll/base`, title: '基本用法' } + ] + }, { path: `${pre}build`, title: '环境区分' }, { path: `${pre}clipboard-polyfill`, title: '剪贴板访问' }, { path: `${pre}day`, title: '日期计算' }, diff --git a/src/pages/demo/plugins/better-scroll/index.vue b/src/pages/demo/plugins/better-scroll/base.vue similarity index 76% rename from src/pages/demo/plugins/better-scroll/index.vue rename to src/pages/demo/plugins/better-scroll/base.vue index 9a898568..18d60273 100644 --- a/src/pages/demo/plugins/better-scroll/index.vue +++ b/src/pages/demo/plugins/better-scroll/base.vue @@ -1,5 +1,5 @@ diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id index a63cd4eb..59c46fc6 100644 --- a/src/router/index.js.REMOVED.git-id +++ b/src/router/index.js.REMOVED.git-id @@ -1 +1 @@ -acce436f0c364afef426fe354636e19bbafdc5cd \ No newline at end of file +6a89e5af690b993ba243a817b218c2adfdc096fe \ No newline at end of file From 64c97eab5666edc56c1b78fdb51409d9dd87ca25 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 10:43:41 +0800 Subject: [PATCH 03/15] no message Former-commit-id: 942ed839bc09ec4d11a55be2f6fbe4f8d6df439d [formerly be692dd44006185b433dc3767d40aec7ff5f4f39] [formerly 942ed839bc09ec4d11a55be2f6fbe4f8d6df439d [formerly be692dd44006185b433dc3767d40aec7ff5f4f39] [formerly 942ed839bc09ec4d11a55be2f6fbe4f8d6df439d [formerly be692dd44006185b433dc3767d40aec7ff5f4f39] [formerly be692dd44006185b433dc3767d40aec7ff5f4f39 [formerly 651b779ff9927c242d4dd43e90ca2ce60089f9c1 [formerly 852767021079fceb79eea194a1777337d2b34974]]]]] Former-commit-id: 132da3693ac7721961ccc318e97622c0d9baf5f3 Former-commit-id: 6680b4199592acd3095f61ee09a267c82f1c8e5b Former-commit-id: c3d172aa8a2dc5b5a0b35c4c237c0deb987e4ae6 [formerly 5cfbbc8cf0b28a96975b67fc3bc534d396551ea9] Former-commit-id: f98e25baab2c5ab7ffde0b69381d0530cc328a05 Former-commit-id: 4158685fb6b6d7c2dbdfc3e0223bbd01dbde7a0b Former-commit-id: b39e352d626608c5be2f60ecdbe4594fc05b4ee6 Former-commit-id: 290d0326107c3b9928d10113c96be9d425d4ed21 Former-commit-id: 8fdbcf65d89798bab57cfbf3c303148fc198fc78 --- src/components/core/d2-container/index.vue | 3 ++ src/pages/demo/plugins/better-scroll/base.vue | 39 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 832402ac..3687d5de 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -36,6 +36,9 @@ export default { default: false } }, + mounted () { + this.$emit('mounted') + }, components: { 'd2-container-full': () => import('../d2-container-full/index.vue') } diff --git a/src/pages/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue index 18d60273..4046e040 100644 --- a/src/pages/demo/plugins/better-scroll/base.vue +++ b/src/pages/demo/plugins/better-scroll/base.vue @@ -1,5 +1,40 @@ + + + + + From f5e8b3775a4c4dd7ab25654ff1660430d08e44f4 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 10:45:03 +0800 Subject: [PATCH 04/15] no message Former-commit-id: ca90a4d9c710c32ec41485b210f5528f5c967724 [formerly ca90a4d9c710c32ec41485b210f5528f5c967724 [formerly ca90a4d9c710c32ec41485b210f5528f5c967724 [formerly ca90a4d9c710c32ec41485b210f5528f5c967724 [formerly ac946d3e65a32828a867d891fe25120ee3013e70 [formerly 335f892573c2269c6f82b726296bf5fd5b0c69a2]]]]] Former-commit-id: aab4e0419f7e3afb875b97df489b3b0ae7aa72ad Former-commit-id: 598c67b30a443bbd290c93ead43fc36742e3e2be Former-commit-id: 6e1a61fab317a8160f61b94cbb2f2b570a04b510 [formerly 303e2d12593bd6d42cee2201b340ca1856f96865] Former-commit-id: 7dc5cf92f1d3aa92910a8a70150f72a8e7774e3d Former-commit-id: 1b2e437aee62de93fb06606a30e9232ce4b1f5f2 Former-commit-id: 7ce720c4911352415091c7aea7bd6e8d55f81b49 Former-commit-id: b4488b858d1a901a77f0ed2c0ae97229ab207c26 Former-commit-id: c1d4d1a9e8d0272cab9fec3e3c50c5a4b6a13fe0 --- src/menu/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/menu/index.js b/src/menu/index.js index f5046c46..c9e1e38d 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -95,7 +95,7 @@ const demoComponents = { ] }, { path: `${pre}bigdata-table`, title: '百万数量级表格' }, - { path: `${pre}scrollbar`, title: '滚动条' }, + { path: `${pre}scrollbar`, title: 'ElementUI 滚动条组件' }, { path: `${pre}countup`, title: '数字动画' }, { path: `${pre}editor-quill`, title: '富文本编辑器' }, { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' }, From 640319e8d99eee3210da7e2f232daf7ec2dfb6aa Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 12:31:55 +0800 Subject: [PATCH 05/15] no message Former-commit-id: 05fc52460a4ae24f5efd3c3542589f1a26673c44 [formerly 05fc52460a4ae24f5efd3c3542589f1a26673c44 [formerly 05fc52460a4ae24f5efd3c3542589f1a26673c44 [formerly 05fc52460a4ae24f5efd3c3542589f1a26673c44 [formerly d064905a79e481ef3423e8e8d32be7ac9fa4aa6c [formerly 177c686212007bb4bdcfa2c8c56a892d172706a0]]]]] Former-commit-id: fb3b6c735a72d9a3f7d3084e3197e26d5b6117cb Former-commit-id: a5dedcb460e782daf493127f79fb453cc963350f Former-commit-id: bff81905ebda3a75d979d7e156e3d5cb93669793 [formerly 6e9be3ea0965938f7a238b37c97b1eba326af264] Former-commit-id: bd6c2196ebfd7ff6bd91d5e0dba3aaaea72dd0cf Former-commit-id: a1b0b61547d91fb6ace18dc0106024102ab68179 Former-commit-id: 0d2007b3ef6d1271f71bfa4e2f3efd280a2e8fa4 Former-commit-id: 419df941d92583c6deb543b1db63a713dd253887 Former-commit-id: 32a84359c24634ec4c4bd3135e0a9b5937a50dc9 --- docs/zh/guide/change-log.md | 21 +++++----- src/components/core/d2-container/index.vue | 3 -- src/components/core/register.js | 5 ++- src/pages/demo/plugins/better-scroll/base.vue | 40 ++++++++++++------- 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index cc7412da..eb241631 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -6,26 +6,27 @@ 这是正在开发的版本，还没有正式发布 ::: -* [ 修改 ] 顶栏和侧边栏菜单新的结构生成方式，新的方案使用 `数据` + `递归组件` 实现无限制多级菜单 +* [ 修改 ] 顶栏和侧边栏菜单新的结构生成方式，新的方案使用 数据 + 递归组件 实现无限制多级菜单 * [ 修改 ] 路由注册回归最简单的写法 -* [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 `d2-app-loading` 前缀 -* [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-` -* [ 修复 ] 修复 `d2-highlight` 组件和 `d2-markdown` 组件的样式冲突 -* [ 修改 ] 内置组件名称统一改为 `d2-` 前缀，统一使用横线连接 (kebab-case) 风格 +* [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 d2-app-loading 前缀 +* [ 修改 ] 所有类似 dd- 的样式前缀(包括自动注册图标的id前缀)统一改为 d2- +* [ 修复 ] 修复 d2-highlight 组件和 d2-markdown 组件的样式冲突 +* [ 修改 ] 内置组件名称统一改为 d2- 前缀，统一使用横线连接 (kebab-case) 风格 * [ 修改 ] 顶栏 logo 阴影删除 * [ 新增 ] 主题系统 * [ 新增 ] 三个主题，分别为 d2admin 经典，简约线条，流星 -* [ 修改 ] `d2-markdown` 组件 `md` 参数改名为 `source` -* [ 修改 ] 删除了 `d2-markdown` 组件中图片的白色背景 -* [ 修改 ] 删除 `timeago` 插件，更换为更强大的 `dayjs` -* [ 新增 ] `Tomorrow Night Blue` 主题 -* [ 修改 ] `src/assets/style/public-class.scss` 写法优化 +* [ 修改 ] d2-markdown 组件 md 参数改名为 source +* [ 修改 ] 删除了 d2-markdown 组件中图片的白色背景 +* [ 修改 ] 删除 timeago 插件，更换为更强大的 dayjs +* [ 新增 ] Tomorrow Night Blue 主题 +* [ 修改 ] src/assets/style/public-class.scss 写法优化 * [ 新增 ] [vue-bigdata-table](https://github.com/lison16/vue-bigdata-table)组件 * [ 修复 ] 侧边栏内容超过一屏后显示错误 * [ 新增 ] 自定义滚动条演示页面 * [ 新增 ] 流星主题新增背景图片上层的半透明遮罩 * [ 修复 ] 主题设置失效bug * [ 修复 ] router守卫验证登陆部分代码修改 +* [ 修复 ] d2-container 组件改为同步注册（之前的异步注册会有 mounted 生命周期问题，即 slot 内的页面在 mounted 生命周期内拿不到 dom） ## v1.0.0 diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 3687d5de..832402ac 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -36,9 +36,6 @@ export default { default: false } }, - mounted () { - this.$emit('mounted') - }, components: { 'd2-container-full': () => import('../d2-container-full/index.vue') } diff --git a/src/components/core/register.js b/src/components/core/register.js index d5c9854b..fffddae7 100644 --- a/src/components/core/register.js +++ b/src/components/core/register.js @@ -3,11 +3,14 @@ import Vue from 'vue' import { GridLayout, GridItem } from 'vue-grid-layout' import SplitPane from 'vue-splitpane' +// 主容器 +import d2Container from '@/components/core/d2-container' + Vue.component('d2-grid-layout', GridLayout) Vue.component('d2-grid-item', GridItem) Vue.component('SplitPane', SplitPane) -Vue.component('d2-container', () => import('@/components/core/d2-container')) +Vue.component('d2-container', d2Container) Vue.component('d2-count-up', () => import('@/components/core/d2-count-up')) Vue.component('d2-highlight', () => import('@/components/core/d2-highlight')) Vue.component('d2-icon', () => import('@/components/core/d2-icon')) diff --git a/src/pages/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue index 4046e040..8047a2e1 100644 --- a/src/pages/demo/plugins/better-scroll/base.vue +++ b/src/pages/demo/plugins/better-scroll/base.vue @@ -1,9 +1,9 @@ @@ -16,25 +16,35 @@ export default { BS: null } }, - methods: { - handleContainerMounted () { - console.log(this.$refs.wrapper) - let wrapper = this.$refs.wrapper - this.BS = new BScroll(wrapper, { - mouseWheel: true, - scrollbar: { - fade: true - } - }) - } + mounted () { + let wrapper = this.$refs.wrapper + this.BS = new BScroll(wrapper, { + mouseWheel: true, + scrollbar: { + fade: true + } + }) } } From c42ad45923e32a51d56a0252022e54572085e83b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 13:32:01 +0800 Subject: [PATCH 06/15] no message Former-commit-id: 63f4d371a0260677bd44db8ceb3af004a8373261 [formerly 63f4d371a0260677bd44db8ceb3af004a8373261 [formerly 63f4d371a0260677bd44db8ceb3af004a8373261 [formerly 63f4d371a0260677bd44db8ceb3af004a8373261 [formerly f7182f859150a21635c09cc195c7148601755e5f [formerly 7dd89561de98b79fb315b8f0d74a9b3c929ddf4e]]]]] Former-commit-id: 2a7c572d32164c0130da45c457dbe4fcac92a6e1 Former-commit-id: 00c962387af18e9da0f79968947afbb8fe2fa232 Former-commit-id: 8ce5585bb9b4929547c39f441d0a3a8684ac9547 [formerly 9658f3b1f02bd0bab471a7d7c0355e99dba1f2fd] Former-commit-id: 0ebad305d4c39c6c5a4f2ad1b7f37f27710deddd Former-commit-id: d78960ee0093d1569ac932aefa186124f0ab7201 Former-commit-id: 0f71d88c24af1f5b2ec8cf90ece46f7338fdd73a Former-commit-id: 485c45130570d9af769afd96e17275cddf6dff6a Former-commit-id: ab2275efbe91fbc8545a2177d74bf7f850d69d44 --- .../components/d2-container-full.vue} | 0 src/components/core/d2-container/index.vue | 3 +- src/menu/index.js | 3 +- src/pages/demo/plugins/better-scroll/base.vue | 4 +- src/pages/demo/plugins/better-scroll/to.vue | 90 +++++++++++++++++++ src/router/index.js.REMOVED.git-id | 2 +- 6 files changed, 97 insertions(+), 5 deletions(-) rename src/components/core/{d2-container-full/index.vue => d2-container/components/d2-container-full.vue} (100%) create mode 100644 src/pages/demo/plugins/better-scroll/to.vue diff --git a/src/components/core/d2-container-full/index.vue b/src/components/core/d2-container/components/d2-container-full.vue similarity index 100% rename from src/components/core/d2-container-full/index.vue rename to src/components/core/d2-container/components/d2-container-full.vue diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 832402ac..e521387a 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -20,6 +20,7 @@ diff --git a/src/menu/index.js b/src/menu/index.js index c9e1e38d..556dfa29 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -42,7 +42,8 @@ const demoPlugins = { path: `${pre}better-scroll`, title: '滚动扩展', children: [ - { path: `${pre}better-scroll/base`, title: '基本用法' } + { path: `${pre}better-scroll/base`, title: '基础用法' }, + { path: `${pre}better-scroll/to`, title: '滚动定位' } ] }, { path: `${pre}build`, title: '环境区分' }, diff --git a/src/pages/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue index 8047a2e1..edfd4f6e 100644 --- a/src/pages/demo/plugins/better-scroll/base.vue +++ b/src/pages/demo/plugins/better-scroll/base.vue @@ -1,5 +1,6 @@ From fa2d0a662f966794db4d8b19e9530e445dfb3fdc Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 14:56:51 +0800 Subject: [PATCH 12/15] no message Former-commit-id: 3a6a79d7297e603d62d91b7adbb5b09352cf4882 [formerly 3a6a79d7297e603d62d91b7adbb5b09352cf4882 [formerly 3a6a79d7297e603d62d91b7adbb5b09352cf4882 [formerly 3a6a79d7297e603d62d91b7adbb5b09352cf4882 [formerly 2c6bac9896d087d6011f350f94156bc75061ce14 [formerly 79e7ee40d5e76a99b60ad86ce05f984c67ef1a33]]]]] Former-commit-id: aa0c267c0863446425306b745248f5b1ddf70214 Former-commit-id: 483a468540f81cb4323eb7d500f68d1a2d56926f Former-commit-id: 29bc5eb86d2ffd958f18d634d58f5ca87b6afe15 [formerly 7008fb082e1ab316bd871d6681ee79fe3805372d] Former-commit-id: 48008ae9a7434719730cfd78c64930eda58b25a5 Former-commit-id: aa930edf93cc0ed378faf767913d887554db8f06 Former-commit-id: 77748b4d16d8c6694d676b244622f608560ea48c Former-commit-id: f9d6f36515ec0ae4ef9d0e57103f15d30dbafb0c Former-commit-id: 43d60d60e6170e9932a92862b83723e77222983a --- src/pages/demo/plugins/better-scroll/to.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/demo/plugins/better-scroll/to.vue b/src/pages/demo/plugins/better-scroll/to.vue index a2647120..5e0ea305 100644 --- a/src/pages/demo/plugins/better-scroll/to.vue +++ b/src/pages/demo/plugins/better-scroll/to.vue @@ -1,5 +1,5 @@ From 1391af29673b099375fcb1343eacd1ffe1527d41 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 15:10:27 +0800 Subject: [PATCH 14/15] no message Former-commit-id: ef05b67ed50af4a6a3a38ca54c3481d3ffa4a034 [formerly ef05b67ed50af4a6a3a38ca54c3481d3ffa4a034 [formerly ef05b67ed50af4a6a3a38ca54c3481d3ffa4a034 [formerly ef05b67ed50af4a6a3a38ca54c3481d3ffa4a034 [formerly 243a9e8c2f747334c70435aa075d1b2dab1c1c57 [formerly 9a63974b1b8184262a33c96881f4e8352cfbf7d2]]]]] Former-commit-id: 70c585fdf34fd9c06f98421be8b8567f04f16e93 Former-commit-id: 9135b9f82c167147e127aa2529bc45f00b747e4d Former-commit-id: 670e5670d5ba95950fff244f08a53978692c9a6a [formerly 0b8007c5af7efd0feaf8f77a8abe4b0855cf7654] Former-commit-id: f6e7fa0cb4cf8fe14e68f05a7f25238769caaa98 Former-commit-id: a8d541c4e4e13c40158fa328429accff8fe15a9e Former-commit-id: 2dd74edc49e2d32670e6116b579ff666602d3069 Former-commit-id: 3851d4ec7c753f2d0c110824849133cd0d9e01eb Former-commit-id: 99f17cb9fd72a1b108845de8504ee826e91216b5 --- src/pages/demo/plugins/better-scroll/base.vue | 5 +---- src/pages/demo/plugins/better-scroll/to.vue | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/pages/demo/plugins/better-scroll/base.vue b/src/pages/demo/plugins/better-scroll/base.vue index edfd4f6e..701c58ab 100644 --- a/src/pages/demo/plugins/better-scroll/base.vue +++ b/src/pages/demo/plugins/better-scroll/base.vue @@ -19,10 +19,7 @@ export default { }, mounted () { this.BS = new BScroll(this.$refs.wrapper, { - mouseWheel: true, - scrollbar: { - fade: true - } + mouseWheel: true }) } } diff --git a/src/pages/demo/plugins/better-scroll/to.vue b/src/pages/demo/plugins/better-scroll/to.vue index 47bd6530..93e085d9 100644 --- a/src/pages/demo/plugins/better-scroll/to.vue +++ b/src/pages/demo/plugins/better-scroll/to.vue @@ -52,10 +52,7 @@ export default { }, mounted () { this.BS = new BScroll(this.$refs.wrapper, { - mouseWheel: true, - scrollbar: { - fade: true - } + mouseWheel: true }) }, methods: { From ae7c3b715ec04fb307662e61161cff3e958d3934 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 16:33:01 +0800 Subject: [PATCH 15/15] no message Former-commit-id: 3809b566a7005544711ff11f6e39159cd06b796a [formerly 3809b566a7005544711ff11f6e39159cd06b796a [formerly 3809b566a7005544711ff11f6e39159cd06b796a [formerly 3809b566a7005544711ff11f6e39159cd06b796a [formerly 0dd1512f08621038c15ea0acc550c3a9cba0187e [formerly 307ea13875809a6e76d348ee37546374ac3b21eb]]]]] Former-commit-id: f48ac9e19b06d139675694f5ce6463533ee0c2db Former-commit-id: 81727e7d01546f0a0c99ebcffa8c748e4bb7ccc3 Former-commit-id: 5f049d0637655836ffbdf679622d87a7789ff563 [formerly 87f7c05f7d8ed6fb3c6f2317ff6a2bddb9c03f59] Former-commit-id: eb0590ce91b1369c2a4457d783233e73cb29b764 Former-commit-id: 0c145df5aa2b9cef2f320f053bb6727b36a1963e Former-commit-id: 1634bb2eb72c32dcf51dfe57ddd2b8a38b2ed2df Former-commit-id: 4c0d469985f8a39773be311cd04b36c921a9f4a1 Former-commit-id: b7848744df40b995b00316a57633e3bfc6f7f782 --- design.sketch.REMOVED.git-id | 2 +- docs/zh/guide/change-log.md | 2 ++ src/pages/core/404/index.vue | 24 +++++++++++++++++++ src/router/index.js.REMOVED.git-id | 2 +- .../page/404/cover@2x.png.REMOVED.git-id | 1 + 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/pages/core/404/index.vue create mode 100644 static/image/page/404/cover@2x.png.REMOVED.git-id diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id index d1b872e8..5902db6b 100644 --- a/design.sketch.REMOVED.git-id +++ b/design.sketch.REMOVED.git-id @@ -1 +1 @@ -4b819d117b3b7e87effa763dbb04ba3280622cf1 \ No newline at end of file +161855f41fee4ef5f7f2cf7f5285cd68edea3007 \ No newline at end of file diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index eb241631..22370e5c 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -27,6 +27,8 @@ * [ 修复 ] 主题设置失效bug * [ 修复 ] router守卫验证登陆部分代码修改 * [ 修复 ] d2-container 组件改为同步注册（之前的异步注册会有 mounted 生命周期问题，即 slot 内的页面在 mounted 生命周期内拿不到 dom） +* [ 修复 ] d2-container 组件重构 flex 布局 +* [ 新增 ] 404 page ## v1.0.0 diff --git a/src/pages/core/404/index.vue b/src/pages/core/404/index.vue new file mode 100644 index 00000000..7bc892c7 --- /dev/null +++ b/src/pages/core/404/index.vue @@ -0,0 +1,24 @@ + + + + diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id index 093d2dea..379cbd2d 100644 --- a/src/router/index.js.REMOVED.git-id +++ b/src/router/index.js.REMOVED.git-id @@ -1 +1 @@ -d7679ad7cc0f1a79073949aee6e15694c6858000 \ No newline at end of file +ddf919108dc68f1f7811c033e619dd82d94ef14c \ No newline at end of file diff --git a/static/image/page/404/cover@2x.png.REMOVED.git-id b/static/image/page/404/cover@2x.png.REMOVED.git-id new file mode 100644 index 00000000..79cb9eea --- /dev/null +++ b/static/image/page/404/cover@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +139f15ecdee8d06f66d7fb57a30f6ec9e76b6103 \ No newline at end of file