@tmagic/utils 1.5.0-beta.14 → 1.5.0-beta.16

package/dist/tmagic-utils.js

@@ -115,6 +115,8 @@ const getIdFromEl = () => dslDomRelateConfig.getIdFromEl;
 const getElById = () => dslDomRelateConfig.getElById;
 const setIdToEl = () => dslDomRelateConfig.setIdToEl;
 
+let _globalThis;
+const getGlobalThis = () => _globalThis || (_globalThis = typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : {});
 const sleep = (ms) => new Promise((resolve) => {
   const timer = setTimeout(() => {
     clearTimeout(timer);
@@ -122,7 +124,7 @@ const sleep = (ms) => new Promise((resolve) => {
   }, ms);
 });
 const toLine = (name = "") => name.replace(/\B([A-Z])/g, "-$1").toLowerCase();
-const toHump = (name = "") => name.replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
+const toHump = (name = "") => name.replace(/-(\w)/g, (_all, letter) => letter.toUpperCase());
 const emptyFn = () => void 0;
 const getNodePath = (id, data = []) => {
   const path = [];
@@ -408,17 +410,17 @@ const convertToNumber = (value, parentValue = 0) => {
   }
   return parseFloat(value);
 };
-const addParamToUrl = (obj, global = globalThis, needReload = true) => {
-  const url = new URL(global.location.href);
+const addParamToUrl = (obj, global2 = globalThis, needReload = true) => {
+  const url = new URL(global2.location.href);
   const { searchParams } = url;
   for (const [k, v] of Object.entries(obj)) {
     searchParams.set(k, v);
   }
   const newUrl = url.toString();
   if (needReload) {
-    global.location.href = newUrl;
+    global2.location.href = newUrl;
   } else {
-    global.history.pushState({}, "", url);
+    global2.history.pushState({}, "", url);
   }
 };
 const dataSourceTemplateRegExp = /\$\{([\s\S]+?)\}/g;
@@ -432,5 +434,20 @@ const traverseNode = (node, cb, parents = []) => {
     });
   }
 };
+const isValueIncludeDataSource = (value) => {
+  if (typeof value === "string" && /\$\{([\s\S]+?)\}/.test(value)) {
+    return true;
+  }
+  if (Array.isArray(value) && `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX)) {
+    return true;
+  }
+  if (value?.isBindDataSource && value.dataSourceId) {
+    return true;
+  }
+  if (value?.isBindDataSourceField && value.dataSourceId) {
+    return true;
+  }
+  return false;
+};
 
-export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, removeClassName, removeClassNameByClassName, replaceChildNode, setDslDomRelateConfig, setIdToEl, 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, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, replaceChildNode, setDslDomRelateConfig, setIdToEl, setValueByKeyPath, sleep, toHump, toLine, traverseNode };

package/dist/tmagic-utils.umd.cjs

@@ -2724,6 +2724,8 @@
   const getElById = () => dslDomRelateConfig.getElById;
   const setIdToEl = () => dslDomRelateConfig.setIdToEl;
 
+  let _globalThis;
+  const getGlobalThis = () => _globalThis || (_globalThis = typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : {});
   const sleep = (ms) => new Promise((resolve) => {
     const timer = setTimeout(() => {
       clearTimeout(timer);
@@ -2731,7 +2733,7 @@
     }, ms);
   });
   const toLine = (name = "") => name.replace(/\B([A-Z])/g, "-$1").toLowerCase();
-  const toHump = (name = "") => name.replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
+  const toHump = (name = "") => name.replace(/-(\w)/g, (_all, letter) => letter.toUpperCase());
   const emptyFn = () => void 0;
   const getNodePath = (id, data = []) => {
     const path = [];
@@ -3017,17 +3019,17 @@
     }
     return parseFloat(value);
   };
-  const addParamToUrl = (obj, global = globalThis, needReload = true) => {
-    const url = new URL(global.location.href);
+  const addParamToUrl = (obj, global2 = globalThis, needReload = true) => {
+    const url = new URL(global2.location.href);
     const { searchParams } = url;
     for (const [k, v] of Object.entries(obj)) {
       searchParams.set(k, v);
     }
     const newUrl = url.toString();
     if (needReload) {
-      global.location.href = newUrl;
+      global2.location.href = newUrl;
     } else {
-      global.history.pushState({}, "", url);
+      global2.history.pushState({}, "", url);
     }
   };
   const dataSourceTemplateRegExp = /\$\{([\s\S]+?)\}/g;
@@ -3041,6 +3043,21 @@
       });
     }
   };
+  const isValueIncludeDataSource = (value) => {
+    if (typeof value === "string" && /\$\{([\s\S]+?)\}/.test(value)) {
+      return true;
+    }
+    if (Array.isArray(value) && `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX)) {
+      return true;
+    }
+    if (value?.isBindDataSource && value.dataSourceId) {
+      return true;
+    }
+    if (value?.isBindDataSourceField && value.dataSourceId) {
+      return true;
+    }
+    return false;
+  };
 
   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;
@@ -3064,6 +3081,7 @@
   exports.getDepNodeIds = getDepNodeIds;
   exports.getDocument = getDocument;
   exports.getElById = getElById;
