From b215062177a607ae53e9ef10ffad092f4f506f82 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Tue, 14 Jan 2025 16:22:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(dep):=20=E6=80=A7=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=94=B6=E9=9B=86=E6=97=B6=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=ADid=E4=B8=8Ename=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=81=9A=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/dep/src/Watcher.ts | 35 +++++++++++++++++++----------------
 packages/dep/src/utils.ts   | 14 +++++++++-----
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/packages/dep/src/Watcher.ts b/packages/dep/src/Watcher.ts
index e42be38d..71a106fe 100644
--- a/packages/dep/src/Watcher.ts
+++ b/packages/dep/src/Watcher.ts
@@ -103,9 +103,9 @@ export default class Watcher {
    * 删除所有target
    */
   public clearTargets() {
-    Object.keys(this.targetsList).forEach((key) => {
+    for (const key of Object.keys(this.targetsList)) {
       delete this.targetsList[key];
-    });
+    }
   }
 
   /**
@@ -137,9 +137,9 @@ export default class Watcher {
         if (!type && !target.isCollectByDefault) {
           return;
         }
-        nodes.forEach((node) => {
+        for (const node of nodes) {
           cb({ node, target });
-        });
+        }
       },
       type,
     );
@@ -161,7 +161,7 @@ export default class Watcher {
     const clearedItemsNodeIds: (string | number)[] = [];
     traverseTarget(targetsList, (target) => {
       if (nodes) {
-        nodes.forEach((node) => {
+        for (const node of nodes) {
           target.removeDep(node[this.idProp]);
 
           if (
@@ -172,7 +172,7 @@ export default class Watcher {
             clearedItemsNodeIds.push(node[this.idProp]);
             this.clear(node[this.childrenProp]);
           }
-        });
+        }
       } else {
         target.removeDep();
       }
@@ -202,26 +202,29 @@ export default class Watcher {
             key: fullKey,
           });
         } else if (!keyIsItems && Array.isArray(value)) {
-          value.forEach((item, index) => {
+          for (let i = 0, l = value.length; i < l; i++) {
+            const item = value[i];
             if (isObject(item)) {
-              collectTarget(item, `${fullKey}[${index}]`);
+              collectTarget(item, `${fullKey}[${i}]`);
             }
-          });
+          }
         } else if (isObject(value)) {
           collectTarget(value, fullKey);
         }
 
         if (keyIsItems && deep && Array.isArray(value)) {
-          value.forEach((child) => {
+          for (const child of value) {
             this.collectItem(child, target, depExtendedData, deep);
-          });
+          }
         }
       };
 
-      Object.entries(config).forEach(([key, value]) => {
-        if (typeof value === 'undefined' || value === '') return;
+      for (const [key, value] of Object.entries(config)) {
+        if (typeof value === 'undefined' || value === '') continue;
+
+        if (key === 'id' || key === 'name') continue;
         doCollect(key, value);
-      });
+      }
     };
 
     collectTarget(node);
@@ -230,9 +233,9 @@ export default class Watcher {
   public removeTargetDep(target: Target, node: TargetNode, key?: string | number) {
     target.removeDep(node[this.idProp], key);
     if (typeof key === 'undefined' && Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length) {
-      node[this.childrenProp].forEach((item: TargetNode) => {
+      for (const item of node[this.childrenProp] as TargetNode[]) {
         this.removeTargetDep(target, item, key);
-      });
+      }
     }
   }
 }
diff --git a/packages/dep/src/utils.ts b/packages/dep/src/utils.ts
index bca6e332..6b62bcad 100644
--- a/packages/dep/src/utils.ts
+++ b/packages/dep/src/utils.ts
@@ -185,6 +185,10 @@ export const isDataSourceTarget = (
   value: any,
   hasArray = false,
 ) => {
+  if (!value || !['string', 'object'].includes(typeof value)) {
+    return false;
+  }
+
   if (`${key}`.startsWith(NODE_CONDS_KEY)) {
     return false;
   }
@@ -285,12 +289,12 @@ export const traverseTarget = (
   cb: (target: Target) => void,
   type?: DepTargetType | string,
 ) => {
-  Object.values(targetsList).forEach((targets) => {
-    Object.values(targets).forEach((target) => {
+  for (const targets of Object.values(targetsList)) {
+    for (const target of Object.values(targets)) {
       if (type && target.type !== type) {
-        return;
+        continue;
       }
       cb(target);
-    });
-  });
+    }
+  }
 };