From bb0b629c311c2bff9fd1ae7ac9fe25f26714d813 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 25 Jan 2018 16:29:23 +0800 Subject: [PATCH] add theme --- components/_util/vnode.js | 7 +- components/button/demo/index.vue | 6 +- components/icon/demo/index.vue | 60 +++ components/icon/icon.vue | 9 +- components/icon/index.en-US.md | 13 + components/icon/index.zh-CN.md | 14 + components/menu/src/MenuMixin.js | 2 +- components/trigger/index.vue | 5 +- examples/components/IconSet/CopyableIcon.vue | 37 ++ examples/components/IconSet/index.vue | 40 ++ examples/components/api.vue | 6 +- examples/components/demo.vue | 2 +- examples/components/demoBox.vue | 56 ++- examples/components/md.vue | 9 +- examples/demo.js | 1 + examples/index.js | 3 + examples/index.less | 150 ++----- examples/theme/static/colors.less | 170 ++++++++ examples/theme/static/common.less | 132 +++++++ examples/theme/static/demo.less | 261 +++++++++++++ examples/theme/static/docsearch.less | 22 ++ examples/theme/static/footer.less | 71 ++++ examples/theme/static/header.less | 144 +++++++ examples/theme/static/highlight.less | 153 ++++++++ examples/theme/static/home.less | 366 +++++++++++++++++ examples/theme/static/icons.less | 66 ++++ examples/theme/static/index.less | 22 ++ examples/theme/static/markdown.less | 325 +++++++++++++++ examples/theme/static/mock-browser.less | 53 +++ examples/theme/static/motion.less | 39 ++ .../theme/static/new-version-info-modal.less | 23 ++ examples/theme/static/not-found.less | 35 ++ examples/theme/static/nprogress.less | 62 +++ examples/theme/static/page-nav.less | 61 +++ examples/theme/static/preview-img.less | 159 ++++++++ examples/theme/static/resource.less | 71 ++++ examples/theme/static/responsive.less | 369 ++++++++++++++++++ examples/theme/static/theme.less | 4 + examples/theme/static/toc.less | 64 +++ package.json | 3 +- webpack.base.config.js | 18 +- 41 files changed, 2958 insertions(+), 155 deletions(-) create mode 100644 components/icon/demo/index.vue create mode 100644 components/icon/index.en-US.md create mode 100644 components/icon/index.zh-CN.md create mode 100644 examples/components/IconSet/CopyableIcon.vue create mode 100644 examples/components/IconSet/index.vue create mode 100644 examples/theme/static/colors.less create mode 100644 examples/theme/static/common.less create mode 100644 examples/theme/static/demo.less create mode 100644 examples/theme/static/docsearch.less create mode 100644 examples/theme/static/footer.less create mode 100644 examples/theme/static/header.less create mode 100644 examples/theme/static/highlight.less create mode 100644 examples/theme/static/home.less create mode 100644 examples/theme/static/icons.less create mode 100644 examples/theme/static/index.less create mode 100644 examples/theme/static/markdown.less create mode 100644 examples/theme/static/mock-browser.less create mode 100644 examples/theme/static/motion.less create mode 100644 examples/theme/static/new-version-info-modal.less create mode 100644 examples/theme/static/not-found.less create mode 100644 examples/theme/static/nprogress.less create mode 100644 examples/theme/static/page-nav.less create mode 100644 examples/theme/static/preview-img.less create mode 100644 examples/theme/static/resource.less create mode 100644 examples/theme/static/responsive.less create mode 100644 examples/theme/static/theme.less create mode 100644 examples/theme/static/toc.less diff --git a/components/_util/vnode.js b/components/_util/vnode.js index 3919d75d4..2df7e56b8 100644 --- a/components/_util/vnode.js +++ b/components/_util/vnode.js @@ -46,7 +46,7 @@ export function cloneVNodes (vnodes, deep) { export function cloneElement (n, nodeProps, clone) { const node = clone ? cloneVNode(n, true) : n - const { props = {}, key, on = {}} = nodeProps + const { props = {}, key, on = {}, listeners = {}} = nodeProps const data = node.data || {} const { style = data.style, class: cls = data.class, @@ -58,10 +58,9 @@ export function cloneElement (n, nodeProps, clone) { node.componentOptions.propsData = node.componentOptions.propsData || {} node.componentOptions.listeners = node.componentOptions.listeners || {} node.componentOptions.propsData = { ...node.componentOptions.propsData, ...props } - node.componentOptions.listeners = { ...node.componentOptions.listeners, ...on } - } else { - node.data.on = { ...(node.data.on || {}), ...on } + node.componentOptions.listeners = { ...node.componentOptions.listeners, ...listeners } } + node.data.on = { ...(node.data.on || {}), ...on } if (key !== undefined) { node.key = key diff --git a/components/button/demo/index.vue b/components/button/demo/index.vue index 4937897eb..ef9369aa6 100644 --- a/components/button/demo/index.vue +++ b/components/button/demo/index.vue @@ -25,7 +25,7 @@ export default { } return (