dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13215 from vvlladd28/improvement/deep-clone/check

Browse Source 
Fix type checking for Date and Array in iframes
This commit is contained in:
Igor Kulikov 2025-04-17 12:46:42 +03:00 committed by GitHub
commit fc075ae857
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui-ngx/src/app/core/utils.ts
View File

@ -137,6 +137,14 @@ export function isLiteralObject(value: any) {
return (!!value) && (value.constructor === Object); return (!!value) && (value.constructor === Object);
} }
export const isDate = (obj: any): boolean => {
return Object.prototype.toString.call(obj) === "[object Date]";
}
export const isFile = (obj: any): boolean => {
return Object.prototype.toString.call(obj) === "[object File]";
}
export const formatValue = (value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined => { export const formatValue = (value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined => {
if (isDefinedAndNotNull(value) && isNumeric(value) && if (isDefinedAndNotNull(value) && isNumeric(value) &&
(isDefinedAndNotNull(dec) || isNotEmptyStr(units) || Number(value).toString() === value)) { (isDefinedAndNotNull(dec) || isNotEmptyStr(units) || Number(value).toString() === value)) {
@ -180,7 +188,7 @@ export function deleteNullProperties(obj: any) {
delete obj[propName]; delete obj[propName];
} else if (isObject(obj[propName])) { } else if (isObject(obj[propName])) {
deleteNullProperties(obj[propName]); deleteNullProperties(obj[propName]);
} else if (obj[propName] instanceof Array) { } else if (Array.isArray(obj[propName])) {
(obj[propName] as any[]).forEach((elem) => { (obj[propName] as any[]).forEach((elem) => {
deleteNullProperties(elem); deleteNullProperties(elem);
}); });
@ -335,13 +343,11 @@ export function deepClone<T>(target: T, ignoreFields?: string[]): T {
if (isObservable(target)) { if (isObservable(target)) {
return target; return target;
} }
if (target instanceof Date) { if (isDate(target)) {
return new Date(target.getTime()) as any; return new Date((target as Date).getTime()) as T;
} }
if (target instanceof Array) { if (Array.isArray(target)) {
const cp = [] as any[]; return (target as any[]).map((item) => deepClone(item)) as any;
(target as any[]).forEach((v) => { cp.push(v); });
return cp.map((n: any) => deepClone<any>(n)) as any;
} }
if (typeof target === 'object') { if (typeof target === 'object') {
const cp = {...(target as { [key: string]: any })} as { [key: string]: any }; const cp = {...(target as { [key: string]: any })} as { [key: string]: any };
@ -752,7 +758,7 @@ export function sortObjectKeys<T>(obj: T): T {
} }
export function deepTrim<T>(obj: T): T { export function deepTrim<T>(obj: T): T {
if (isNumber(obj) || isUndefined(obj) || isString(obj) || obj === null || obj instanceof File) { if (isNumber(obj) || isUndefined(obj) || isString(obj) || obj === null || isFile(obj)) {
return obj; return obj;
} }
return Object.keys(obj).reduce((acc, curr) => { return Object.keys(obj).reduce((acc, curr) => {