@tmagic/utils 1.8.0-beta.2 → 1.8.0-beta.21

package/dist/es/index.js

@@ -1,6 +1,6 @@
 import { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME } from "./const.js";
 import { addClassName, asyncLoadCss, asyncLoadJs, calcValueByFontsize, createDiv, getDocument, getElById, getIdFromEl, injectStyle, removeClassName, removeClassNameByClassName, setDslDomRelateConfig, setIdToEl } from "./dom.js";
-import { cloneDeep, set } from "lodash-es";
+import { cloneDeep, get, set } from "lodash-es";
 import { NodeType } from "@tmagic/schema";
 //#region packages/utils/src/index.ts
 var _globalThis;
@@ -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 (isPageOrFragment(item)) {
+		info.page = item;
+		break;
+	}
 	return info;
 };
 var filterXSS = (str) => str.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
@@ -142,6 +143,8 @@ var isPageFragment = (node) => {
 	if (!node) return false;
 	return Boolean(node.type?.toLowerCase() === NodeType.PAGE_FRAGMENT);
 };
+/** 是否为页面或页面片 */
+var isPageOrFragment = (node) => isPage(node) || isPageFragment(node);
 var isNumber = (value) => typeof value === "number" && !isNaN(value) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
 var getHost = (targetUrl) => targetUrl.match(/\/\/([^/]+)/)?.[1];
 var isSameDomain = (targetUrl = "", source = globalThis.location.host) => {
@@ -158,6 +161,12 @@ var guid = (digit = 8) => "x".repeat(digit).replace(/[xy]/g, (c) => {
 	return (c === "x" ? r : r & 3 | 8).toString(16);
 });
 var getKeysArray = (keys) => `${keys}`.replace(/\[(\d+)\]/g, ".$1").split(".");
+/**
+* 判断某一层 key 是否为数组下标（纯数字）
+* @param key 单层 key
+* @returns 是否为数组下标
+*/
+var isArrayIndex = (key) => /^\d+$/.test(`${key}`);
 var getValueByKeyPath = (keys = "", data = {}) => {
 	return (Array.isArray(keys) ? keys : getKeysArray(keys)).reduce((accumulator, currentValue) => {
 		if (isObject(accumulator)) return accumulator[currentValue];
@@ -165,7 +174,18 @@ var getValueByKeyPath = (keys = "", data = {}) => {
 		throw new Error(`${data}中不存在${keys}`);
 	}, data);
 };
-var setValueByKeyPath = (keys, value, data = {}) => set(data, keys, value);
+var setValueByKeyPath = (keys, value, data = {}) => {
+	if (typeof value === "undefined") {
+		const keyArray = getKeysArray(keys);
+		const lastKey = keyArray[keyArray.length - 1];
+		if (keyArray.length > 1 && isArrayIndex(lastKey)) {
+			const parentPath = keyArray.slice(0, -1).join(".");
+			if (typeof get(data, parentPath) === "undefined") set(data, parentPath, []);
+			return data;
+		}
+	}
+	return set(data, keys, value);
+};
 var getNodes = (ids, data = []) => {
 	const nodes = [];
 	const get = function(ids, data) {
@@ -356,4 +376,4 @@ var isValueIncludeDataSource = (value) => {
 };
 var removeDataSourceFieldPrefix = (id) => id?.replace("ds-field::", "") || "";
 //#endregion
-export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, PAGE_FRAGMENT_CONTAINER_ID_KEY, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, delQueStr, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getSearchObj, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, removeDataSourceFieldPrefix, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };
+export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, PAGE_FRAGMENT_CONTAINER_ID_KEY, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, delQueStr, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getSearchObj, getUrlParam, getValueByKeyPath, guid, injectStyle, isArrayIndex, isDslNode, isNumber, isObject, isPage, isPageFragment, isPageOrFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, removeDataSourceFieldPrefix, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };

package/dist/tmagic-utils.umd.cjs

@@ -68,7 +68,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseGetTag.js
 	/** `Object#toString` result references. */
-	var nullTag = "[object Null]", undefinedTag = "[object Undefined]";
+	var nullTag = "[object Null]";
+	var undefinedTag = "[object Undefined]";
 	/** Built-in value references. */
 	var symToStringTag = Symbol ? Symbol.toStringTag : void 0;
 	/**
@@ -182,7 +183,8 @@
 	/** Used as references for various `Number` constants. */
 	var INFINITY$1 = Infinity;
 	/** Used to convert symbols to primitives and strings. */
-	var symbolProto$1 = Symbol ? Symbol.prototype : void 0, symbolToString = symbolProto$1 ? symbolProto$1.toString : void 0;
+	var symbolProto$1 = Symbol ? Symbol.prototype : void 0;
+	var symbolToString = symbolProto$1 ? symbolProto$1.toString : void 0;
 	/**
 	* The base implementation of `_.toString` which doesn't convert nullish
 	* values to empty strings.
@@ -232,7 +234,10 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/isFunction.js
 	/** `Object#toString` result references. */
-	var asyncTag = "[object AsyncFunction]", funcTag$2 = "[object Function]", genTag$1 = "[object GeneratorFunction]", proxyTag = "[object Proxy]";
+	var asyncTag = "[object AsyncFunction]";
+	var funcTag$2 = "[object Function]";
+	var genTag$1 = "[object GeneratorFunction]";
+	var proxyTag = "[object Proxy]";
 	/**
 	* Checks if `value` is classified as a `Function` object.
 	*
@@ -308,7 +313,8 @@
 	/** Used to detect host constructors (Safari). */
 	var reIsHostCtor = /^\[object .+?Constructor\]$/;
 	/** Used for built-in method references. */
-	var funcProto = Function.prototype, objectProto$2 = Object.prototype;
+	var funcProto = Function.prototype;
+	var objectProto$2 = Object.prototype;
 	/** Used to resolve the decompiled source of functions. */
 	var funcToString = funcProto.toString;
 	/** Used to check objects for own properties. */
@@ -726,8 +732,30 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseIsTypedArray.js
 	/** `Object#toString` result references. */
-	var argsTag$1 = "[object Arguments]", arrayTag$1 = "[object Array]", boolTag$2 = "[object Boolean]", dateTag$2 = "[object Date]", errorTag$1 = "[object Error]", funcTag$1 = "[object Function]", mapTag$4 = "[object Map]", numberTag$2 = "[object Number]", objectTag$2 = "[object Object]", regexpTag$2 = "[object RegExp]", setTag$4 = "[object Set]", stringTag$2 = "[object String]", weakMapTag$2 = "[object WeakMap]";
-	var arrayBufferTag$2 = "[object ArrayBuffer]", dataViewTag$3 = "[object DataView]", float32Tag$2 = "[object Float32Array]", float64Tag$2 = "[object Float64Array]", int8Tag$2 = "[object Int8Array]", int16Tag$2 = "[object Int16Array]", int32Tag$2 = "[object Int32Array]", uint8Tag$2 = "[object Uint8Array]", uint8ClampedTag$2 = "[object Uint8ClampedArray]", uint16Tag$2 = "[object Uint16Array]", uint32Tag$2 = "[object Uint32Array]";
+	var argsTag$1 = "[object Arguments]";
+	var arrayTag$1 = "[object Array]";
+	var boolTag$2 = "[object Boolean]";
+	var dateTag$2 = "[object Date]";
+	var errorTag$1 = "[object Error]";
+	var funcTag$1 = "[object Function]";
+	var mapTag$4 = "[object Map]";
+	var numberTag$2 = "[object Number]";
+	var objectTag$2 = "[object Object]";
+	var regexpTag$2 = "[object RegExp]";
+	var setTag$4 = "[object Set]";
+	var stringTag$2 = "[object String]";
+	var weakMapTag$2 = "[object WeakMap]";
+	var arrayBufferTag$2 = "[object ArrayBuffer]";
+	var dataViewTag$3 = "[object DataView]";
+	var float32Tag$2 = "[object Float32Array]";
+	var float64Tag$2 = "[object Float64Array]";
+	var int8Tag$2 = "[object Int8Array]";
+	var int16Tag$2 = "[object Int16Array]";
+	var int32Tag$2 = "[object Int32Array]";
+	var uint8Tag$2 = "[object Uint8Array]";
+	var uint8ClampedTag$2 = "[object Uint8ClampedArray]";
+	var uint16Tag$2 = "[object Uint16Array]";
+	var uint32Tag$2 = "[object Uint32Array]";
 	/** Used to identify `toStringTag` values of typed arrays. */
 	var typedArrayTags = {};
 	typedArrayTags[float32Tag$2] = typedArrayTags[float64Tag$2] = typedArrayTags[int8Tag$2] = typedArrayTags[int16Tag$2] = typedArrayTags[int32Tag$2] = typedArrayTags[uint8Tag$2] = typedArrayTags[uint8ClampedTag$2] = typedArrayTags[uint16Tag$2] = typedArrayTags[uint32Tag$2] = true;
@@ -942,7 +970,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_isKey.js
 	/** Used to match property names within property paths. */
-	var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, reIsPlainProp = /^\w*$/;
+	var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/;
+	var reIsPlainProp = /^\w*$/;
 	/**
 	* Checks if `value` is a property name and not a property path.
 	*
@@ -1482,6 +1511,53 @@
 		return result == "0" && 1 / value == -INFINITY ? "-0" : result;
 	}
 	//#endregion
+	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseGet.js
+	/**
+	* The base implementation of `_.get` without support for default values.
+	*
+	* @private
+	* @param {Object} object The object to query.
+	* @param {Array|string} path The path of the property to get.
+	* @returns {*} Returns the resolved value.
+	*/
+	function baseGet(object, path) {
+		path = castPath(path, object);
+		var index = 0, length = path.length;
+		while (object != null && index < length) object = object[toKey(path[index++])];
+		return index && index == length ? object : void 0;
+	}
+	//#endregion
+	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/get.js
+	/**
+	* Gets the value at `path` of `object`. If the resolved value is
+	* `undefined`, the `defaultValue` is returned in its place.
+	*
+	* @static
+	* @memberOf _
+	* @since 3.7.0
+	* @category Object
+	* @param {Object} object The object to query.
+	* @param {Array|string} path The path of the property to get.
+	* @param {*} [defaultValue] The value returned for `undefined` resolved values.
+	* @returns {*} Returns the resolved value.
+	* @example
+	*
+	* var object = { 'a': [{ 'b': { 'c': 3 } }] };
+	*
+	* _.get(object, 'a[0].b.c');
+	* // => 3
+	*
+	* _.get(object, ['a', '0', 'b', 'c']);
+	* // => 3
+	*
+	* _.get(object, 'a.b.c', 'default');
+	* // => 'default'
+	*/
+	function get(object, path, defaultValue) {
+		var result = object == null ? void 0 : baseGet(object, path);
+		return result === void 0 ? defaultValue : result;
+	}
+	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_arrayPush.js
 	/**
 	* Appends the elements of `values` to `array`.
@@ -1639,7 +1715,8 @@
 	/** Detect free variable `module`. */
 	var freeModule = freeExports && typeof module == "object" && module && !module.nodeType && module;
 	/** Built-in value references. */
-	var Buffer = freeModule && freeModule.exports === freeExports ? root.Buffer : void 0, allocUnsafe = Buffer ? Buffer.allocUnsafe : void 0;
+	var Buffer = freeModule && freeModule.exports === freeExports ? root.Buffer : void 0;
+	var allocUnsafe = Buffer ? Buffer.allocUnsafe : void 0;
 	/**
 	* Creates a clone of  `buffer`.
 	*
@@ -1812,10 +1889,18 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_getTag.js
 	/** `Object#toString` result references. */
-	var mapTag$3 = "[object Map]", objectTag$1 = "[object Object]", promiseTag = "[object Promise]", setTag$3 = "[object Set]", weakMapTag$1 = "[object WeakMap]";
+	var mapTag$3 = "[object Map]";
+	var objectTag$1 = "[object Object]";
+	var promiseTag = "[object Promise]";
+	var setTag$3 = "[object Set]";
+	var weakMapTag$1 = "[object WeakMap]";
 	var dataViewTag$2 = "[object DataView]";
 	/** Used to detect maps, sets, and weakmaps. */
-	var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map$1), promiseCtorString = toSource(Promise$1), setCtorString = toSource(Set$1), weakMapCtorString = toSource(WeakMap);
+	var dataViewCtorString = toSource(DataView);
+	var mapCtorString = toSource(Map$1);
+	var promiseCtorString = toSource(Promise$1);
+	var setCtorString = toSource(Set$1);
+	var weakMapCtorString = toSource(WeakMap);
 	/**
 	* Gets the `toStringTag` of `value`.
 	*
@@ -1906,7 +1991,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_cloneSymbol.js
 	/** Used to convert symbols to primitives and strings. */
-	var symbolProto = Symbol ? Symbol.prototype : void 0, symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
+	var symbolProto = Symbol ? Symbol.prototype : void 0;
+	var symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
 	/**
 	* Creates a clone of the `symbol` object.
 	*
@@ -1934,8 +2020,25 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_initCloneByTag.js
 	/** `Object#toString` result references. */
-	var boolTag$1 = "[object Boolean]", dateTag$1 = "[object Date]", mapTag$2 = "[object Map]", numberTag$1 = "[object Number]", regexpTag$1 = "[object RegExp]", setTag$2 = "[object Set]", stringTag$1 = "[object String]", symbolTag$1 = "[object Symbol]";
-	var arrayBufferTag$1 = "[object ArrayBuffer]", dataViewTag$1 = "[object DataView]", float32Tag$1 = "[object Float32Array]", float64Tag$1 = "[object Float64Array]", int8Tag$1 = "[object Int8Array]", int16Tag$1 = "[object Int16Array]", int32Tag$1 = "[object Int32Array]", uint8Tag$1 = "[object Uint8Array]", uint8ClampedTag$1 = "[object Uint8ClampedArray]", uint16Tag$1 = "[object Uint16Array]", uint32Tag$1 = "[object Uint32Array]";
+	var boolTag$1 = "[object Boolean]";
+	var dateTag$1 = "[object Date]";
+	var mapTag$2 = "[object Map]";
+	var numberTag$1 = "[object Number]";
+	var regexpTag$1 = "[object RegExp]";
+	var setTag$2 = "[object Set]";
+	var stringTag$1 = "[object String]";
+	var symbolTag$1 = "[object Symbol]";
+	var arrayBufferTag$1 = "[object ArrayBuffer]";
+	var dataViewTag$1 = "[object DataView]";
+	var float32Tag$1 = "[object Float32Array]";
+	var float64Tag$1 = "[object Float64Array]";
+	var int8Tag$1 = "[object Int8Array]";
+	var int16Tag$1 = "[object Int16Array]";
+	var int32Tag$1 = "[object Int32Array]";
+	var uint8Tag$1 = "[object Uint8Array]";
+	var uint8ClampedTag$1 = "[object Uint8ClampedArray]";
+	var uint16Tag$1 = "[object Uint16Array]";
+	var uint32Tag$1 = "[object Uint32Array]";
 	/**
 	* Initializes an object clone based on its `toStringTag`.
 	*
@@ -2057,10 +2160,36 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/_baseClone.js
 	/** Used to compose bitmasks for cloning. */
-	var CLONE_DEEP_FLAG$1 = 1, CLONE_FLAT_FLAG = 2, CLONE_SYMBOLS_FLAG$1 = 4;
+	var CLONE_DEEP_FLAG$1 = 1;
+	var CLONE_FLAT_FLAG = 2;
+	var CLONE_SYMBOLS_FLAG$1 = 4;
 	/** `Object#toString` result references. */
-	var argsTag = "[object Arguments]", arrayTag = "[object Array]", boolTag = "[object Boolean]", dateTag = "[object Date]", errorTag = "[object Error]", funcTag = "[object Function]", genTag = "[object GeneratorFunction]", mapTag = "[object Map]", numberTag = "[object Number]", objectTag = "[object Object]", regexpTag = "[object RegExp]", setTag = "[object Set]", stringTag = "[object String]", symbolTag = "[object Symbol]", weakMapTag = "[object WeakMap]";
-	var arrayBufferTag = "[object ArrayBuffer]", dataViewTag = "[object DataView]", float32Tag = "[object Float32Array]", float64Tag = "[object Float64Array]", int8Tag = "[object Int8Array]", int16Tag = "[object Int16Array]", int32Tag = "[object Int32Array]", uint8Tag = "[object Uint8Array]", uint8ClampedTag = "[object Uint8ClampedArray]", uint16Tag = "[object Uint16Array]", uint32Tag = "[object Uint32Array]";
+	var argsTag = "[object Arguments]";
+	var arrayTag = "[object Array]";
+	var boolTag = "[object Boolean]";
+	var dateTag = "[object Date]";
+	var errorTag = "[object Error]";
+	var funcTag = "[object Function]";
+	var genTag = "[object GeneratorFunction]";
+	var mapTag = "[object Map]";
+	var numberTag = "[object Number]";
+	var objectTag = "[object Object]";
+	var regexpTag = "[object RegExp]";
+	var setTag = "[object Set]";
+	var stringTag = "[object String]";
+	var symbolTag = "[object Symbol]";
+	var weakMapTag = "[object WeakMap]";
+	var arrayBufferTag = "[object ArrayBuffer]";
+	var dataViewTag = "[object DataView]";
+	var float32Tag = "[object Float32Array]";
+	var float64Tag = "[object Float64Array]";
+	var int8Tag = "[object Int8Array]";
+	var int16Tag = "[object Int16Array]";
+	var int32Tag = "[object Int32Array]";
+	var uint8Tag = "[object Uint8Array]";
+	var uint8ClampedTag = "[object Uint8ClampedArray]";
+	var uint16Tag = "[object Uint16Array]";
+	var uint32Tag = "[object Uint32Array]";
 	/** Used to identify `toStringTag` values supported by `_.clone`. */
 	var cloneableTags = {};
 	cloneableTags[argsTag] = cloneableTags[arrayTag] = cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] = cloneableTags[boolTag] = cloneableTags[dateTag] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag] = cloneableTags[numberTag] = cloneableTags[objectTag] = cloneableTags[regexpTag] = cloneableTags[setTag] = cloneableTags[stringTag] = cloneableTags[symbolTag] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
