@tmagic/utils 1.7.3 → 1.7.5

package/dist/tmagic-utils.js

@@ -259,7 +259,7 @@ const isPageFragment = (node) => {
   if (!node) return false;
   return Boolean(node.type?.toLowerCase() === NodeType.PAGE_FRAGMENT);
 };
-const isNumber = (value) => /^(-?\d+)(\.\d+)?$/.test(value);
+const isNumber = (value) => typeof value === "number" && !isNaN(value) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
 const getHost = (targetUrl) => targetUrl.match(/\/\/([^/]+)/)?.[1];
 const isSameDomain = (targetUrl = "", source = globalThis.location.host) => {
   const isHttpUrl = /^(http[s]?:)?\/\//.test(targetUrl);
@@ -520,5 +520,6 @@ const isValueIncludeDataSource = (value) => {
   }
   return false;
 };
+const removeDataSourceFieldPrefix = (id) => id?.replace(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, "") || "";
 
-export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, 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, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };
+export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, 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 };

package/dist/tmagic-utils.umd.cjs

@@ -2632,7 +2632,7 @@
     if (!node) return false;
     return Boolean(node.type?.toLowerCase() === schema.NodeType.PAGE_FRAGMENT);
   };
-  const isNumber = (value) => /^(-?\d+)(\.\d+)?$/.test(value);
+  const isNumber = (value) => typeof value === "number" && !isNaN(value) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
   const getHost = (targetUrl) => targetUrl.match(/\/\/([^/]+)/)?.[1];
   const isSameDomain = (targetUrl = "", source = globalThis.location.host) => {
     const isHttpUrl = /^(http[s]?:)?\/\//.test(targetUrl);
@@ -2893,6 +2893,7 @@
     }
     return false;
   };
+  const removeDataSourceFieldPrefix = (id) => id?.replace(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, "") || "";
 
   exports.DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX = DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX;
   exports.DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX;
@@ -2942,6 +2943,7 @@
   exports.isValueIncludeDataSource = isValueIncludeDataSource;
   exports.removeClassName = removeClassName;
   exports.removeClassNameByClassName = removeClassNameByClassName;
+  exports.removeDataSourceFieldPrefix = removeDataSourceFieldPrefix;
   exports.replaceChildNode = replaceChildNode;
   exports.setDslDomRelateConfig = setDslDomRelateConfig;
   exports.setIdToEl = setIdToEl;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.3",
+  "version": "1.7.5",
   "name": "@tmagic/utils",
   "type": "module",
   "main": "dist/tmagic-utils.umd.cjs",
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "typescript": "^5.9.3",
-    "@tmagic/schema": "1.7.3"
+    "@tmagic/schema": "1.7.5"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -270,7 +270,8 @@ export const isPageFragment = (node?: MComponent | null): boolean => {
   return Boolean(node.type?.toLowerCase() === NodeType.PAGE_FRAGMENT);
 };
 
-export const isNumber = (value: string) => /^(-?\d+)(\.\d+)?$/.test(value);
+export const isNumber = (value: any) =>
+  (typeof value === 'number' && !isNaN(value)) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
 
 export const getHost = (targetUrl: string) => targetUrl.match(/\/\/([^/]+)/)?.[1];
 
@@ -634,3 +635,6 @@ export const isValueIncludeDataSource = (value: any) => {
   }
   return false;
 };
+
+export const removeDataSourceFieldPrefix = (id?: string) =>
+  id?.replace(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, '') || '';

package/types/index.d.ts

@@ -62,7 +62,7 @@ declare const isObject: (obj: any) => boolean;
 declare const isPop: (node: MComponent | null) => boolean;
 declare const isPage: (node?: MComponent | null) => boolean;
 declare const isPageFragment: (node?: MComponent | null) => boolean;
-declare const isNumber: (value: string) => boolean;
+declare const isNumber: (value: any) => boolean;
 declare const getHost: (targetUrl: string) => string | undefined;
 declare const isSameDomain: (targetUrl?: string, source?: string) => boolean;
 /**
@@ -111,6 +111,7 @@ interface NodeItem {
 }
 declare const traverseNode: <T extends NodeItem = NodeItem>(node: T, cb: (node: T, parents: T[]) => void, parents?: T[], evalCbAfter?: boolean) => void;
 declare const isValueIncludeDataSource: (value: any) => boolean;
+declare const removeDataSourceFieldPrefix: (id?: string) => string;
 
-export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, 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, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };
+export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, 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 type { NodeItem };