+  exports.getGlobalThis = getGlobalThis;
   exports.getHost = getHost;
   exports.getIdFromEl = getIdFromEl;
   exports.getKeys = getKeys;
@@ -3083,6 +3101,7 @@
   exports.isPercentage = isPercentage;
   exports.isPop = isPop;
   exports.isSameDomain = isSameDomain;
+  exports.isValueIncludeDataSource = isValueIncludeDataSource;
   exports.removeClassName = removeClassName;
   exports.removeClassNameByClassName = removeClassNameByClassName;
   exports.replaceChildNode = replaceChildNode;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.0-beta.14",
+  "version": "1.5.0-beta.16",
   "name": "@tmagic/utils",
   "type": "module",
   "main": "dist/tmagic-utils.umd.cjs",
@@ -22,6 +22,7 @@
     "node": ">=18"
   },
   "repository": {
+    "directory": "packages/utils",
     "type": "git",
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
@@ -32,11 +33,11 @@
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
     "rimraf": "^3.0.2",
-    "vite": "^5.4.3"
+    "vite": "^5.4.10"
   },
   "peerDependencies": {
     "typescript": "*",
-    "@tmagic/schema": "1.5.0-beta.14"
+    "@tmagic/schema": "1.5.0-beta.16"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
@@ -36,6 +37,23 @@ import type { EditorNodeInfo } from '@editor/type';
 
 export * from './dom';
 
+// for typeof global checks without @types/node
+declare let global: {};
+
+let _globalThis: any;
+export const getGlobalThis = (): any =>
+  _globalThis ||
+  (_globalThis =
+    typeof globalThis !== 'undefined'
+      ? globalThis
+      : typeof self !== 'undefined'
+      ? self
+      : typeof window !== 'undefined'
+      ? window
+      : typeof global !== 'undefined'
+      ? global
+      : {});
+
 export const sleep = (ms: number): Promise<void> =>
   new Promise((resolve) => {
     const timer = setTimeout(() => {
@@ -47,7 +65,7 @@ export const sleep = (ms: number): Promise<void> =>
 // 驼峰转换横线
 export const toLine = (name = '') => name.replace(/\B([A-Z])/g, '-$1').toLowerCase();
 
-export const toHump = (name = ''): string => name.replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
+export const toHump = (name = ''): string => name.replace(/-(\w)/g, (_all, letter) => letter.toUpperCase());
 
 export const emptyFn = (): any => undefined;
 
@@ -91,7 +109,7 @@ export const getNodePath = (id: Id, data: MNode[] = []): MNode[] => {
   return path;
 };
 
-export const getNodeInfo = (id: Id, root: MApp | null) => {
+export const getNodeInfo = (id: Id, root: Pick<MApp, 'id' | 'items'> | null) => {
   const info: EditorNodeInfo = {
     node: null,
     parent: null,
@@ -491,3 +509,19 @@ export const traverseNode = <T extends NodeItem = NodeItem>(
     });
   }
 };
+
+export const isValueIncludeDataSource = (value: any) => {
+  if (typeof value === 'string' && /\$\{([\s\S]+?)\}/.test(value)) {
+    return true;
+  }
+  if (Array.isArray(value) && `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX)) {
+    return true;
+  }
+  if (value?.isBindDataSource && value.dataSourceId) {
+    return true;
+  }
+  if (value?.isBindDataSourceField && value.dataSourceId) {
+    return true;
+  }
+  return false;
+};

package/types/index.d.ts

@@ -29,6 +29,7 @@ declare const getIdFromEl: () => (el?: HTMLElement | SVGElement | null) => strin
 declare const getElById: () => (doc?: Document, id?: string | number) => HTMLElement;
 declare const setIdToEl: () => (el: HTMLElement | SVGElement, id: string | number) => void;
 
+declare const getGlobalThis: () => any;
 declare const sleep: (ms: number) => Promise<void>;
 declare const toLine: (name?: string) => string;
 declare const toHump: (name?: string) => string;
@@ -40,7 +41,7 @@ declare const emptyFn: () => any;
  * @return {Array} 组件在data中的子孙路径
  */
 declare const getNodePath: (id: Id, data?: MNode$1[]) => MNode$1[];
-declare const getNodeInfo: (id: Id, root: MApp | null) => EditorNodeInfo;
+declare const getNodeInfo: (id: Id, root: Pick<MApp, "id" | "items"> | null) => EditorNodeInfo;
 declare const filterXSS: (str: string) => string;
 declare const getUrlParam: (param: string, url?: string) => string;
 declare const isObject: (obj: any) => boolean;
@@ -94,5 +95,6 @@ interface NodeItem {
     [key: string]: any;
 }
 declare const traverseNode: <T extends NodeItem = NodeItem>(node: T, cb: (node: T, parents: T[]) => void, parents?: T[]) => void;
+declare const isValueIncludeDataSource: (value: any) => boolean;
 
-export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, type NodeItem, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, removeClassName, removeClassNameByClassName, replaceChildNode, setDslDomRelateConfig, setIdToEl, 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, type NodeItem, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, replaceChildNode, setDslDomRelateConfig, setIdToEl, setValueByKeyPath, sleep, toHump, toLine, traverseNode };