Merge pull request #3105 from rex-zsd/feat/rate_20200501

feat(rate): support model value

example/pages/rate/index.js

@@ -7,13 +7,6 @@ Page({
     value3: 3,
     value4: 2.5,
     value5: 4,
-    value6: 3
+    value6: 3,
   },
-
-  onChange(event) {
-    const { key } = event.currentTarget.dataset;
-    this.setData({
-      [key]: event.detail
-    });
-  }
 });

example/pages/rate/index.wxml

@@ -1,8 +1,7 @@
 <demo-block title="基础用法">
   <van-rate
     custom-class="rate-position"
-    data-key="value1"
+    model:value="{{ value1 }}"
-    value="{{ value1 }}"
   />
 </demo-block>
 
@@ -11,53 +10,45 @@
     custom-class="rate-position"
     icon="like"
     void-icon="like-o"
-    data-key="value2"
+    model:value="{{ value2 }}"
-    value="{{ value2 }}"
   />
 </demo-block>
 
 <demo-block title="自定义样式">
   <van-rate
     custom-class="rate-position"
-    data-key="value3"
+    model:value="{{ value3 }}"
-    value="{{ value3 }}"
     size="{{ 25 }}"
     color="#ee0a24"
     void-color="#eee"
     void-icon="star"
-    bind:change="onChange"
   />
 </demo-block>
 
 <demo-block title="半星">
   <van-rate
     custom-class="rate-position"
-    data-key="value4"
+    model:value="{{ value4 }}"
-    value="{{ value4 }}"
     size="{{ 25 }}"
     allow-half
     color="#ee0a24"
     void-color="#eee"
     void-icon="star"
     touchable="{{ false }}"
-    bind:change="onChange"
   />
 </demo-block>
 
 <demo-block title="自定义数量">
   <van-rate
     custom-class="rate-position"
-    data-key="value5"
+    model:value="{{ value5 }}"
-    value="{{ value5 }}"
     count="{{ 6 }}"
-    bind:change="onChange"
   />
 </demo-block>
 
 <demo-block title="禁用状态">
   <van-rate
     custom-class="rate-position"
-    data-key="value6"
     value="{{ value6 }}"
     disabled
   />
@@ -66,7 +57,6 @@
 <demo-block title="只读状态">
   <van-rate
     custom-class="rate-position"
-    data-key="value6"
     value="{{ value6 }}"
     readonly
   />

example/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"cloudfunctionRoot": "functions/",
-	"libVersion": "2.3.0",
+	"libVersion": "2.9.3",
 	"appid": "wx1c01b35002d3ba14",
 	"projectname": "vant-weapp",
 	"debugOptions": {

packages/common/version.ts

@@ -0,0 +1,33 @@
+import { getSystemInfoSync } from './utils';
+
+function compareVersion(v1, v2) {
+  v1 = v1.split('.');
+  v2 = v2.split('.');
+  const len = Math.max(v1.length, v2.length);
+
+  while (v1.length < len) {
+    v1.push('0');
+  }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i], 10);
+    const num2 = parseInt(v2[i], 10);
+
+    if (num1 > num2) {
+      return 1;
+    }
+    if (num1 < num2) {
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+export function canIUseModel() {
+  const system = getSystemInfoSync();
+  return compareVersion(system.SDKVersion, '2.9.3') >= 0;
+}

packages/field/index.ts

@@ -1,6 +1,7 @@
 import { VantComponent } from '../common/component';
 import { Weapp } from 'definitions/weapp';
 import { commonProps, inputProps, textareaProps } from './props';
+import { canIUseModel } from '../common/version';
 
 VantComponent({
   field: true,
@@ -121,7 +122,9 @@ VantComponent({
     },
 
     emitChange() {
-      this.setData({ value: this.value });
+      if (canIUseModel()) {
+        this.setData({ value: this.value });
+      }
 
       wx.nextTick(() => {
         this.$emit('input', this.value);

packages/rate/index.ts

@@ -1,5 +1,6 @@
 import { VantComponent } from '../common/component';
 import { Weapp } from 'definitions/weapp';
+import { canIUseModel } from '../common/version';
 
 VantComponent({
   field: true,
@@ -64,8 +65,15 @@ VantComponent({
       const { score } = event.currentTarget.dataset;
       if (!data.disabled && !data.readonly) {
         this.setData({ innerValue: score + 1 });
-        this.$emit('input', score + 1);
+
-        this.$emit('change', score + 1);
+        if (canIUseModel()) {
+          this.setData({ value: score + 1 });
+        }
+
+        wx.nextTick(() => {
+          this.$emit('input', score + 1);
+          this.$emit('change', score + 1);
+        });
       }
     },