From 551c5e718d2f3ecc06e8ac20972f64deaa455a26 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 12 Feb 2018 11:47:57 +0800
Subject: [PATCH] update select

---
 components/vc-select/DropdownMenu.vue  |   1 -
 components/vc-select/Select.vue        | 108 +++++++++++++++++++++----
 components/vc-select/demo/combobox.vue |   7 +-
 components/vc-select/util.js           |   6 +-
 4 files changed, 99 insertions(+), 23 deletions(-)

diff --git a/components/vc-select/DropdownMenu.vue b/components/vc-select/DropdownMenu.vue
index b81ea771b..347617414 100644
--- a/components/vc-select/DropdownMenu.vue
+++ b/components/vc-select/DropdownMenu.vue
@@ -105,7 +105,6 @@ export default {
           props: {
             multiple,
             defaultActiveFirst: defaultActiveFirstOption,
-            focusable: false,
             selectedKeys,
             prefixCls: `${prefixCls}-menu`,
           },
diff --git a/components/vc-select/Select.vue b/components/vc-select/Select.vue
index 18116d333..7dd4d2296 100644
--- a/components/vc-select/Select.vue
+++ b/components/vc-select/Select.vue
@@ -5,6 +5,7 @@ import classnames from 'classnames'
 import classes from 'component-classes'
 import { Item as MenuItem, ItemGroup as MenuItemGroup } from '../vc-menu'
 import warning from 'warning'
+import Option from './Option'
 import { hasProp, getSlotOptions } from '../_util/props-util'
 import getTransitionProps from '../_util/getTransitionProps'
 import { cloneElement, getClass, getPropsData, getValueByProp as getValue, getEvents } from '../_util/vnode'
@@ -93,6 +94,10 @@ export default {
     if (sOpen === undefined) {
       sOpen = defaultOpen
     }
+    this._valueOptions = []
+    if (sValue.length > 0) {
+      this._valueOptions = this.getOptionsByValue(sValue)
+    }
     return {
       sValue,
       inputValue,
@@ -259,14 +264,10 @@ export default {
       const selectedValue = getValuePropValue(item)
       const selectedLabel = this.getLabelFromOption(item)
       const lastValue = sValue[sValue.length - 1]
-      let event = selectedValue
-      if (props.labelInValue) {
-        event = {
-          key: event,
-          label: selectedLabel,
-        }
-      }
-      this.__emit('select', event, item)
+      this.fireSelect({
+        key: selectedValue,
+        label: selectedLabel,
+      })
       const selectedTitle = item.title
       if (isMultipleOrTags(props)) {
         if (findIndexInValueByKey(sValue, selectedValue) !== -1) {
@@ -366,7 +367,6 @@ export default {
         return
       }
       this.blurTimer = setTimeout(() => {
-        console.log('onOuterBlur setTimeout')
         this._focused = false
         this.updateFocusClassName()
         const props = this.$props
@@ -392,13 +392,11 @@ export default {
             }
           }
         } else if (isMultipleOrTags(props) && inputValue) {
-        // why not use setState?
           this.inputValue = this.getInputDOMNode().value = ''
         }
         this.__emit('blur', this.getVLForOnChange(sValue))
         this.setOpenState(false)
       }, 10)
-      console.log('this.blurTimer', this.blurTimer)
     },
 
     onClearSelection (event) {
@@ -422,12 +420,78 @@ export default {
       } else {
         event.stopPropagation()
       }
+      // const { inputValue, sValue, disabled } = this
+      // if (disabled) {
+      //   return
+      // }
+      // event.stopPropagation()
+      // if (inputValue || sValue.length) {
+      //   if (sValue.length) {
+      //     this.fireChange([])
+      //   }
+      //   this.setOpenState(false, true)
+      //   if (inputValue) {
+      //     this.setInputValue('')
+      //   }
+      // }
     },
 
     onChoiceAnimationLeave () {
       this.$refs.selectTriggerRef.triggerRef.forcePopupAlign()
     },
+    getOptionsFromChildren (value, children = [], options = []) {
+      let values = value
+      if (!Array.isArray(value)) {
+        values = [value]
+      }
+      children.forEach(child => {
+        if (!child) {
+          return
+        }
+        if (getSlotOptions(child).isSelectOptGroup) {
+          this.getOptionsFromChildren(child.componentOptions.children, options)
+        } else {
+          const index = findIndexInValueByKey(values, getValuePropValue(child))
+          if (index !== -1) {
+            options[index] = child
+          }
+        }
+      })
+      values.forEach((v, i) => {
+        if (!options[i]) {
+          for (let j = 0; j < this._valueOptions.length; j++) {
+            const item = this._valueOptions[j]
+            if (getValuePropValue(item) === v.key) {
+              options[i] = item
+              break
+            }
+          }
+          if (!options[i]) {
+            options[i] = <Option value={v.key} key={v.key}>{v.label}</Option>
+          }
+        }
+      })
+      if (!Array.isArray(value)) {
+        return options[0]
+      }
+      return options
+    },
+    getSingleOptionByValueKey (key) {
+      return this.getOptionsFromChildren({
+        key,
+        label: key,
+      }, this.$slots.default)
+    },
 
+    getOptionsByValue (value) {
+      if (value === undefined) {
+        return undefined
+      }
+      if (value.length === 0) {
+        return []
+      }
+      return this.getOptionsFromChildren(value, this.$slots.default)
+    },
     getLabelBySingleValue (children, value) {
       if (value === undefined) {
         return null
@@ -571,12 +635,14 @@ export default {
           if (options.length) {
             const firstOption = findFirstMenuItem(options)
             if (firstOption) {
+              console.log('pre', this.sValue)
               sValue = [
                 {
                   key: firstOption.key,
                   label: this.getLabelFromOption(firstOption),
                 },
               ]
+              console.log('new', this.sValue, sValue)
               this.fireChange(sValue)
             }
           }
@@ -812,7 +878,6 @@ export default {
             this._focused = true
           }
         } else {
-          console.log(activeElement)
           if (activeElement !== this.$refs.selectionRef) {
             this.$refs.selectionRef.focus()
             this._focused = true
@@ -880,7 +945,7 @@ export default {
             label,
           }
         }
-        this.__emit('deselect', event)
+        this.__emit('deselect', event, this.getSingleOptionByValueKey(selectedKey))
       }
       this.fireChange(value)
     },
@@ -891,14 +956,20 @@ export default {
         this.setOpenState(true)
       }
     },
-
+    fireSelect (value) {
+      const { labelInValue } = this
+      this.__emit('select', labelInValue ? value : value.key, this.getSingleOptionByValueKey(value.key))
+    },
     fireChange (value) {
       if (hasProp(this, 'value')) {
         this.setState({
           sValue: value,
         })
       }
-      this.__emit('change', this.getVLForOnChange(value))
+      const vls = this.getVLForOnChange(value)
+      const options = this.getOptionsByValue(value)
+      this._valueOptions = options
+      this.__emit('change', vls, isMultipleOrTags(this.$props) ? options : options[0])
     },
 
     isChildDisabled (key) {
@@ -924,6 +995,10 @@ export default {
             nextValue = nextValue.concat(selectedValue)
           }
         }
+        this.fireSelect({
+          key: label,
+          label,
+        })
       })
       return nextValue
     },
