Merge pull request #1107 from ecomfe/release-dev

Release v5.6.1
ecomfe · Dec 10, 2024 · 7bbbdbe · 7bbbdbe
2 parents 45df132 + 6eb0c73
commit 7bbbdbe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/dist/zrender.js b/dist/zrender.js
@@ -368,7 +368,7 @@
         }
         else {
             for (var key in arr) {
-                if (arr.hasOwnProperty(key) && key !== protoKey) {
+                if (arr.hasOwnProperty(key)) {
                     cb.call(context, arr[key], key, arr);
                 }
             }
@@ -436,11 +436,11 @@
             return [];
         }
         if (Object.keys) {
-            return filter(Object.keys(obj), function (key) { return key !== protoKey; });
+            return Object.keys(obj);
         }
         var keyList = [];
         for (var key in obj) {
-            if (obj.hasOwnProperty(key) && key !== protoKey) {
+            if (obj.hasOwnProperty(key)) {
                 keyList.push(key);
             }
         }

diff --git a/dist/zrender.js.map b/dist/zrender.js.map
diff --git a/dist/zrender.min.js b/dist/zrender.min.js
diff --git a/src/core/util.ts b/src/core/util.ts
@@ -319,7 +319,7 @@ export function each<I extends Dictionary<any> | any[] | readonly any[] | ArrayL
     }
     else {
         for (let key in arr) {
-            if (arr.hasOwnProperty(key) && key !== protoKey) {
+            if (arr.hasOwnProperty(key)) {
                 cb.call(context, (arr as Dictionary<any>)[key], key as any, arr);
             }
         }
@@ -436,11 +436,11 @@ export function keys<T extends object>(obj: T): (KeyOfDistributive<T> & string)[
     // `Object.keys` only return string rather than `number | string`.
     type TKeys = KeyOfDistributive<T> & string;
     if (Object.keys) {
-        return filter(Object.keys(obj) as TKeys[], key => key !== protoKey);
+        return Object.keys(obj) as TKeys[];
     }
     let keyList: TKeys[] = [];
     for (let key in obj) {
-        if (obj.hasOwnProperty(key) && key !== protoKey) {
+        if (obj.hasOwnProperty(key)) {
             keyList.push(key as any);
         }
     }