Skip to content

fix(cascader): 选中后 tab 应展示 text 字段的值 #3167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoyatong merged 1 commit into from
Apr 11, 2025
Merged

fix(cascader): 选中后 tab 应展示 text 字段的值 #3167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/packages/cascader/cascader.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export const Cascader = forwardRef((props: Partial<TaroCascaderProps>, ref) => {
const opt = currentOptions?.find((o: CascaderOption) => o.value === val)
next.push({
selected: val,
selectedText: opt?.text,
pane: currentOptions,
})
pathNodes.current[index] = opt
Expand Down Expand Up @@ -270,7 +271,10 @@ export const Cascader = forwardRef((props: Partial<TaroCascaderProps>, ref) => {
}}
>
{levels.map((pane, index) => (
<Tabs.TabPane title={pane.selected || locale.select} key={index}>
<Tabs.TabPane
title={pane.selectedText || locale.select}
key={index}
>
<View className={classPane}>
{renderCascaderItem(pane, index)}
</View>
Expand Down
6 changes: 5 additions & 1 deletion src/packages/cascader/cascader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export const Cascader = forwardRef((props: Partial<WebCascaderProps>, ref) => {
const opt = currentOptions?.find((o: CascaderOption) => o.value === val)
next.push({
selected: val,
selectedText: opt?.text,
pane: currentOptions,
})
pathNodes.current[index] = opt
Expand Down Expand Up @@ -265,7 +266,10 @@ export const Cascader = forwardRef((props: Partial<WebCascaderProps>, ref) => {
}}
>
{levels.map((pane, index) => (
<Tabs.TabPane title={pane.selected || locale.select} key={index}>
<Tabs.TabPane
title={pane.selectedText || locale.select}
key={index}
>
<div className={classPane}>{renderCascaderItem(pane, index)}</div>
</Tabs.TabPane>
))}
Expand Down
14 changes: 7 additions & 7 deletions src/packages/cascader/demos/h5/demo1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ const Demo1 = () => {
setTimeout(() => {
setOptions([
{
value: '浙江',
value: 'ZheJiang',
text: '浙江',
children: [
{
value: '杭州',
value: 'HangZhou',
text: '杭州',
disabled: true,
children: [
{ value: '西湖区', text: '西湖区', disabled: true },
{ value: '余杭区', text: '余杭区' },
{ value: 'XiHu', text: '西湖区', disabled: true },
{ value: 'YuHang', text: '余杭区' },
],
},
{
value: '温州',
value: 'WenZhou',
text: '温州',
children: [
{ value: '鹿城区', text: '鹿城区' },
{ value: '瓯海区', text: '瓯海区' },
{ value: 'LuCheng', text: '鹿城区' },
{ value: 'OuHai', text: '瓯海区' },
],
},
],
Expand Down
16 changes: 8 additions & 8 deletions src/packages/cascader/demos/h5/demo2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@ import { Cascader, CascaderOption, Cell } from '@nutui/nutui-react'

const Demo2 = () => {
const [visible, setVisible] = useState(false)
const [value, setValue] = useState(['福建', '福州', '台江区'])
const [value, setValue] = useState(['ZheJiang', 'WenZhou', 'OuHai'])
const [options, setOptions] = useState<CascaderOption[]>([])
useEffect(() => {
setTimeout(() => {
setOptions([
{
value1: '浙江',
value1: 'ZheJiang',
text1: '浙江',
items: [
{
value1: '杭州',
value1: 'HangZhou',
text1: '杭州',
disabled: true,
items: [
{ value1: '西湖区', text1: '西湖区', disabled: true },
{ value1: '余杭区', text1: '余杭区' },
{ value1: 'XiHu', text1: '西湖区', disabled: true },
{ value1: 'YuHang', text1: '余杭区' },
],
},
{
value1: '温州',
value1: 'WenZhou',
text1: '温州',
items: [
{ value1: '鹿城区', text1: '鹿城区' },
{ value1: '瓯海区', text1: '瓯海区' },
{ value1: 'LuCheng', text1: '鹿城区' },
{ value1: 'OuHai', text1: '瓯海区' },
],
},
],
Expand Down
14 changes: 7 additions & 7 deletions src/packages/cascader/demos/taro/demo1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ const Demo1 = () => {
setTimeout(() => {
setOptions([
{
value: '浙江',
value: 'ZheJiang',
text: '浙江',
children: [
{
value: '杭州',
value: 'HangZhou',
text: '杭州',
disabled: true,
children: [
{ value: '西湖区', text: '西湖区', disabled: true },
{ value: '余杭区', text: '余杭区' },
{ value: 'XiHu', text: '西湖区', disabled: true },
{ value: 'YuHang', text: '余杭区' },
],
},
{
value: '温州',
value: 'WenZhou',
text: '温州',
children: [
{ value: '鹿城区', text: '鹿城区' },
{ value: '瓯海区', text: '瓯海区' },
{ value: 'LuCheng', text: '鹿城区' },
{ value: 'OuHai', text: '瓯海区' },
],
},
],
Expand Down
16 changes: 8 additions & 8 deletions src/packages/cascader/demos/taro/demo2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@ import { Cascader, CascaderOption, Cell } from '@nutui/nutui-react-taro'

const Demo2 = () => {
const [visible, setVisible] = useState(false)
const [value, setValue] = useState(['福建', '福州', '台江区'])
const [value, setValue] = useState(['ZheJiang', 'WenZhou', 'OuHai'])
const [options, setOptions] = useState<CascaderOption[]>([])
useEffect(() => {
setTimeout(() => {
setOptions([
{
value1: '浙江',
value1: 'ZheJiang',
text1: '浙江',
items: [
{
value1: '杭州',
value1: 'HangZhou',
text1: '杭州',
disabled: true,
items: [
{ value1: '西湖区', text1: '西湖区', disabled: true },
{ value1: '余杭区', text1: '余杭区' },
{ value1: 'XiHu', text1: '西湖区', disabled: true },
{ value1: 'YuHang', text1: '余杭区' },
],
},
{
value1: '温州',
value1: 'WenZhou',
text1: '温州',
items: [
{ value1: '鹿城区', text1: '鹿城区' },
{ value1: '瓯海区', text1: '瓯海区' },
{ value1: 'LuCheng', text1: '鹿城区' },
{ value1: 'OuHai', text1: '瓯海区' },
],
},
],
Expand Down