@tmagic/utils 1.8.0-beta.19 → 1.8.0-beta.20

package/dist/es/index.js

@@ -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;
 	}
@@ -143,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) => {
@@ -374,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, isArrayIndex, 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

@@ -2513,7 +2513,7 @@
 		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;
 		}
@@ -2598,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) => {
@@ -2873,6 +2875,7 @@
 	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.19",
+  "version": "1.8.0-beta.20",
   "name": "@tmagic/utils",
   "type": "module",
   "sideEffects": false,
@@ -35,7 +35,7 @@
   },
   "peerDependencies": {
     "typescript": "^6.0.3",
-    "@tmagic/schema": "1.8.0-beta.19"
+    "@tmagic/schema": "1.8.0-beta.20"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -142,7 +142,7 @@ export const getNodeInfo = (id: Id, root: { id: Id; items?: MNode[] } | null, sk
   info.parent = path[path.length - 2] as MContainer;
 
   for (const item of path) {
-    if (isPage(item) || isPageFragment(item)) {
+    if (isPageOrFragment(item)) {
       info.page = item as MPage | MPageFragment;
       break;
     }
@@ -279,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}`);
 

package/types/index.d.ts

@@ -77,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;
@@ -132,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, isArrayIndex, 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 };