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

Minor fixes

Browse Source
This commit is contained in:
Igor Kulikov 2020-03-23 16:05:28 +02:00
parent 893764dcbe
commit b544f29bf9
4 changed files with 920 additions and 3170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4069
ui-ngx/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
ui-ngx/package.json
View File

@ -127,6 +127,6 @@
"protractor": "^5.4.3",
"ts-node": "^8.6.2",
"tslint": "^6.0.0",
"typescript": "^3.7.5"
"typescript": "~3.7.5"
}
}

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

@ -401,6 +401,10 @@ export function isEqual(a: any, b: any): boolean {
return _.isEqual(a, b);
}
export function mergeDeep<T>(target: T, ...sources: T[]): T {
return _.merge(target, ...sources);
}
export function guid(): string {
function s4(): string {
return Math.floor((1 + Math.random()) * 0x10000)
@ -566,4 +570,4 @@ export function padValue(val: any, dec: number): string {
}
strVal = (n ? '-' : '') + strVal;
return strVal;
}
}

13
ui-ngx/src/app/shared/components/json-form/react/styles/thingsboardTheme.ts
View File

@ -33,17 +33,18 @@ import indigo from '@material-ui/core/colors/indigo';
import deeepOrange from '@material-ui/core/colors/deepOrange';
import { ThemeOptions } from '@material-ui/core/styles/createMuiTheme';
import { PaletteOptions } from '@material-ui/core/styles/createPalette';
import { deepClone } from '@core/utils';
import { mergeDeep } from '@core/utils';
const PRIMARY_COLOR = '#305680';
const SECONDARY_COLOR = '#527dad';
const HUE3_COLOR = '#a7c1de';
const tbIndigo = deepClone(indigo);
tbIndigo['500'] = PRIMARY_COLOR;
tbIndigo['600'] = SECONDARY_COLOR;
tbIndigo['700'] = tbIndigo['500'];
tbIndigo.A100 = HUE3_COLOR;
const tbIndigo = mergeDeep<any>({}, indigo, {
500: PRIMARY_COLOR,
600: SECONDARY_COLOR,
700: PRIMARY_COLOR,
A100: HUE3_COLOR
});
const thingsboardPalette: PaletteOptions = {
primary: tbIndigo,