@@ -2124,7 +2253,8 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/cloneDeep.js
 	/** Used to compose bitmasks for cloning. */
-	var CLONE_DEEP_FLAG = 1, CLONE_SYMBOLS_FLAG = 4;
+	var CLONE_DEEP_FLAG = 1;
+	var CLONE_SYMBOLS_FLAG = 4;
 	/**
 	* This method is like `_.clone` except that it recursively clones `value`.
 	*
@@ -2345,47 +2475,48 @@
 	* @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 (isPageOrFragment(item)) {
+			info.page = item;
+			break;
+		}
 		return info;
 	};
 	var filterXSS = (str) => str.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
@@ -2467,6 +2598,8 @@
 		if (!node) return false;
 		return Boolean(node.type?.toLowerCase() === _tmagic_schema.NodeType.PAGE_FRAGMENT);
 	};
+	/** 是否为页面或页面片 */
+	var isPageOrFragment = (node) => isPage(node) || isPageFragment(node);
 	var isNumber = (value) => typeof value === "number" && !isNaN(value) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
 	var getHost = (targetUrl) => targetUrl.match(/\/\/([^/]+)/)?.[1];
 	var isSameDomain = (targetUrl = "", source = globalThis.location.host) => {
@@ -2483,6 +2616,12 @@
 		return (c === "x" ? r : r & 3 | 8).toString(16);
 	});
 	var getKeysArray = (keys) => `${keys}`.replace(/\[(\d+)\]/g, ".$1").split(".");
