From a34f3c603007e27195fad546f0e6b54dd99652e1 Mon Sep 17 00:00:00 2001 From: yipl Date: Sat, 11 May 2024 11:16:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20(area)columns-placeholder=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vant/src/area/utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vant/src/area/utils.ts b/packages/vant/src/area/utils.ts index 2e637df9c63..a8a1a84c42f 100644 --- a/packages/vant/src/area/utils.ts +++ b/packages/vant/src/area/utils.ts @@ -47,10 +47,10 @@ export function formatDataForCascade({ const getProvinceChildren = () => { if (showCity) { - return placeholder.length + return placeholder.length > 1 ? [ makeOption( - placeholder[0], + placeholder[1], AREA_EMPTY_CODE, showCounty ? [] : undefined, ), @@ -71,7 +71,7 @@ export function formatDataForCascade({ if (showCity) { const getCityChildren = () => { if (showCounty) { - return placeholder.length ? [makeOption(placeholder[1])] : []; + return placeholder.length > 2 ? [makeOption(placeholder[2])] : []; } }; From de500e2717872d97f1c00827a4c8e68f8c0835b2 Mon Sep 17 00:00:00 2001 From: yipl Date: Sat, 11 May 2024 13:57:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20(area)columns-placeholder=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E5=8D=95=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vant/src/area/README.md | 2 +- packages/vant/src/area/README.zh-CN.md | 2 +- packages/vant/src/area/demo/index.vue | 4 ++-- .../vant/src/area/test/__snapshots__/demo-ssr.spec.ts.snap | 6 +++--- packages/vant/src/area/test/__snapshots__/demo.spec.ts.snap | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/vant/src/area/README.md b/packages/vant/src/area/README.md index 0e0dba1c67a..0bed79c09dd 100644 --- a/packages/vant/src/area/README.md +++ b/packages/vant/src/area/README.md @@ -113,7 +113,7 @@ export default { ``` diff --git a/packages/vant/src/area/README.zh-CN.md b/packages/vant/src/area/README.zh-CN.md index ba97abadf1d..454863ace6b 100644 --- a/packages/vant/src/area/README.zh-CN.md +++ b/packages/vant/src/area/README.zh-CN.md @@ -117,7 +117,7 @@ export default { ``` diff --git a/packages/vant/src/area/demo/index.vue b/packages/vant/src/area/demo/index.vue index 21ebf918e82..398a945a261 100644 --- a/packages/vant/src/area/demo/index.vue +++ b/packages/vant/src/area/demo/index.vue @@ -10,14 +10,14 @@ const t = useTranslate({ title2: '控制选中项', title3: '配置显示列', title4: '配置列占位提示文字', - columnsPlaceholder: ['请选择', '请选择', '请选择'], + columnsPlaceholder: ['省份', '城市', '区县'], areaList, }, 'en-US': { title2: 'Model Value', title3: 'Columns Number', title4: 'Columns Placeholder', - columnsPlaceholder: ['Choose', 'Choose', 'Choose'], + columnsPlaceholder: ['Province', 'City', 'County'], areaList: areaListEn, }, }); diff --git a/packages/vant/src/area/test/__snapshots__/demo-ssr.spec.ts.snap b/packages/vant/src/area/test/__snapshots__/demo-ssr.spec.ts.snap index d15ac7e811f..0c6b00b2112 100644 --- a/packages/vant/src/area/test/__snapshots__/demo-ssr.spec.ts.snap +++ b/packages/vant/src/area/test/__snapshots__/demo-ssr.spec.ts.snap @@ -535,7 +535,7 @@ exports[`should render demo and match snapshot 1`] = ` class="van-picker-column__item van-picker-column__item--selected" >
- Choose + Province
  • - Choose + City
    • @@ -601,7 +601,7 @@ exports[`should render demo and match snapshot 1`] = ` class="van-picker-column__item van-picker-column__item--selected" >
    - Choose + County
    diff --git a/packages/vant/src/area/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/area/test/__snapshots__/demo.spec.ts.snap index 9b46bc5aefe..3456837d85b 100644 --- a/packages/vant/src/area/test/__snapshots__/demo.spec.ts.snap +++ b/packages/vant/src/area/test/__snapshots__/demo.spec.ts.snap @@ -510,7 +510,7 @@ exports[`should render demo and match snapshot 1`] = ` class="van-picker-column__item van-picker-column__item--selected" >
    - Choose + Province
  • - Choose + City
    • @@ -574,7 +574,7 @@ exports[`should render demo and match snapshot 1`] = ` class="van-picker-column__item van-picker-column__item--selected" >
    - Choose + County
    From a3e464f6dca3cd4a75e28566e7104bd442dfc9b4 Mon Sep 17 00:00:00 2001 From: yipl Date: Sat, 11 May 2024 16:55:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20(area)columns-placeholder=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vant/src/area/test/index.spec.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/vant/src/area/test/index.spec.ts b/packages/vant/src/area/test/index.spec.ts index 08b0e148a9f..5afcc50f02b 100644 --- a/packages/vant/src/area/test/index.spec.ts +++ b/packages/vant/src/area/test/index.spec.ts @@ -7,6 +7,24 @@ import { PickerConfirmEventParams, } from '../../picker'; +test('should columns placeholder displayed normally', async () => { + const columnsPlaceholder = ['省份', '省份', '区县']; + + const wrapper = mount(Area, { + props: { + areaList, + columnsPlaceholder, + }, + }); + + const columns = await wrapper.findAll('.van-picker-column'); + await columns[0].findAll('li')?.[1].trigger('click'); + expect(columns[1].find('li').text()).toBe(columnsPlaceholder[1]); + + await columns[1].findAll('li')?.[1].trigger('click'); + expect(columns[2].find('li').text()).toBe(columnsPlaceholder[2]); +}); + test('should emit confirm event after click the confirm button', async () => { const wrapper = mount(Area, { props: { From e825a1f9bd02d03a707b05531d397ee0ff2ae1e3 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 18 May 2024 20:43:19 +0800 Subject: [PATCH 4/4] Update packages/vant/src/area/test/index.spec.ts --- packages/vant/src/area/test/index.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant/src/area/test/index.spec.ts b/packages/vant/src/area/test/index.spec.ts index 5afcc50f02b..f41e3bfb325 100644 --- a/packages/vant/src/area/test/index.spec.ts +++ b/packages/vant/src/area/test/index.spec.ts @@ -8,7 +8,7 @@ import { } from '../../picker'; test('should columns placeholder displayed normally', async () => { - const columnsPlaceholder = ['省份', '省份', '区县']; + const columnsPlaceholder = ['Province', 'City', 'County']; const wrapper = mount(Area, { props: {