From 1887742215433ff8e84ee59efe15b9d648bf1d3e Mon Sep 17 00:00:00 2001
From: yangxuexue <yangxuexue@xiaomi.com>
Date: Fri, 28 Jun 2024 18:42:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(cascader):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=A6=E5=8F=91=E5=99=A8(#2888)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui/cascader/src/Cascader.tsx         | 45 +++++++----
 .../stories/custom-render.stories.tsx         | 76 +++++++++++++++++++
 .../ui/cascader/stories/index.stories.tsx     |  1 +
 3 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 packages/ui/cascader/stories/custom-render.stories.tsx

diff --git a/packages/ui/cascader/src/Cascader.tsx b/packages/ui/cascader/src/Cascader.tsx
index ae34770f3..30a7d678e 100644
--- a/packages/ui/cascader/src/Cascader.tsx
+++ b/packages/ui/cascader/src/Cascader.tsx
@@ -60,6 +60,7 @@ export const Cascader = forwardRef<HTMLDivElement | null, CascaderProps>((props,
     renderExtraFooter,
     dropdownColumnRender,
     closeOnSelect = true,
+    customRender,
     ...rest
   } = props
   const i18n = useLocaleContext()
@@ -237,22 +238,30 @@ export const Cascader = forwardRef<HTMLDivElement | null, CascaderProps>((props,
         footer={isFunction(renderExtraFooter) && renderExtraFooter()}
         onSearch={callAllFuncs(onSearchProp, onSearch)}
         trigger={
-          <MockInput
-            size={size}
-            clearable={clearable}
-            placeholder={placeholder}
-            displayRender={displayRender as any}
-            prefix={prefix}
-            suffix={[menuVisible ? <UpOutlined /> : <DownOutlined />, suffix]}
-            focused={menuVisible}
-            value={value[value.length - 1]}
-            onChange={() => {
-              tryChangeValue([])
-            }}
-            data={mergedData}
-            invalid={invalid}
-            appearance={appearance}
-          />
+          customRender ? (
+            typeof customRender === 'function' ? (
+              customRender(selectedItem)
+            ) : (
+              customRender
+            )
+          ) : (
+            <MockInput
+              size={size}
+              clearable={clearable}
+              placeholder={placeholder}
+              displayRender={displayRender as any}
+              prefix={prefix}
+              suffix={[menuVisible ? <UpOutlined /> : <DownOutlined />, suffix]}
+              focused={menuVisible}
+              value={value[value.length - 1]}
+              onChange={() => {
+                tryChangeValue([])
+              }}
+              data={mergedData}
+              invalid={invalid}
+              appearance={appearance}
+            />
+          )
         }
       >
         {isArrayNonEmpty(showData) ? <CascaderMenuList /> : null}
@@ -342,6 +351,10 @@ export interface CascaderProps
    * 选择框后置内容
    */
   suffix?: React.ReactNode
+  /**
+   * 自定义触发器
+   */
+  customRender?: React.ReactNode | ((selectedItem: CascaderItemEventData | null) => React.ReactNode)
 }
 
 if (__DEV__) {
diff --git a/packages/ui/cascader/stories/custom-render.stories.tsx b/packages/ui/cascader/stories/custom-render.stories.tsx
new file mode 100644
index 000000000..f43e980ec
--- /dev/null
+++ b/packages/ui/cascader/stories/custom-render.stories.tsx
@@ -0,0 +1,76 @@
+import React from 'react'
+import Cascader from '../src'
+import Input from '@hi-ui/input'
+
+/**
+ * @title 自定义触发器
+ */
+export const CustomRender = () => {
+  const [data] = React.useState([
+    {
+      id: '手机',
+      title: '手机t',
+      children: [
+        {
+          id: '小米',
+          title: '小米t',
+          children: [
+            {
+              id: '小米3',
+              title: '小米3t',
+            },
+            {
+              id: '小米4',
+              title: '小米4t',
+            },
+          ],
+        },
+        {
+          id: '红米',
+          title: '红米t',
+          children: [
+            {
+              id: '红米3',
+              title: '红米3t',
+            },
+            {
+              id: '红米4',
+              title: '红米4t',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      id: '电视',
+      title: '电视t',
+      children: [
+        {
+          id: '小米电视4A',
+          title: '小米电视4At',
+        },
+        {
+          id: '小米电视4C',
+          title: '小米电视4Ct',
+        },
+      ],
+    },
+  ])
+
+  return (
+    <>
+      <h1>CustomRender</h1>
+      <div className="cascader-custom-render__wrap">
+        <Cascader
+          style={{ width: 240 }}
+          clearable
+          placeholder="请选择品类"
+          data={data}
+          customRender={(data) => {
+            return <Input value={!data ? '' : data.title + ''} placeholder="请选择" />
+          }}
+        ></Cascader>
+      </div>
+    </>
+  )
+}
diff --git a/packages/ui/cascader/stories/index.stories.tsx b/packages/ui/cascader/stories/index.stories.tsx
index d29afce5c..162b6792f 100644
--- a/packages/ui/cascader/stories/index.stories.tsx
+++ b/packages/ui/cascader/stories/index.stories.tsx
@@ -16,6 +16,7 @@ export * from './footer.stories'
 export * from './dropdown-column-render.stories'
 export * from './field-names.stories'
 export * from './visible.stories'
+export * from './custom-render.stories'
 
 export default {
   title: 'Data Input/Cascader',

From 05a9ef2138b3d9b7080419494e2484929cad6003 Mon Sep 17 00:00:00 2001
From: yangxuexue <yangxuexue@xiaomi.com>
Date: Fri, 28 Jun 2024 18:44:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore(cascader):=20=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=96=87=E4=BB=B6(#2888)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/itchy-items-end.md     | 5 +++++
 .changeset/smooth-pears-behave.md | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 .changeset/itchy-items-end.md
 create mode 100644 .changeset/smooth-pears-behave.md

diff --git a/.changeset/itchy-items-end.md b/.changeset/itchy-items-end.md
new file mode 100644
index 000000000..8b80c411b
--- /dev/null
+++ b/.changeset/itchy-items-end.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/cascader": minor
+---
+
+feat: 新增自定义触发器
diff --git a/.changeset/smooth-pears-behave.md b/.changeset/smooth-pears-behave.md
new file mode 100644
index 000000000..687f684d4
--- /dev/null
+++ b/.changeset/smooth-pears-behave.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+feat(cascader): 新增自定义触发器