+
@@ -31,7 +31,7 @@
import Icon from 'packages/icon';
export default {
- name: 'van-deep-select',
+ name: 'van-tree-select',
components: {
'van-icon': Icon
@@ -40,9 +40,7 @@ export default {
props: {
items: {
type: Array,
- default () {
- return [];
- }
+ default: () => []
},
mainActiveIndex: {
type: Number,
@@ -73,12 +71,8 @@ export default {
},
methods: {
- onNavClick(index) {
- this.$emit('navclick', index);
- },
onItemSelect(data) {
- const exportData = Object.assign({}, data);
- this.$emit('itemclick', exportData);
+ this.$emit('itemclick', { ...data });
}
}
};
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 4907cbbe0..14b5f7b7b 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -12,7 +12,6 @@
@import './badge.css';
@import './button.css';
@import './cell.css';
-@import './cell-swipe.css';
@import './card.css';
@import './icon.css';
@import './loading.css';
@@ -42,10 +41,11 @@
@import './toast.css';
/* high order components */
+@import './cell-swipe.css';
@import './switch-cell.css';
+@import './tree-select.css';
/* business components */
-@import './deep-select.css';
@import './goods-action.css';
@import './notice-bar.css';
@import './coupon.css';
diff --git a/packages/vant-css/src/deep-select.css b/packages/vant-css/src/tree-select.css
similarity index 98%
rename from packages/vant-css/src/deep-select.css
rename to packages/vant-css/src/tree-select.css
index b2f4a3896..1e5bf24cd 100644
--- a/packages/vant-css/src/deep-select.css
+++ b/packages/vant-css/src/tree-select.css
@@ -2,7 +2,7 @@
@import "./mixins/clearfix.css";
@import './common/var.css';
-.van-deep-select {
+.van-tree-select {
user-select: none;
position: relative;
@mixin clearfix;
diff --git a/test/unit/specs/deep-select.spec.js b/test/unit/specs/tree-select.spec.js
similarity index 73%
rename from test/unit/specs/deep-select.spec.js
rename to test/unit/specs/tree-select.spec.js
index 3abc96add..8ee3bebf6 100644
--- a/test/unit/specs/deep-select.spec.js
+++ b/test/unit/specs/tree-select.spec.js
@@ -1,19 +1,19 @@
-import DeepSelect from 'packages/deep-select';
+import TreeSelect from 'packages/tree-select';
import { mount } from 'avoriaz';
-describe('DeepSelect', () => {
+describe('TreeSelect', () => {
let wrapper;
afterEach(() => {
wrapper && wrapper.destroy();
});
- it('create an empty deep-select', () => {
- wrapper = mount(DeepSelect);
+ it('create an empty tree-select', () => {
+ wrapper = mount(TreeSelect);
expect(wrapper.hasStyle('height', '0px')).to.be.true;
});
- it('create a deep-select correctly', () => {
- wrapper = mount(DeepSelect, {
+ it('create a tree-select correctly', () => {
+ wrapper = mount(TreeSelect, {
propsData: {
items: [{
text: 'A',
@@ -25,13 +25,13 @@ describe('DeepSelect', () => {
maxHeight: 200
}
});
- expect(wrapper.hasClass('van-deep-select')).to.be.true;
+ expect(wrapper.hasClass('van-tree-select')).to.be.true;
expect(wrapper.hasStyle('height', '44px')).to.be.true;
expect(wrapper.vm.maxHeight).to.equal(200);
});
it('interact with this component', () => {
- wrapper = mount(DeepSelect, {
+ wrapper = mount(TreeSelect, {
propsData: {
items: [{
text: 'A',
@@ -58,10 +58,10 @@ describe('DeepSelect', () => {
wrapper.vm.$on('itemclick', item => {
wrapper.vm.activeId = item.id;
});
- const secondNav = wrapper.find('.van-deep-select__nitem')[1];
+ const secondNav = wrapper.find('.van-tree-select__nitem')[1];
secondNav.trigger('click');
expect(wrapper.vm.mainActiveIndex).to.equal(1);
- const target = wrapper.find('.van-deep-select__item')[0];
+ const target = wrapper.find('.van-tree-select__item')[0];
target.trigger('click');
expect(wrapper.vm.activeId).to.equal(345);
});