+	/**
+	* 判断某一层 key 是否为数组下标（纯数字）
+	* @param key 单层 key
+	* @returns 是否为数组下标
+	*/
+	var isArrayIndex = (key) => /^\d+$/.test(`${key}`);
 	var getValueByKeyPath = (keys = "", data = {}) => {
 		return (Array.isArray(keys) ? keys : getKeysArray(keys)).reduce((accumulator, currentValue) => {
 			if (isObject(accumulator)) return accumulator[currentValue];
@@ -2490,7 +2629,18 @@
 			throw new Error(`${data}中不存在${keys}`);
 		}, data);
 	};
-	var setValueByKeyPath = (keys, value, data = {}) => set(data, keys, value);
+	var setValueByKeyPath = (keys, value, data = {}) => {
+		if (typeof value === "undefined") {
+			const keyArray = getKeysArray(keys);
+			const lastKey = keyArray[keyArray.length - 1];
+			if (keyArray.length > 1 && isArrayIndex(lastKey)) {
+				const parentPath = keyArray.slice(0, -1).join(".");
+				if (typeof get(data, parentPath) === "undefined") set(data, parentPath, []);
+				return data;
+			}
+		}
+		return set(data, keys, value);
+	};
 	var getNodes = (ids, data = []) => {
 		const nodes = [];
 		const get = function(ids, data) {
@@ -2719,11 +2869,13 @@
 	exports.getValueByKeyPath = getValueByKeyPath;
 	exports.guid = guid;
 	exports.injectStyle = injectStyle;
+	exports.isArrayIndex = isArrayIndex;
 	exports.isDslNode = isDslNode;
 	exports.isNumber = isNumber;
 	exports.isObject = isObject;
 	exports.isPage = isPage;
 	exports.isPageFragment = isPageFragment;
+	exports.isPageOrFragment = isPageOrFragment;
 	exports.isPercentage = isPercentage;
 	exports.isPop = isPop;
 	exports.isSameDomain = isSameDomain;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.2",
+  "version": "1.8.0-beta.21",
   "name": "@tmagic/utils",
   "type": "module",
   "sideEffects": false,
@@ -35,7 +35,7 @@
   },
   "peerDependencies": {
     "typescript": "^6.0.3",
-    "@tmagic/schema": "1.8.0-beta.2"
+    "@tmagic/schema": "1.8.0-beta.21"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -17,13 +17,12 @@
  * limitations under the License.
  */
 
-import { cloneDeep, set as objectSet } from 'lodash-es';
+import { cloneDeep, get as objectGet, set as objectSet } from 'lodash-es';
 
 import type {
   DataSchema,
   DataSourceDeps,
   Id,
-  MApp,
   MComponent,
   MContainer,
   MNode,
@@ -80,10 +79,12 @@ export const emptyFn = (): any => undefined;
  * @param {Array} data 要查找的根容器节点
  * @return {Array} 组件在data中的子孙路径
  */
-export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
+export const getNodePath = (id: Id, data: MNode[] = [], skip?: MNode | null): MNode[] => {
   const path: MNode[] = [];
+  // 目标 id 字符串只计算一次，避免在递归遍历中对每个节点重复拼接
+  const targetId = `${id}`;
 
-  const get = function (id: number | string, data: MNode[]): MNode | null {
+  const get = function (data: MNode[]): MNode | null {
     if (!Array.isArray(data)) {
       return null;
     }
@@ -92,12 +93,13 @@ export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
       const item = data[i];
 
       path.push(item);
-      if (`${item.id}` === `${id}`) {
+      if (`${item.id}` === targetId) {
         return item;
       }
 
-      if (item.items) {
-        const node = get(id, item.items);
+      // skip 用于跳过已经搜索过的子树（如已优先搜索过的当前页面），避免重复遍历
+      if (item.items && item !== skip) {
+        const node = get(item.items);
         if (node) {
           return node;
         }
@@ -109,16 +111,17 @@ export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
     return null;
   };
 
-  get(id, data);
+  get(data);
 
   return path;
 };
 
-export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) => {
+export const getNodeInfo = (id: Id, root: { id: Id; items?: MNode[] } | null, skip?: MNode | null) => {
   const info: EditorNodeInfo = {
     node: null,
     parent: null,
     page: null,
+    path: [],
   };
 
   if (!root) return info;
@@ -128,7 +131,8 @@ export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) =>
     return info;
   }
 
-  const path = getNodePath(id, root.items);
+  const path = getNodePath(id, root.items, skip);
+  info.path = path;
 
   if (!path.length) return info;
 
@@ -137,12 +141,12 @@ export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) =>
   info.node = path[path.length - 1] as MComponent;
   info.parent = path[path.length - 2] as MContainer;
 
-  path.forEach((item) => {
-    if (isPage(item) || isPageFragment(item)) {
+  for (const item of path) {
+    if (isPageOrFragment(item)) {
       info.page = item as MPage | MPageFragment;
-      return;
+      break;
     }
-  });
+  }
 
   return info;
 };
@@ -275,6 +279,10 @@ export const isPageFragment = (node?: Pick<MComponent, 'type'> | null): boolean
   return Boolean(node.type?.toLowerCase() === NodeType.PAGE_FRAGMENT);
 };
 
+/** 是否为页面或页面片 */
+export const isPageOrFragment = (node?: Pick<MComponent, 'type'> | null): boolean =>
+  isPage(node) || isPageFragment(node);
+
 export const isNumber = (value: any) =>
   (typeof value === 'number' && !isNaN(value)) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
 
@@ -304,6 +312,13 @@ export const getKeysArray = (keys: string | number) =>
   // 将 array[0] 转成 array.0
   `${keys}`.replace(/\[(\d+)\]/g, '.$1').split('.');
 
+/**
+ * 判断某一层 key 是否为数组下标（纯数字）
+ * @param key 单层 key
+ * @returns 是否为数组下标
+ */
+export const isArrayIndex = (key: string | number): boolean => /^\d+$/.test(`${key}`);
+
 export const getValueByKeyPath = (
   keys: number | string | string[] = '',
   data: Record<string | number, any> = {},
@@ -323,8 +338,23 @@ export const getValueByKeyPath = (
   }, data);
 };
 
-export const setValueByKeyPath = (keys: string | number, value: any, data: Record<string | number, any> = {}): any =>
-  objectSet(data, keys, value);
+export const setValueByKeyPath = (keys: string | number, value: any, data: Record<string | number, any> = {}): any => {
+  if (typeof value === 'undefined') {
+    // 仅数组下标场景需要特殊处理：lodash 的 set 会把 undefined 写入数组得到 [undefined]，
+    // 此处改为只创建父级空数组，避免出现 [undefined]。对象属性场景 undefined 会被 JSON 自然丢弃，保持原行为。
+    // 注意：这里将「数字型末级 key」统一按数组下标处理，无法区分数字型对象 key，属于预期内的取舍。
+    const keyArray = getKeysArray(keys);
+    const lastKey = keyArray[keyArray.length - 1];
+    if (keyArray.length > 1 && isArrayIndex(lastKey)) {
+      const parentPath = keyArray.slice(0, -1).join('.');
+      if (typeof objectGet(data, parentPath) === 'undefined') {
+        objectSet(data, parentPath, []);
+      }
+      return data;
+    }
+  }
+  return objectSet(data, keys, value);
+};
 
 export const getNodes = (ids: Id[], data: MNode[] = []): MNode[] => {
   const nodes: MNode[] = [];

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { DataSchema, DataSourceDeps, Id, MApp, MComponent, MNode, MNodeInstance } from "@tmagic/schema";
+import { DataSchema, DataSourceDeps, Id, MComponent, MNode, MNodeInstance } from "@tmagic/schema";
 import { MContainer, MNode as MNode$1, MPage, MPageFragment } from "@tmagic/core";
 
 //#region temp/packages/editor/src/type.d.ts
@@ -6,6 +6,7 @@ interface EditorNodeInfo {
   node: MNode$1 | null;
   parent: MContainer | null;
   page: MPage | MPageFragment | null;
+  path: MNode$1[];
 }
 //#endregion
 //#region temp/packages/utils/src/dom.d.ts
@@ -51,8 +52,11 @@ declare const emptyFn: () => any;
  * @param {Array} data 要查找的根容器节点
  * @return {Array} 组件在data中的子孙路径
  */
-declare const getNodePath: (id: Id, data?: MNode[]) => MNode[];
-declare const getNodeInfo: (id: Id, root: Pick<MApp, "id" | "items"> | null) => EditorNodeInfo;
+declare const getNodePath: (id: Id, data?: MNode[], skip?: MNode | null) => MNode[];
+declare const getNodeInfo: (id: Id, root: {
+  id: Id;
+  items?: MNode[];
+} | null, skip?: MNode | null) => EditorNodeInfo;
 declare const filterXSS: (str: string) => string;
 declare const getUrlParam: (param: string, url?: string) => string;
 /**
@@ -73,6 +77,8 @@ declare const isObject: (obj: any) => boolean;
 declare const isPop: (node: Pick<MComponent, "type"> | null) => boolean;
 declare const isPage: (node?: Pick<MComponent, "type"> | null) => boolean;
 declare const isPageFragment: (node?: Pick<MComponent, "type"> | null) => boolean;
+/** 是否为页面或页面片 */
+declare const isPageOrFragment: (node?: Pick<MComponent, "type"> | null) => boolean;
 declare const isNumber: (value: any) => boolean;
 declare const getHost: (targetUrl: string) => string | undefined;
 declare const isSameDomain: (targetUrl?: string, source?: string) => boolean;
@@ -83,6 +89,12 @@ declare const isSameDomain: (targetUrl?: string, source?: string) => boolean;
  */
 declare const guid: (digit?: number) => string;
 declare const getKeysArray: (keys: string | number) => string[];
+/**
+ * 判断某一层 key 是否为数组下标（纯数字）
+ * @param key 单层 key
+ * @returns 是否为数组下标
+ */
+declare const isArrayIndex: (key: string | number) => boolean;
 declare const getValueByKeyPath: (keys?: number | string | string[], data?: Record<string | number, any>) => any;
 declare const setValueByKeyPath: (keys: string | number, value: any, data?: Record<string | number, any>) => any;
 declare const getNodes: (ids: Id[], data?: MNode[]) => MNode[];
@@ -122,4 +134,4 @@ declare const traverseNode: <T extends NodeItem = NodeItem>(node: T, cb: (node:
 declare const isValueIncludeDataSource: (value: any) => boolean;
 declare const removeDataSourceFieldPrefix: (id?: string) => string;
 //#endregion
-export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, NodeItem, PAGE_FRAGMENT_CONTAINER_ID_KEY, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, delQueStr, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getSearchObj, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, removeDataSourceFieldPrefix, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };
+export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, NodeItem, PAGE_FRAGMENT_CONTAINER_ID_KEY, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, delQueStr, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getSearchObj, getUrlParam, getValueByKeyPath, guid, injectStyle, isArrayIndex, isDslNode, isNumber, isObject, isPage, isPageFragment, isPageOrFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, removeDataSourceFieldPrefix, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };