From 76c0b08bde1b52c69c57f0893156c70c6384be3f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 8 Jul 2021 10:16:05 +0800
Subject: [PATCH] chore(Picker): deprecatation warning of valueKey (#8994)

---
 src/area/Area.tsx                             |  2 +-
 src/number-keyboard/demo/index.vue            | 48 ++++++++++++-------
 .../test/__snapshots__/demo.spec.ts.snap      | 36 +++++++++-----
 src/picker/Picker.tsx                         | 26 +++++-----
 4 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/src/area/Area.tsx b/src/area/Area.tsx
index bb4faae93..03a1b1dcd 100644
--- a/src/area/Area.tsx
+++ b/src/area/Area.tsx
@@ -327,7 +327,7 @@ export default defineComponent({
           ref={pickerRef}
           class={bem()}
           columns={columns}
-          valueKey="name"
+          columnsFieldNames={{ text: 'name' }}
           onChange={onChange}
           onConfirm={onConfirm}
           {...pick(props, INHERIT_PROPS)}
diff --git a/src/number-keyboard/demo/index.vue b/src/number-keyboard/demo/index.vue
index 0946da258..c75b4a93a 100644
--- a/src/number-keyboard/demo/index.vue
+++ b/src/number-keyboard/demo/index.vue
@@ -1,23 +1,35 @@
 <template>
   <demo-block card>
-    <van-cell is-link @touchstart.stop="keyboard = 'default'">
-      {{ t('button1') }}
-    </van-cell>
-    <van-cell is-link @touchstart.stop="keyboard = 'custom'">
-      {{ t('button2') }}
-    </van-cell>
-    <van-cell is-link @touchstart.stop="keyboard = 'extraKey'">
-      {{ t('button3') }}
-    </van-cell>
-    <van-cell is-link @touchstart.stop="keyboard = 'title'">
-      {{ t('button4') }}
-    </van-cell>
-    <van-cell is-link @touchstart.stop="keyboard = 'multiExtraKey'">
-      {{ t('button5') }}
-    </van-cell>
-    <van-cell is-link @touchstart.stop="keyboard = 'randomKeyOrder'">
-      {{ t('button6') }}
-    </van-cell>
+    <van-cell
+      is-link
+      :title="t('button1')"
+      @touchstart.stop="keyboard = 'default'"
+    />
+    <van-cell
+      is-link
+      :title="t('button2')"
+      @touchstart.stop="keyboard = 'custom'"
+    />
+    <van-cell
+      is-link
+      :title="t('button3')"
+      @touchstart.stop="keyboard = 'extraKey'"
+    />
+    <van-cell
+      is-link
+      :title="t('button4')"
+      @touchstart.stop="keyboard = 'title'"
+    />
+    <van-cell
+      is-link
+      :title="t('button5')"
+      @touchstart.stop="keyboard = 'multiExtraKey'"
+    />
+    <van-cell
+      is-link
+      :title="t('button6')"
+      @touchstart.stop="keyboard = 'randomKeyOrder'"
+    />
     <van-field
       v-model="value"
       readonly
diff --git a/src/number-keyboard/test/__snapshots__/demo.spec.ts.snap b/src/number-keyboard/test/__snapshots__/demo.spec.ts.snap
index d1327aba2..98b4f4cde 100644
--- a/src/number-keyboard/test/__snapshots__/demo.spec.ts.snap
+++ b/src/number-keyboard/test/__snapshots__/demo.spec.ts.snap
@@ -6,8 +6,10 @@ exports[`should render demo and match snapshot 1`] = `
        role="button"
        tabindex="0"
   >
-    <div class="van-cell__value van-cell__value--alone">
-      Show Default Keyboard
+    <div class="van-cell__title">
+      <span>
+        Show Default Keyboard
+      </span>
     </div>
     <i class="van-badge__wrapper van-icon van-icon-arrow van-cell__right-icon">
     </i>
@@ -16,8 +18,10 @@ exports[`should render demo and match snapshot 1`] = `
        role="button"
        tabindex="0"
   >
-    <div class="van-cell__value van-cell__value--alone">
-      Show Keyboard With Sidebar
+    <div class="van-cell__title">
+      <span>
+        Show Keyboard With Sidebar
+      </span>
     </div>
     <i class="van-badge__wrapper van-icon van-icon-arrow van-cell__right-icon">
     </i>
@@ -26,8 +30,10 @@ exports[`should render demo and match snapshot 1`] = `
        role="button"
        tabindex="0"
   >
-    <div class="van-cell__value van-cell__value--alone">
-      Show IdNumber Keyboard
+    <div class="van-cell__title">
+      <span>
+        Show IdNumber Keyboard
+      </span>
     </div>
     <i class="van-badge__wrapper van-icon van-icon-arrow van-cell__right-icon">
     </i>
@@ -36,8 +42,10 @@ exports[`should render demo and match snapshot 1`] = `
        role="button"
        tabindex="0"
   >
-    <div class="van-cell__value van-cell__value--alone">
-      Show Keyboard With Title
+    <div class="van-cell__title">
+      <span>
+        Show Keyboard With Title
+      </span>
     </div>
     <i class="van-badge__wrapper van-icon van-icon-arrow van-cell__right-icon">
     </i>
@@ -46,8 +54,10 @@ exports[`should render demo and match snapshot 1`] = `
        role="button"
        tabindex="0"
   >
-    <div class="van-cell__value van-cell__value--alone">
-      Show Keyboard With Multiple ExtraKey
+    <div class="van-cell__title">
+      <span>
+        Show Keyboard With Multiple ExtraKey
+      </span>
     </div>
     <i class="van-badge__wrapper van-icon van-icon-arrow van-cell__right-icon">
     </i>
@@ -56,8 +66,10 @@ exports[`should render demo and match snapshot 1`] = `
        role="button"
        tabindex="0"
   >
-    <div class="van-cell__value van-cell__value--alone">
-      Show Keyboard With Random Key Order
+    <div class="van-cell__title">
+      <span>
+        Show Keyboard With Random Key Order
+      </span>
     </div>
     <i class="van-badge__wrapper van-icon van-icon-arrow van-cell__right-icon">
     </i>
diff --git a/src/picker/Picker.tsx b/src/picker/Picker.tsx
index 947f54640..8f535e964 100644
--- a/src/picker/Picker.tsx
+++ b/src/picker/Picker.tsx
@@ -68,6 +68,9 @@ export default defineComponent({
   name,
 
   props: extend({}, pickerProps, {
+    // @deprecated
+    // should be removed in next major version
+    valueKey: String,
     columnsFieldNames: Object as PropType<PickerFieldNames>,
     columns: {
       type: Array as PropType<PickerOption[] | PickerColumn[]>,
@@ -81,21 +84,22 @@ export default defineComponent({
       type: String as PropType<PickerToolbarPosition>,
       default: 'top',
     },
-    // @deprecated
-    // should be removed in next major version
-    valueKey: {
-      type: String,
-      default: 'text',
-    },
   }),
 
   emits: ['confirm', 'cancel', 'change'],
 
   setup(props, { emit, slots }) {
-    if (slots.default) {
-      console.warn(
-        '[Vant] Picker: "default" slot is deprecated, please use "toolbar" slot instead.'
-      );
+    if (process.env.NODE_ENV !== 'production') {
+      if (slots.default) {
+        console.warn(
+          '[Vant] Picker: "default" slot is deprecated, please use "toolbar" slot instead.'
+        );
+      }
+      if (props.valueKey) {
+        console.warn(
+          '[Vant] Picker: "valueKey" prop is deprecated, please use "columnsFieldNames" prop instead.'
+        );
+      }
     }
 
     const formattedColumns = ref<PickerObjectColumn[]>([]);
@@ -103,7 +107,7 @@ export default defineComponent({
     const { text: textKey, values: valuesKey, children: childrenKey } = extend(
       {
         // compatible with valueKey prop
-        text: props.valueKey,
+        text: props.valueKey || 'text',
         values: 'values',
         children: 'children',
       },