From 7d22cc2155bef564ee910498d2f8f319ef601a41 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Thu, 10 Feb 2022 15:57:57 +0800
Subject: [PATCH] fix(TimePicker): remove columns-order prop

---
 packages/vant/src/datetime-picker/DatePicker.tsx | 2 ++
 packages/vant/src/datetime-picker/utils.ts       | 2 --
 packages/vant/src/time-picker/README.md          | 1 -
 packages/vant/src/time-picker/README.zh-CN.md    | 1 -
 packages/vant/src/time-picker/TimePicker.tsx     | 4 ++--
 packages/vant/src/time-picker/demo/index.vue     | 6 +++++-
 packages/vant/vant.config.mjs                    | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/vant/src/datetime-picker/DatePicker.tsx b/packages/vant/src/datetime-picker/DatePicker.tsx
index 3bebf8809..426fd0ec6 100644
--- a/packages/vant/src/datetime-picker/DatePicker.tsx
+++ b/packages/vant/src/datetime-picker/DatePicker.tsx
@@ -5,6 +5,7 @@ import {
   nextTick,
   onMounted,
   defineComponent,
+  type PropType,
 } from 'vue';
 
 // Utils
@@ -44,6 +45,7 @@ export default defineComponent({
   props: extend({}, sharedProps, {
     type: makeStringProp<DatetimePickerType>('datetime'),
     modelValue: Date,
+    columnsOrder: Array as PropType<DatetimePickerColumnType[]>,
     minDate: {
       type: Date,
       default: () => new Date(currentYear - 10, 0, 1),
diff --git a/packages/vant/src/datetime-picker/utils.ts b/packages/vant/src/datetime-picker/utils.ts
index 0ca03e9fb..7e3729b33 100644
--- a/packages/vant/src/datetime-picker/utils.ts
+++ b/packages/vant/src/datetime-picker/utils.ts
@@ -2,13 +2,11 @@ import { extend } from '../utils';
 import { pickerSharedProps } from '../picker/Picker';
 import type { PropType } from 'vue';
 import type { PickerInstance, PickerOption } from '../picker';
-import type { DatetimePickerColumnType } from './types';
 
 export const sharedProps = extend({}, pickerSharedProps, {
   filter: Function as PropType<
     (columnType: string, options: PickerOption[]) => PickerOption[]
   >,
-  columnsOrder: Array as PropType<DatetimePickerColumnType[]>,
   formatter: {
     type: Function as PropType<
       (type: string, option: PickerOption) => PickerOption
diff --git a/packages/vant/src/time-picker/README.md b/packages/vant/src/time-picker/README.md
index 2afe1655c..a0fdbdcb4 100644
--- a/packages/vant/src/time-picker/README.md
+++ b/packages/vant/src/time-picker/README.md
@@ -140,7 +140,6 @@ export default {
 | readonly | Whether to be readonly | _boolean_ | `false` |
 | filter | Option filter | _(type: string, options: PickerOption[]) => PickerOption[]_ | - |
 | formatter | Option text formatter | _(type: string, option: PickerOption) => PickerOption_ | - |
-| columns-order | Array for ordering columns, where item can be set to<br> `hour`、`minute` | _string[]_ | - |
 | option-height | Option height, supports `px` `vw` `vh` `rem` unit, default `px` | _number \| string_ | `44` |
 | visible-option-num | Count of visible columns | _number \| string_ | `6` |
 | swipe-duration | Duration of the momentum animation，unit `ms` | _number \| string_ | `1000` |
diff --git a/packages/vant/src/time-picker/README.zh-CN.md b/packages/vant/src/time-picker/README.zh-CN.md
index 7cac9b8a6..aa904c10a 100644
--- a/packages/vant/src/time-picker/README.zh-CN.md
+++ b/packages/vant/src/time-picker/README.zh-CN.md
@@ -139,7 +139,6 @@ export default {
 | readonly | 是否为只读状态，只读状态下无法切换选项 | _boolean_ | `false` |
 | filter | 选项过滤函数 | _(type: string, options: PickerOption[]) => PickerOption[]_ | - |
 | formatter | 选项格式化函数 | _(type: string, option: PickerOption) => PickerOption_ | - |
-| columns-order | 自定义列排序数组, 子项可选值为<br> `hour`、`minute` | _string[]_ | - |
 | option-height | 选项高度，支持 `px` `vw` `vh` `rem` 单位，默认 `px` | _number \| string_ | `44` |
 | visible-option-num | 可见的选项个数 | _number \| string_ | `6` |
 | swipe-duration | 快速滑动时惯性滚动的时长，单位 `ms` | _number \| string_ | `1000` |
diff --git a/packages/vant/src/time-picker/TimePicker.tsx b/packages/vant/src/time-picker/TimePicker.tsx
index 8ff3bd6cf..5ee8d662a 100644
--- a/packages/vant/src/time-picker/TimePicker.tsx
+++ b/packages/vant/src/time-picker/TimePicker.tsx
@@ -62,11 +62,11 @@ export default defineComponent({
 
     const ranges = computed(() => [
       {
-        type: 'hour',
+        type: 'hour' as const,
         range: [+props.minHour, +props.maxHour],
       },
       {
-        type: 'minute',
+        type: 'minute' as const,
         range: [+props.minMinute, +props.maxMinute],
       },
     ]);
diff --git a/packages/vant/src/time-picker/demo/index.vue b/packages/vant/src/time-picker/demo/index.vue
index 8a2629a05..87391a0c0 100644
--- a/packages/vant/src/time-picker/demo/index.vue
+++ b/packages/vant/src/time-picker/demo/index.vue
@@ -48,7 +48,11 @@ const formatter = (type: string, option: PickerOption) => {
 
 <template>
   <demo-block card :title="t('basicUsage')">
-    <van-time-picker v-model="baseTime" :title="t('chooseTime')" />
+    <van-time-picker
+      v-model="baseTime"
+      :title="t('chooseTime')"
+      :columns-order="['minute', 'hour']"
+    />
   </demo-block>
 
   <demo-block card :title="t('timeRange')">
diff --git a/packages/vant/vant.config.mjs b/packages/vant/vant.config.mjs
index acff145dd..4b334c1c2 100644
--- a/packages/vant/vant.config.mjs
+++ b/packages/vant/vant.config.mjs
@@ -218,7 +218,7 @@ export default {
               },
               {
                 path: 'time-picker',
-                title: 'timePicker 时间选择',
+                title: 'TimePicker 时间选择',
               },
               {
                 path: 'uploader',
@@ -628,7 +628,7 @@ export default {
               },
               {
                 path: 'time-picker',
-                title: 'timePicker',
+                title: 'TimePicker',
               },
               {
                 path: 'uploader',