From e81207a2a24ef76d5298994ddd797a6a4c9192c1 Mon Sep 17 00:00:00 2001 From: 梁灏 Date: Tue, 7 Feb 2017 11:34:00 +0800 Subject: [PATCH] update Tree --- src/components/tree/tree-node.vue | 13 ------------- src/components/tree/tree.vue | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- src/locale/lang/en-US.js | 3 +++ src/locale/lang/zh-CN.js | 3 +++ src/locale/lang/zh-TW.js | 3 +++ src/styles/components/tree.less | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- test/routers/tree.vue | 48 ++++++++++++++++++++++++++++++++++++++++-------- 7 files changed, 459 insertions(+), 27 deletions(-) delete mode 100644 src/components/tree/tree-node.vue diff --git a/src/components/tree/tree-node.vue b/src/components/tree/tree-node.vue deleted file mode 100644 index 5bc4676..0000000 --- a/src/components/tree/tree-node.vue +++ /dev/null @@ -1,13 +0,0 @@ - - \ No newline at end of file diff --git a/src/components/tree/tree.vue b/src/components/tree/tree.vue index 5bc4676..c0eebfb 100644 --- a/src/components/tree/tree.vue +++ b/src/components/tree/tree.vue @@ -1,13 +1,289 @@ \ No newline at end of file diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js index 9b21baf..ade42eb 100644 --- a/src/locale/lang/en-US.js +++ b/src/locale/lang/en-US.js @@ -87,6 +87,9 @@ export default { rate: { star: 'Star', stars: 'Stars' + }, + tree: { + emptyText: 'No Data' } } }; \ No newline at end of file diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js index c44f917..4e1c914 100644 --- a/src/locale/lang/zh-CN.js +++ b/src/locale/lang/zh-CN.js @@ -87,6 +87,9 @@ export default { rate: { star: '星', stars: '星' + }, + tree: { + emptyText: '暂无数据' } } }; \ No newline at end of file diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js index e7c8d6c..aa6fe1d 100644 --- a/src/locale/lang/zh-TW.js +++ b/src/locale/lang/zh-TW.js @@ -87,6 +87,9 @@ export default { rate: { star: '星', stars: '星' + }, + tree: { + emptyText: '暫無數據' } } }; \ No newline at end of file diff --git a/src/styles/components/tree.less b/src/styles/components/tree.less index 99927cb..d8279f8 100644 --- a/src/styles/components/tree.less +++ b/src/styles/components/tree.less @@ -1,5 +1,133 @@ @tree-prefix-cls: ~"@{css-prefix}tree"; .@{tree-prefix-cls} { - + margin: 0; + padding: 5px; + font-size: 12px; + li { + padding: 0; + margin: 7px 0; + list-style: none; + white-space: nowrap; + outline: 0; + a[draggable], + a[draggable="true"] { + user-select: none; + /* Required to make elements draggable in old WebKit */ + -khtml-user-drag: element; + -webkit-user-drag: element; + } + &.drag-over { + > a[draggable] { + background-color: @primary-color; + color: white; + opacity: 0.8; + } + } + &.drag-over-gap-top { + > a[draggable] { + border-top: 2px @primary-color solid; + } + } + &.drag-over-gap-bottom { + > a[draggable] { + border-bottom: 2px @primary-color solid; + } + } + &.filter-node { + > a { + color: @error-color!important; + font-weight: bold!important; + } + } + ul { + margin: 0; + padding: 0 0 0 18px; + } + a { + display: inline-block; + padding: 1px 5px; + border-radius: 2px; + margin: 0; + cursor: pointer; + text-decoration: none; + vertical-align: top; + color: #666; + transition: all 0.3s ease; + &:hover { + background-color: tint(@primary-color, 90%); + } + &.@{tree-prefix-cls}-node-selected { + background-color: tint(@primary-color, 80%); + } + } + span { + &.@{tree-prefix-cls}-checkbox { + margin: 2px 4px 0 0; + } + &.@{tree-prefix-cls}-switcher, + &.@{tree-prefix-cls}-iconEle { + margin: 0; + width: 16px; + height: 16px; + line-height: 16px; + display: inline-block; + vertical-align: middle; + border: 0 none; + cursor: pointer; + outline: none; + } + &.@{tree-prefix-cls}-icon_loading { + &:after { + display: inline-block; + //.iconfont-font("\e6a1"); + animation: loadingCircle 1s infinite linear; + color: @primary-color; + } + } + &.@{tree-prefix-cls}-switcher { + &.@{tree-prefix-cls}-switcher-noop { + cursor: auto; + } + &.@{tree-prefix-cls}-roots_open, + &.@{tree-prefix-cls}-center_open, + &.@{tree-prefix-cls}-bottom_open, + &.@{tree-prefix-cls}-noline_open { + //.antTreeSwitcherIcon(); + } + &.@{tree-prefix-cls}-roots_close, + &.@{tree-prefix-cls}-center_close, + &.@{tree-prefix-cls}-bottom_close, + &.@{tree-prefix-cls}-noline_close { + //.antTreeSwitcherIcon(); + //.ie-rotate(3); + &:after { + transform: rotate(270deg) scale(0.5); + } + } + } + } + } + &-child-tree { + display: none; + &-open { + display: block; + } + } + &-treenode-disabled { + >span, + >a, + >a span { + color: #ccc; + cursor: not-allowed; + } + } + &-icon__open { + margin-right: 2px; + vertical-align: top; + } + &-icon__close { + margin-right: 2px; + vertical-align: top; + } } \ No newline at end of file diff --git a/test/routers/tree.vue b/test/routers/tree.vue index 5bc4676..bc93b01 100644 --- a/test/routers/tree.vue +++ b/test/routers/tree.vue @@ -1,13 +1,45 @@ \ No newline at end of file + methods: { + selectFn(data){ + console.log(data); + }, + checkFn(data){ + console.log(data); + } + } + } + -- libgit2 0.21.4