diff --git a/src/packages/cascader/cascader.taro.tsx b/src/packages/cascader/cascader.taro.tsx index 15f7ef5db7..fec6ebcef9 100644 --- a/src/packages/cascader/cascader.taro.tsx +++ b/src/packages/cascader/cascader.taro.tsx @@ -100,6 +100,7 @@ export const Cascader = forwardRef((props: Partial, ref) => { const opt = currentOptions?.find((o: CascaderOption) => o.value === val) next.push({ selected: val, + selectedText: opt?.text, pane: currentOptions, }) pathNodes.current[index] = opt @@ -270,7 +271,10 @@ export const Cascader = forwardRef((props: Partial, ref) => { }} > {levels.map((pane, index) => ( - + {renderCascaderItem(pane, index)} diff --git a/src/packages/cascader/cascader.tsx b/src/packages/cascader/cascader.tsx index c2181733b8..2044179c10 100644 --- a/src/packages/cascader/cascader.tsx +++ b/src/packages/cascader/cascader.tsx @@ -99,6 +99,7 @@ export const Cascader = forwardRef((props: Partial, ref) => { const opt = currentOptions?.find((o: CascaderOption) => o.value === val) next.push({ selected: val, + selectedText: opt?.text, pane: currentOptions, }) pathNodes.current[index] = opt @@ -265,7 +266,10 @@ export const Cascader = forwardRef((props: Partial, ref) => { }} > {levels.map((pane, index) => ( - +
{renderCascaderItem(pane, index)}
))} diff --git a/src/packages/cascader/demos/h5/demo1.tsx b/src/packages/cascader/demos/h5/demo1.tsx index c784ab0ebf..0e12151d25 100644 --- a/src/packages/cascader/demos/h5/demo1.tsx +++ b/src/packages/cascader/demos/h5/demo1.tsx @@ -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: '瓯海区' }, ], }, ], diff --git a/src/packages/cascader/demos/h5/demo2.tsx b/src/packages/cascader/demos/h5/demo2.tsx index 77d2ac4bc5..948b1de21d 100644 --- a/src/packages/cascader/demos/h5/demo2.tsx +++ b/src/packages/cascader/demos/h5/demo2.tsx @@ -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([]) 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: '瓯海区' }, ], }, ], diff --git a/src/packages/cascader/demos/taro/demo1.tsx b/src/packages/cascader/demos/taro/demo1.tsx index a3860ac354..60cedbe2e5 100644 --- a/src/packages/cascader/demos/taro/demo1.tsx +++ b/src/packages/cascader/demos/taro/demo1.tsx @@ -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: '瓯海区' }, ], }, ], diff --git a/src/packages/cascader/demos/taro/demo2.tsx b/src/packages/cascader/demos/taro/demo2.tsx index 0410de1f7b..85f21cfd89 100644 --- a/src/packages/cascader/demos/taro/demo2.tsx +++ b/src/packages/cascader/demos/taro/demo2.tsx @@ -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([]) 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: '瓯海区' }, ], }, ],