@tmagic/utils 1.8.0-beta.28 → 1.8.0-beta.29

package/dist/es/index.js

@@ -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) : "") => {

package/dist/tmagic-utils.umd.cjs

@@ -43,8 +43,10 @@
 			var unmasked = true;
 		} catch (e) {}
 		var result = nativeObjectToString$1.call(value);
-		if (unmasked) if (isOwn) value[symToStringTag$1] = tag;
-		else delete value[symToStringTag$1];
+		if (unmasked) {
+			if (isOwn) value[symToStringTag$1] = tag;
+			else delete value[symToStringTag$1];
+		}
 		return result;
 	}
 	//#endregion
@@ -181,7 +183,7 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseToString.js
 	/** Used as references for various `Number` constants. */
-	var INFINITY$1 = Infinity;
+	var INFINITY$1 = 1 / 0;
 	/** Used to convert symbols to primitives and strings. */
 	var symbolProto$1 = Symbol ? Symbol.prototype : void 0;
 	var symbolToString = symbolProto$1 ? symbolProto$1.toString : void 0;
@@ -1497,7 +1499,7 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_toKey.js
 	/** Used as references for various `Number` constants. */
-	var INFINITY = Infinity;
+	var INFINITY = 1 / 0;
 	/**
 	* Converts `value` to a string key if it's not a string or symbol.
 	*
@@ -2555,8 +2557,10 @@
 			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) : "") => {

package/package.json

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

package/types/index.d.ts

@@ -2233,52 +2233,52 @@ interface UpdateOptions extends HistoryOpOptionsWithChangeRecords {
 }
 //#endregion
 //#region temp/packages/utils/src/dom.d.ts
-declare const asyncLoadJs: (url: string, crossOrigin?: string, document?: Document) => any;
-declare const asyncLoadCss: (url: string, document?: Document) => any;
-declare const addClassName: (el: Element, doc: Document, className: string) => void;
-declare const removeClassName: (el: Element, ...className: string[]) => void;
-declare const removeClassNameByClassName: (doc: Document, className: string) => HTMLElement | null;
-declare const injectStyle: (doc: Document, style: string) => HTMLStyleElement;
-declare const createDiv: ({ className, cssText }: {
+export declare const asyncLoadJs: (url: string, crossOrigin?: string, document?: Document) => any;
+export declare const asyncLoadCss: (url: string, document?: Document) => any;
+export declare const addClassName: (el: Element, doc: Document, className: string) => void;
+export declare const removeClassName: (el: Element, ...className: string[]) => void;
+export declare const removeClassNameByClassName: (doc: Document, className: string) => HTMLElement | null;
+export declare const injectStyle: (doc: Document, style: string) => HTMLStyleElement;
+export declare const createDiv: ({ className, cssText }: {
   className: string;
   cssText: string;
 }) => HTMLDivElement;
-declare const getDocument: () => Document;
-declare const calcValueByFontsize: (doc: Document | undefined, value: number) => number;
+export declare const getDocument: () => Document;
+export declare const calcValueByFontsize: (doc: Document | undefined, value: number) => number;
 declare const dslDomRelateConfig: {
   getIdFromEl: (el?: HTMLElement | SVGElement | null) => string | undefined;
   getElById: (doc?: Document, id?: string | number) => HTMLElement;
   setIdToEl: (el: HTMLElement | SVGElement, id: string | number) => void;
 };
-declare const setDslDomRelateConfig: <K extends keyof typeof dslDomRelateConfig, T extends (typeof dslDomRelateConfig)[K]>(name: K, value: T) => void;
-declare const getIdFromEl: () => (el?: HTMLElement | SVGElement | null) => string | undefined;
-declare const getElById: () => (doc?: Document, id?: string | number) => HTMLElement;
-declare const setIdToEl: () => (el: HTMLElement | SVGElement, id: string | number) => void;
+export declare const setDslDomRelateConfig: <K extends keyof typeof dslDomRelateConfig, T extends (typeof dslDomRelateConfig)[K]>(name: K, value: T) => void;
+export declare const getIdFromEl: () => (el?: HTMLElement | SVGElement | null) => string | undefined;
+export declare const getElById: () => (doc?: Document, id?: string | number) => HTMLElement;
+export declare const setIdToEl: () => (el: HTMLElement | SVGElement, id: string | number) => void;
 //#endregion
 //#region temp/packages/utils/src/const.d.ts
-declare const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = "ds-field::";
-declare const DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX = "ds-field-changed";
-declare const DATA_SOURCE_SET_DATA_METHOD_NAME = "setDataFromEvent";
+export declare const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = "ds-field::";
+export declare const DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX = "ds-field-changed";
+export declare const DATA_SOURCE_SET_DATA_METHOD_NAME = "setDataFromEvent";
 //#endregion
 //#region temp/packages/utils/src/index.d.ts
-declare const getGlobalThis: () => any;
-declare const sleep: (ms: number) => Promise<void>;
-declare const toLine: (name?: string) => string;
-declare const toHump: (name?: string) => string;
-declare const emptyFn: () => any;
+export declare const getGlobalThis: () => any;
+export declare const sleep: (ms: number) => Promise<void>;
+export declare const toLine: (name?: string) => string;
+export declare const toHump: (name?: string) => string;
+export declare const emptyFn: () => any;
 /**
  * 通过id获取组件在应用的子孙路径
  * @param {number | string} id 组件id
  * @param {Array} data 要查找的根容器节点
  * @return {Array} 组件在data中的子孙路径
  */
