From 3fb66526071fec18098ac2ac246fddf4e6adf80c Mon Sep 17 00:00:00 2001
From: huangxuan <huangxuan20@huawei.com>
Date: Thu, 30 Nov 2023 16:09:33 +0800
Subject: [PATCH] =?UTF-8?q?[inulax]=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8connect=20API=EF=BC=8Cprops=E9=87=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89dispatch=E6=96=B9=E6=B3=95=EF=BC=9B=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=AF=94=E8=BE=83=E7=AE=97=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=AD=BB=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/inula/src/inulax/CommonUtils.ts      | 54 +++++++++++++++----
 .../inula/src/inulax/adapters/reduxReact.ts   |  1 +
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/packages/inula/src/inulax/CommonUtils.ts b/packages/inula/src/inulax/CommonUtils.ts
index 5202a200..ccbb182f 100644
--- a/packages/inula/src/inulax/CommonUtils.ts
+++ b/packages/inula/src/inulax/CommonUtils.ts
@@ -67,18 +67,50 @@ export function isPromise(obj: any): boolean {
   return isObject(obj) && typeof obj.then === 'function';
 }
 
-export function isSame(x, y) {
-  if (typeof Object.is !== 'function') {
-    if (x === y) {
-      // +0 != -0
-      return x !== 0 || 1 / x === 1 / y;
-    } else {
-      // NaN == NaN
-      return x !== x && y !== y;
-    }
-  } else {
-    return Object.is(x, y);
+export function isSame(x: unknown, y: unknown): boolean {
+  // 如果两个对象是同一个引用，直接返回true
+  if (x === y) {
+    return true;
   }
+  // 如果两个对象类型不同，直接返回false
+  if (typeof x !== typeof y) {
+    return false;
+  }
+  // 如果两个对象都是null或undefined，直接返回true
+  if (x == null || y == null) {
+    return true;
+  }
+  // 如果两个对象都是基本类型，比较他们的值是否相等
+  if (typeof x !== 'object') {
+    return x === y;
+  }
+  // 如果两个对象都是数组，比较他们的长度是否相等，然后递归比较每个元素是否相等
+  if (Array.isArray(x) && Array.isArray(y)) {
+    if (x.length !== y.length) {
+      return false;
+    }
+    for (let i = 0; i < x.length; i++) {
+      if (!isSame(x[i], y[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  // 两个对象都是普通对象，首先比较他们的属性数量是否相等，然后递归比较每个属性的值是否相等
+  if (typeof x === 'object' && typeof y === 'object') {
+    const keys1 = Object.keys(x!).sort();
+    const keys2 = Object.keys(y!).sort();
+    if (keys1.length !== keys2.length) {
+      return false;
+    }
+    for (let i = 0; i < keys1.length; i++) {
+      if (!isSame(x![keys1[i]], y![keys2[i]])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return false;
 }
 
 export function getDetailedType(val: any) {
diff --git a/packages/inula/src/inulax/adapters/reduxReact.ts b/packages/inula/src/inulax/adapters/reduxReact.ts
index 160dec37..1cc6cbb8 100644
--- a/packages/inula/src/inulax/adapters/reduxReact.ts
+++ b/packages/inula/src/inulax/adapters/reduxReact.ts
@@ -162,6 +162,7 @@ export function connect<StateProps, DispatchProps, OwnProps, MergedProps>(
           mappedDispatch = mapDispatchToProps(store.dispatch, props);
         }
       }
+      mappedDispatch = Object.assign({}, mappedDispatch, { dispatch: store.dispatch });
       const mergedProps = (
         mergeProps ||
         ((state, dispatch, originalProps) => {