From ff982f6cd0a8e837d5b50ca89cc429def1bcc1eb Mon Sep 17 00:00:00 2001
From: landluck <landl_ww@163.com>
Date: Tue, 14 May 2024 20:26:21 +0800
Subject: [PATCH] fix(field): fixed clear button incorrectly displaying when
 value has default value (#5792)

---
 packages/definitions/index.ts |  1 +
 packages/field/index.ts       | 16 +++++++++++++++-
 packages/field/props.ts       | 10 +---------
 packages/mixins/basic.ts      | 23 +++++++++++++++++++++++
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/packages/definitions/index.ts b/packages/definitions/index.ts
index 75088076..2c611b59 100644
--- a/packages/definitions/index.ts
+++ b/packages/definitions/index.ts
@@ -7,6 +7,7 @@ interface VantComponentInstance {
     detail?: unknown,
     options?: WechatMiniprogram.Component.TriggerEventOption
   ) => void;
+  setView: (value: Record<string, any>, callback?: () => void) => void;
 }
 
 export type VantComponentOptions<
diff --git a/packages/field/index.ts b/packages/field/index.ts
index b285f973..9e05904c 100644
--- a/packages/field/index.ts
+++ b/packages/field/index.ts
@@ -66,6 +66,20 @@ VantComponent({
     showClear: false,
   },
 
+  watch: {
+    value(this: WechatMiniprogram.Component.TrivialInstance, value) {
+      if (value !== this.value) {
+        this.setData({ innerValue: value });
+        this.value = value;
+
+        this.setShowClear();
+      }
+    },
+    clearTrigger() {
+      this.setShowClear();
+    },
+  },
+
   created() {
     this.value = this.data.value;
     this.setData({ innerValue: this.value });
@@ -204,7 +218,7 @@ VantComponent({
         showClear = hasValue && trigger;
       }
 
-      this.setData({ showClear });
+      this.setView({ showClear });
     },
 
     noop() {},
diff --git a/packages/field/props.ts b/packages/field/props.ts
index 9606ffc7..f85d6aa6 100644
--- a/packages/field/props.ts
+++ b/packages/field/props.ts
@@ -1,13 +1,5 @@
 export const commonProps: WechatMiniprogram.Component.PropertyOption = {
-  value: {
-    type: String,
-    observer(this: WechatMiniprogram.Component.TrivialInstance, value) {
-      if (value !== this.value) {
-        this.setData({ innerValue: value });
-        this.value = value;
-      }
-    },
-  },
+  value: String,
   placeholder: String,
   placeholderStyle: String,
   placeholderClass: String,
diff --git a/packages/mixins/basic.ts b/packages/mixins/basic.ts
index 850f99ff..c0be814a 100644
--- a/packages/mixins/basic.ts
+++ b/packages/mixins/basic.ts
@@ -13,5 +13,28 @@ export const basic = Behavior({
 
       return new Promise((resolve) => wx.nextTick(resolve));
     },
+
+    // high performance setData
+    setView(
+      this: WechatMiniprogram.Component.TrivialInstance,
+      data: Record<string, any>,
+      callback?: () => void
+    ) {
+      const target: Record<string, any> = {};
+      let hasChange = false;
+
+      Object.keys(data).forEach((key) => {
+        if (data[key] !== this.data[key]) {
+          target[key] = data[key];
+          hasChange = true;
+        }
+      });
+
+      if (hasChange) {
+        return this.setData(target, callback);
+      }
+
+      return callback && callback();
+    },
   },
 });