Merge pull request #768 from andrew703/new-function-fixed

New function fixed
baidu · Aug 1, 2023 · afa239f · afa239f
2 parents 65cb897 + 55f78fc
commit afa239f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/util/inherits.js b/src/util/inherits.js
@@ -18,7 +18,7 @@ var extend = require('./extend');
 function inherits(subClass, superClass) {
     /* jshint -W054 */
     var subClassProto = subClass.prototype;
-    var F = new Function();
+    var F = function () {};
     F.prototype = superClass.prototype;
     subClass.prototype = new F();
     subClass.prototype.constructor = subClass;

diff --git a/src/view/component.js b/src/view/component.js
@@ -161,8 +161,7 @@ function Component(options) { // eslint-disable-line
                 var stumpText = stumpMatch[1];
 
                 // fill component data
-                options.data = (new Function('return '
-                    + stumpText
+                options.data = JSON.parse(stumpText
                         .replace(/^[\s\n]*/, '')
                         .replace(
                             /"(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.\d+Z"/g,
@@ -171,7 +170,7 @@ function Component(options) { // eslint-disable-line
                                     + ',' + (+h) + ',' + (+m) + ',' + (+s) + ')';
                             }
                         )
-                ))();
+                );
 
                 if (firstCommentNode.previousSibling) {
                     removeEl(firstCommentNode.previousSibling);

diff --git a/src/view/for-node.js b/src/view/for-node.js
@@ -23,6 +23,7 @@ var createNode = require('./create-node');
 var createHydrateNode = require('./create-hydrate-node');
 var nodeOwnSimpleDispose = require('./node-own-simple-dispose');
 var nodeOwnCreateStump = require('./node-own-create-stump');
+var bind = require('../util/bind');
 
 
 /**
@@ -88,7 +89,7 @@ ForItemData.prototype.exprResolve = function (expr) {
                         )
                     };
                     break;
-                   
+
                 case this.indexName:
                     pathSeg = {
                         type: ExprType.NUMBER,
@@ -404,7 +405,7 @@ ForNode.prototype._updateArray = function (changes, newList) {
     var childrenNeedUpdate = {};
 
     var newLen = newList.length;
-    var getItemKey = this.aNode._gfk;
+    var getItemKey = bind(this.aNode._gfk, this.aNode);
 
     /* eslint-disable no-redeclare */
     for (var cIndex = 0; cIndex < changes.length; cIndex++) {

diff --git a/src/view/preheat-a-node.js b/src/view/preheat-a-node.js
@@ -111,10 +111,17 @@ function preheatANode(aNode, componentInstance) {
                                 && trackBy.type === ExprType.ACCESSOR
                                 && trackBy.paths[0].value === directive.item
                             ) {
-                                aNode._gfk = new Function( // hotspot: getForKey
-                                    directive.item,
-                                    'return ' + directive.trackByRaw
-                                );
+                                aNode._gfk = function (data) { // hotspot: getForKey
+                                    var paths = this.directives.for.trackBy.paths || [];
+                                    var pathsLen = paths.length;
+                                    var value = data;
+                                    var key = '';
+                                    for (var i = 1; i < pathsLen; i++) {
+                                        key = paths[i].value;
+                                        value = value[key];
+                                    }
+                                    return value;
+                                }
                             }
                         }
                     }