@tmagic/utils 1.8.0-beta.1 → 1.8.0-beta.10

package/dist/es/index.js

@@ -20,47 +20,48 @@ var emptyFn = () => void 0;
 * @param {Array} data 要查找的根容器节点
 * @return {Array} 组件在data中的子孙路径
 */
-var getNodePath = (id, data = []) => {
+var getNodePath = (id, data = [], skip) => {
 	const path = [];
-	const get = function(id, data) {
+	const targetId = `${id}`;
+	const get = function(data) {
 		if (!Array.isArray(data)) return null;
 		for (let i = 0, l = data.length; i < l; i++) {
 			const item = data[i];
 			path.push(item);
-			if (`${item.id}` === `${id}`) return item;
-			if (item.items) {
-				const node = get(id, item.items);
+			if (`${item.id}` === targetId) return item;
+			if (item.items && item !== skip) {
+				const node = get(item.items);
 				if (node) return node;
 			}
 			path.pop();
 		}
 		return null;
 	};
-	get(id, data);
+	get(data);
 	return path;
 };
-var getNodeInfo = (id, root) => {
+var getNodeInfo = (id, root, skip) => {
 	const info = {
 		node: null,
 		parent: null,
-		page: null
+		page: null,
+		path: []
 	};
 	if (!root) return info;
 	if (id === root.id) {
 		info.node = root;
 		return info;
 	}
-	const path = getNodePath(id, root.items);
+	const path = getNodePath(id, root.items, skip);
+	info.path = path;
 	if (!path.length) return info;
 	path.unshift(root);
 	info.node = path[path.length - 1];
 	info.parent = path[path.length - 2];
-	path.forEach((item) => {
-		if (isPage(item) || isPageFragment(item)) {
-			info.page = item;
-			return;
-		}
-	});
+	for (const item of path) if (isPage(item) || isPageFragment(item)) {
+		info.page = item;
+		break;
+	}
 	return info;
 };
 var filterXSS = (str) => str.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");