fix: #1407

XiaoMi · Dec 9, 2020 · ee03ebd · ee03ebd
1 parent 7d97a9d
commit ee03ebd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 3.2.1
 
-- 新增 `SelectTree` renderInputContent 自定义渲染 Input 中展示内容 [#1407](https://github.com/XiaoMi/hiui/issues/1407)
+- 新增 `SelectTree` valueRender 自定义渲染 Input 中展示内容 [#1407](https://github.com/XiaoMi/hiui/issues/1407)
 
 ## 3.2.0
 

diff --git a/components/select-tree/SelectTreeHook.js b/components/select-tree/SelectTreeHook.js
@@ -47,7 +47,7 @@ const SelectTree = ({
   localeDatas,
   placeholder: propsPlaceholder,
   style,
-  renderInputContent,
+  valueRender,
   optionWidth,
   placement = 'top-bottom-start'
 }) => {
@@ -236,7 +236,7 @@ const SelectTree = ({
       semiChecked: []
     })
     onChange && onChange()
-  }, [])
+  }, [onChange])
 
   /**
    * set Pull Data status
@@ -338,12 +338,15 @@ const SelectTree = ({
   /**
    * Node selected Event
    */
-  const selectedEvents = useCallback((node) => {
-    setSelectedItems([node])
-    const n = clearReturnData(node)
-    onChange(node.id, n, n)
-    setShow(false)
-  }, [])
+  const selectedEvents = useCallback(
+    (node) => {
+      setSelectedItems([node])
+      const n = clearReturnData(node)
+      onChange(node.id, n, n)
+      setShow(false)
+    },
+    [onChange, show, selectedItems]
+  )
 
   /**
    * Input 点击事件
@@ -397,7 +400,7 @@ const SelectTree = ({
         selectedItems={selectedItems}
         clearable={clearable}
         show={show}
-        renderInputContent={renderInputContent}
+        valueRender={valueRender}
         placeholder={placeholder}
         checkedEvents={checkedEvents}
         onTrigger={onTrigger}

diff --git a/components/select-tree/components/Trigger.jsx b/components/select-tree/components/Trigger.jsx
@@ -13,7 +13,7 @@ const Trigger = ({
   show,
   selectedItemsRef,
   placeholder,
-  renderInputContent,
+  valueRender,
   isFocus
 }) => {
   return (
@@ -32,7 +32,7 @@ const Trigger = ({
       <div className="hi-selecttree__selected-wrapper" ref={selectedItemsRef}>
         <div className="hi-selecttree__selected--hidden">
           {selectedItems.map((node, index) => (
-            <span key={index}>{renderInputContent ? renderInputContent(node) : node.title || ''}</span>
+            <span key={index}>{valueRender ? valueRender(node) : node.title || ''}</span>
           ))}
         </div>
         {selectedItems.length === 0 && <span>{placeholder}</span>}
@@ -41,7 +41,7 @@ const Trigger = ({
             return (
               <div key={index} className="hi-selecttree__selecteditem">
                 <div className="hi-selecttree__selecteditem-name">
-                  {renderInputContent ? renderInputContent(node) : node.title || ''}
+                  {valueRender ? valueRender(node) : node.title || ''}
                 </div>
                 {type === 'multiple' && (
                   <span

diff --git a/components/select-tree/index.d.ts b/components/select-tree/index.d.ts
@@ -35,6 +35,7 @@ interface Props {
   overlayClassName?: string
   defaultValue?: DataItem[] | string[] | number[] | string
   onChange?: (selectedIds: string[] | string, changedItem: DataItem | DataItem[], currentNode: DataItem) => void
+  valueRender?: (item: DataItem) => JSX.Element
   style?: CSSProperties
   value?: DataItem[] | string[] | number[] | string
 }