@tmagic/utils 1.8.0-manmanyu.9 → 1.8.0

package/dist/es/dom.js

@@ -22,7 +22,7 @@ var asyncLoadJs = (() => {
 			};
 			setTimeout(() => {
 				reject(/* @__PURE__ */ new Error("timeout"));
-			}, 60 * 1e3);
+			}, 6e4);
 		}).catch((err) => {
 			loaded.delete(url);
 			throw err;
@@ -53,7 +53,7 @@ var asyncLoadCss = (() => {
 			};
 			setTimeout(() => {
 				reject(/* @__PURE__ */ new Error("timeout"));
-			}, 60 * 1e3);
+			}, 6e4);
 		}).catch((err) => {
 			loaded.delete(url);
 			throw err;

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;
@@ -58,7 +58,7 @@ var getNodeInfo = (id, root, skip) => {
 	path.unshift(root);
 	info.node = path[path.length - 1];
 	info.parent = path[path.length - 2];
-	for (const item of path) if (isPage(item) || isPageFragment(item)) {
+	for (const item of path) if (isPageOrFragment(item)) {
 		info.page = item;
 		break;
 	}
@@ -100,8 +100,10 @@ var setUrlParam = (name, value, url = globalThis.location.href) => {
 		const first = strArr.charAt(0);
 		url = url.replace(strArr, key);
 		url = url.replace(key, value ? first + extra : "");
-	} else if (value) if (url.indexOf("?") > -1) url += `&${extra}`;
-	else url += `?${extra}`;
+	} else if (value) {
+		if (url.indexOf("?") > -1) url += `&${extra}`;
+		else url += `?${extra}`;
+	}
 	return url;
 };
 var getSearchObj = (search = globalThis.location.search ? globalThis.location.search.substring(1) : "") => {
@@ -143,6 +145,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) => {
@@ -159,6 +163,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];
@@ -166,7 +176,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) {
@@ -263,7 +284,6 @@ var compiledCond = (op, fieldValue, inputValue, range = []) => {
 		case "not_between": return range.length < 2 || fieldValue < range[0] || fieldValue > range[1];
 		case "include": return fieldValue?.includes?.(inputValue);
 		case "not_include": return typeof fieldValue === "undefined" || !fieldValue.includes?.(inputValue);
-		default: break;
 	}
 	return false;
 };
@@ -357,4 +377,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 };