@@ -1439,9 +1514,10 @@ export default {
       >
         <div
           ref='rootRef'
+          class={classnames(rootCls)}
+          // tabindex='-1'
           // onBlur={this.onOuterBlur}
           // onFocus={this.onOuterFocus}
-          class={classnames(rootCls)}
         >
           <div {...selectionProps}>
             {ctrlNode}
diff --git a/components/vc-select/demo/combobox.vue b/components/vc-select/demo/combobox.vue
index 432966444..9c32b9cbd 100644
--- a/components/vc-select/demo/combobox.vue
+++ b/components/vc-select/demo/combobox.vue
@@ -10,7 +10,8 @@ export default {
     }
   },
   methods: {
-    onChange (value) {
+    onChange (value, option) {
+      console.log('onChange', value, option)
       this.value = value
     },
 
@@ -20,8 +21,8 @@ export default {
       }
     },
 
-    onSelect (v) {
-      console.log('onSelect', v)
+    onSelect (v, option) {
+      console.log('onSelect', v, option)
     },
 
     toggleDisabled () {
diff --git a/components/vc-select/util.js b/components/vc-select/util.js
index d6b8f1a61..be2c88cc6 100644
--- a/components/vc-select/util.js
+++ b/components/vc-select/util.js
@@ -118,8 +118,8 @@ export const UNSELECTABLE_ATTRIBUTE = {
 export function findFirstMenuItem (children) {
   for (let i = 0; i < children.length; i++) {
     const child = children[i]
-    const props = getSlotOptions(child)
-    if (props.isMenuItemGroup) {
+    const props = getPropsData(child)
+    if (getSlotOptions(child).isMenuItemGroup) {
       const found = findFirstMenuItem(child.componentOptions.children)
       if (found) {
         return found
@@ -146,7 +146,7 @@ export function splitBySeparators (string, separators) {
 }
 
 export function defaultFilterFn (input, child) {
-  const props = getSlotOptions(child)
+  const props = getPropsData(child)
   if (props.disabled) {
     return false
   }