From 566bd8d4714c38006ae95161595b7eacbf35eaf3 Mon Sep 17 00:00:00 2001
From: qimengjie <qimengjie@163.com>
Date: Fri, 14 Dec 2018 14:54:56 +0800
Subject: [PATCH] Update demo

---
 tools/demo/pages/index/index.js   | 93 +++++++++++++------------------
 tools/demo/pages/index/index.wxml | 12 +++-
 2 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/tools/demo/pages/index/index.js b/tools/demo/pages/index/index.js
index ef3da4f..b8955c3 100644
--- a/tools/demo/pages/index/index.js
+++ b/tools/demo/pages/index/index.js
@@ -7,69 +7,45 @@ Page({
     result_2: [],
     sourceData_1: [
       {
-        id: '01',
+        id: 'id-1',
         name: '1',
         sonValue: [
           {
-            id: '011',
+            id: 'id-11',
             name: '1.1',
             sonValue: [
-              {
-                id: '0111',
-                name: '1.1.1',
-              },
-              {
-                id: '0112',
-                name: '1.1.2',
-              }
+              { id: 'id-111', name: '1.1.1' },
+              { id: 'id-112', name: '1.1.2' }
             ]
           },
           {
-            id: '012',
+            id: 'id-12',
             name: '1.2',
             sonValue: [
-              {
-                id: '0121',
-                name: '1.2.1',
-              },
-              {
-                id: '0122',
-                name: '1.2.2',
-              }
+              { id: 'id-121', name: '1.2.1' },
+              { id: 'id-122', name: '1.2.2' }
             ]
           }
         ]
       },
       {
-        id: '02',
+        id: 'id-2',
         name: '2',
         sonValue: [
           {
-            id: '021',
+            id: 'id-21',
             name: '2.1',
             sonValue: [
-              {
-                id: '0211',
-                name: '2.1.1',
-              },
-              {
-                id: '0212',
-                name: '2.1.2'
-              }
+              { id: 'id-211', name: '2.1.1' },
+              { id: 'id-212', name: '2.1.2' }
             ]
           },
           {
-            id: '022',
+            id: 'id-22',
             name: '2.2',
             sonValue: [
-              {
-                id: '0221',
-                name: '2.2.1'
-              },
-              {
-                id: '0222',
-                name: '2.2.2'
-              }
+              { id: 'id-221', name: '2.2.1' },
+              { id: 'id-222', name: '2.2.2' }
             ]
           }
         ]
@@ -81,29 +57,40 @@ Page({
     ]
   },
   /**
-   * Picker的确认回调函数
+   * Picker用户点击确认时触发
    *
+   * @param {Object} e pickerChange的事件对象
    * @param {Object} e.detail.selectedIndex 用户选择的数据在数组中所在的下标
    * @param {Object} e.detail.selectedArray 用户选择的数据
    */
-  pickerChange_1(e) {
+  pickerChange(e) {
+    const { picker } = e.currentTarget.dataset
     const { selectedIndex, selectedArray } = e.detail
+    const list = {
+      picker_1: 'result_1',
+      picker_2: 'result_2',
+    }
     console.log('多级联动结果:', selectedIndex, selectedArray)
-    this.setData({
-      result_1: selectedArray
-    })
+    const change = {}
+    change[list[picker]] = selectedArray
+    this.setData(change)
   },
   /**
-   * Picker的确认回调函数
+   * Picker用户点击取消时触发
    *
-   * @param {Object} e.detail.selectedIndex 用户选择的数据在数组中所在的下标
-   * @param {Object} e.detail.selectedArray 用户选择的数据
+   * @param {Object} e  pickerCancel的事件对象
+   * @param {Object} e.detail  是原生Picker组件的bindcancel触发时的事件对象e
    */
-  pickerChange_2(e) {
-    const { selectedIndex, selectedArray } = e.detail
-    console.log('多级联动结果:', selectedIndex, selectedArray)
-    this.setData({
-      result_2: selectedArray
-    })
-  }
+  pickerCancel(e) {
+    console.log(e)
+  },
+  /**
+   * Picker用户滑动某一列的值改变时触发
+   *
+   * @param {Object} e pickerColumnchange的事件对象
+   * @param {Object} e.detail  是原生Picker组件的bindcolumnchange触发时的事件对象e
+   */
+  pickerColumnchange(e) {
+    console.log(e)
+  },
 })
\ No newline at end of file
diff --git a/tools/demo/pages/index/index.wxml b/tools/demo/pages/index/index.wxml
index 38c9190..19182ba 100644
--- a/tools/demo/pages/index/index.wxml
+++ b/tools/demo/pages/index/index.wxml
@@ -22,7 +22,11 @@
   defaultValueUniqueField="{{'name'}}"
   autoSelect="{{true}}"
   initColumnSelectedIndex
-  bindchange="pickerChange_1">
+  disabled="{{false}}"
+  bindchange="pickerChange"
+  bindcancel="pickerCancel"
+  bindcolumnchange="pickerColumnchange"
+  data-picker="picker_1">
     <view class="picker">
       当前选择：<view wx:for="{{result_1}}" wx:key="index">{{item['name']}}</view>
     </view>
@@ -38,7 +42,11 @@
   defaultValueUniqueField="{{'code'}}"
   autoSelect="{{true}}"
   initColumnSelectedIndex
-  bindchange="pickerChange_2">
+  disabled="{{false}}"
+  bindchange="pickerChange"
+  bindcancel="pickerCancel"
+  bindcolumnchange="pickerColumnchange"
+  data-picker="picker_2">
     <view class="picker">
       当前选择：<view wx:for="{{result_2}}" wx:key="index">{{item['name']}}</view>
     </view>