diff --git a/components/_util/BaseMixin.js b/components/_util/BaseMixin.js index cdbd3fd87..1897d3cfe 100644 --- a/components/_util/BaseMixin.js +++ b/components/_util/BaseMixin.js @@ -1,4 +1,3 @@ -import { getOptionProps } from './props-util' export default { directives: { @@ -17,9 +16,9 @@ export default { methods: { setState (state, callback) { const newState = typeof state === 'function' ? state(this.$data) : state - if (this.getDerivedStateFromProps) { - Object.assign(newState, this.getDerivedStateFromProps(getOptionProps(this), this.$data, true) || {}) - } + // if (this.getDerivedStateFromProps) { + // Object.assign(newState, this.getDerivedStateFromProps(getOptionProps(this), { ...this.$data, ...newState }, true) || {}) + // } Object.assign(this.$data, newState) this.$nextTick(() => { callback && callback() diff --git a/components/tree-select/__tests__/__snapshots__/demo.test.js.snap b/components/tree-select/__tests__/__snapshots__/demo.test.js.snap index 1d75453ce..42922c124 100644 --- a/components/tree-select/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tree-select/__tests__/__snapshots__/demo.test.js.snap @@ -1,25 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./components/tree-select/demo/basic.md correctly 1`] = ` -Please select -`; +exports[`renders ./components/tree-select/demo/basic.md correctly 1`] = `Please select`; exports[`renders ./components/tree-select/demo/checkable.md correctly 1`] = ` -
  • Node1
    • -
  •  
    • -
     -     +
    +
  •  
    • +
    +     `; exports[`renders ./components/tree-select/demo/multiple.md correctly 1`] = ` -
  •  
    • +
  •  
    • Please select     `; -exports[`renders ./components/tree-select/demo/treeData.md correctly 1`] = ` -Please select -`; +exports[`renders ./components/tree-select/demo/suffix.md correctly 1`] = `Please select`; + +exports[`renders ./components/tree-select/demo/treeData.md correctly 1`] = `Please select`; diff --git a/components/tree-select/demo/basic.md b/components/tree-select/demo/basic.md index 735280343..39cdbfece 100644 --- a/components/tree-select/demo/basic.md +++ b/components/tree-select/demo/basic.md @@ -22,7 +22,7 @@ The most basic usage. > - + @@ -39,12 +39,13 @@ The most basic usage. export default { data () { return { + treeExpandedKeys: [], value: undefined, } }, methods: { onChange (value) { - console.log(arguments) + console.log(value) this.value = value }, }, diff --git a/components/tree-select/demo/checkable.md b/components/tree-select/demo/checkable.md index 9abca3780..49be73220 100644 --- a/components/tree-select/demo/checkable.md +++ b/components/tree-select/demo/checkable.md @@ -18,7 +18,6 @@ Multiple and checkable. treeCheckable :showCheckedStrategy="SHOW_PARENT" searchPlaceholder='Please select' - treeNodeFilterProp='label' /> @@ -27,29 +26,29 @@ import { TreeSelect } from 'ant-design-vue' const SHOW_PARENT = TreeSelect.SHOW_PARENT const treeData = [{ - label: 'Node1', + title: 'Node1', value: '0-0', key: '0-0', children: [{ - label: 'Child Node1', + title: 'Child Node1', value: '0-0-0', key: '0-0-0', }], }, { - label: 'Node2', + title: 'Node2', value: '0-1', key: '0-1', children: [{ - label: 'Child Node3', + title: 'Child Node3', value: '0-1-0', key: '0-1-0', disabled: true, }, { - label: 'Child Node4', + title: 'Child Node4', value: '0-1-1', key: '0-1-1', }, { - label: 'Child Node5', + title: 'Child Node5', value: '0-1-2', key: '0-1-2', }], @@ -64,7 +63,7 @@ export default { }, methods: { onChange (value) { - console.log('onChange ', value, arguments) + console.log('onChange ', value) this.value = value }, }, diff --git a/components/tree-select/demo/index.vue b/components/tree-select/demo/index.vue index a0e0f736d..7a74cb360 100644 --- a/components/tree-select/demo/index.vue +++ b/components/tree-select/demo/index.vue @@ -3,6 +3,7 @@ import Basic from './basic' import Checkable from './checkable' import Multiple from './multiple' import TreeData from './treeData' +import Suffix from './suffix' import CN from '../index.zh-CN.md' import US from '../index.en-US.md' @@ -35,6 +36,7 @@ export default { +