-declare const getNodePath: (id: Id, data?: MNode[], skip?: MNode | null) => MNode[];
-declare const getNodeInfo: (id: Id, root: {
+export declare const getNodePath: (id: Id, data?: MNode[], skip?: MNode | null) => MNode[];
+export 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;
+export declare const filterXSS: (str: string) => string;
+export declare const getUrlParam: (param: string, url?: string) => string;
 /**
  * 设置url中指定的参数
  *
@@ -2290,68 +2290,67 @@ declare const getUrlParam: (param: string, url?: string) => string;
  *          url [发生替换的url地址|默认为location.href]
  * @return {string} [返回处理后的url]
  */
-declare const setUrlParam: (name: string, value: string, url?: string) => string;
-declare const getSearchObj: (search?: string) => Record<string, string>;
-declare const delQueStr: (url: string, ref: string[] | string) => string;
-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;
+export declare const setUrlParam: (name: string, value: string, url?: string) => string;
+export declare const getSearchObj: (search?: string) => Record<string, string>;
+export declare const delQueStr: (url: string, ref: string[] | string) => string;
+export declare const isObject: (obj: any) => boolean;
+export declare const isPop: (node: Pick<MComponent, "type"> | null) => boolean;
+export declare const isPage: (node?: Pick<MComponent, "type"> | null) => boolean;
+export 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;
+export declare const isPageOrFragment: (node?: Pick<MComponent, "type"> | null) => boolean;
+export declare const isNumber: (value: any) => boolean;
+export declare const getHost: (targetUrl: string) => string | undefined;
+export declare const isSameDomain: (targetUrl?: string, source?: string) => boolean;
 /**
  * 生成指定位数的GUID，无【-】格式
  * @param digit 位数，默认值8
  * @returns
  */
-declare const guid: (digit?: number) => string;
-declare const getKeysArray: (keys: string | number) => string[];
+export declare const guid: (digit?: number) => string;
+export 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[];
-declare const getDepKeys: (dataSourceDeps: DataSourceDeps | undefined, nodeId: Id) => Id[];
-declare const getDepNodeIds: (dataSourceDeps?: DataSourceDeps) => string[];
+export declare const isArrayIndex: (key: string | number) => boolean;
+export declare const getValueByKeyPath: (keys?: number | string | string[], data?: Record<string | number, any>) => any;
+export declare const setValueByKeyPath: (keys: string | number, value: any, data?: Record<string | number, any>) => any;
+export declare const getNodes: (ids: Id[], data?: MNode[]) => MNode[];
+export declare const getDepKeys: (dataSourceDeps: DataSourceDeps | undefined, nodeId: Id) => Id[];
+export declare const getDepNodeIds: (dataSourceDeps?: DataSourceDeps) => string[];
 /**
  * 将新节点更新到data或者parentId对应的节点的子节点中
  * @param newNode 新节点
  * @param data 需要修改的数据
  * @param parentId 父节点 id
  */
-declare const replaceChildNode: (newNode: MNode, data?: MNode[], parentId?: Id) => void;
-declare const DSL_NODE_KEY_COPY_PREFIX = "__tmagic__";
-declare const IS_DSL_NODE_KEY = "__tmagic__dslNode";
-declare const PAGE_FRAGMENT_CONTAINER_ID_KEY = "tmagic-page-fragment-container-id";
-declare const compiledNode: (compile: (value: any) => any, node: MNode, dataSourceDeps?: DataSourceDeps, sourceId?: Id) => MNode;
-declare const compiledCond: (op: string, fieldValue: any, inputValue: any, range?: number[]) => boolean;
-declare const getDefaultValueFromFields: (fields: DataSchema[]) => Record<string, any>;
-declare const getKeys: <T extends object>(obj: T) => Array<keyof T>;
-declare const calculatePercentage: (value: number, percentageStr: string) => number;
-declare const isPercentage: (value: number | string) => boolean;
-declare const convertToNumber: (value: number | string, parentValue?: number) => number;
+export declare const replaceChildNode: (newNode: MNode, data?: MNode[], parentId?: Id) => void;
+export declare const DSL_NODE_KEY_COPY_PREFIX = "__tmagic__";
+export declare const IS_DSL_NODE_KEY = "__tmagic__dslNode";
+export declare const PAGE_FRAGMENT_CONTAINER_ID_KEY = "tmagic-page-fragment-container-id";
+export declare const compiledNode: (compile: (value: any) => any, node: MNode, dataSourceDeps?: DataSourceDeps, sourceId?: Id) => MNode;
+export declare const compiledCond: (op: string, fieldValue: any, inputValue: any, range?: number[]) => boolean;
+export declare const getDefaultValueFromFields: (fields: DataSchema[]) => Record<string, any>;
+export declare const getKeys: <T extends object>(obj: T) => Array<keyof T>;
+export declare const calculatePercentage: (value: number, percentageStr: string) => number;
+export declare const isPercentage: (value: number | string) => boolean;
+export declare const convertToNumber: (value: number | string, parentValue?: number) => number;
 /**
  * 添加参数到URL
  * @param obj 参数对象
  * @param global window对象
  * @param needReload 是否需要刷新
  */
-declare const addParamToUrl: (obj: Record<string, any>, global?: typeof globalThis, needReload?: boolean) => void;
-declare const dataSourceTemplateRegExp: RegExp;
-declare const isDslNode: (config: MNodeInstance) => boolean;
-interface NodeItem {
+export declare const addParamToUrl: (obj: Record<string, any>, global?: typeof globalThis, needReload?: boolean) => void;
+export declare const dataSourceTemplateRegExp: RegExp;
+export declare const isDslNode: (config: MNodeInstance) => boolean;
+export interface NodeItem {
   items?: NodeItem[];
   [key: string]: any;
 }
-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;
-//#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, isPageOrFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, removeDataSourceFieldPrefix, replaceChildNode, setDslDomRelateConfig, setIdToEl, setUrlParam, setValueByKeyPath, sleep, toHump, toLine, traverseNode };
+export declare const traverseNode: <T extends NodeItem = NodeItem>(node: T, cb: (node: T, parents: T[]) => void, parents?: T[], evalCbAfter?: boolean) => void;
+export declare const isValueIncludeDataSource: (value: any) => boolean;
+export declare const removeDataSourceFieldPrefix: (id?: string) => string;
+//#endregion