Showing
7 changed files
with
122 additions
and
78 deletions
... | ... | @@ -1845,9 +1845,9 @@ |
1845 | 1845 | } |
1846 | 1846 | }, |
1847 | 1847 | "@types/jasmine": { |
1848 | - "version": "3.5.4", | |
1849 | - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.4.tgz", | |
1850 | - "integrity": "sha512-Uc/obv/lRh1t6RMOV6wkiAfYSZ0AOSTJqVl0Th8bHFcDhw4rQ0L60sxVnmOJj+RXbVboAE1Fd/mBclQWARRAsQ==", | |
1848 | + "version": "3.5.5", | |
1849 | + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.5.tgz", | |
1850 | + "integrity": "sha512-LlhwGivHkUV8ehNmaXjGGXopLm91G9ORIRcjw7Ya47jVAIGudewFZM2PdPXBvueZfRWwYzLt083wiPfKRXrSlg==", | |
1851 | 1851 | "dev": true |
1852 | 1852 | }, |
1853 | 1853 | "@types/jasminewd2": { |
... | ... | @@ -1894,9 +1894,9 @@ |
1894 | 1894 | "integrity": "sha512-13gmo3M2qVvjQrWNseqM3+cR6S2Ss3grbR2NZltgMq94wOwqJYQdgn8qzwDshzgXqMlSUtyPZjysImmktu22ew==" |
1895 | 1895 | }, |
1896 | 1896 | "@types/node": { |
1897 | - "version": "13.7.1", | |
1898 | - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz", | |
1899 | - "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==", | |
1897 | + "version": "13.7.2", | |
1898 | + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.2.tgz", | |
1899 | + "integrity": "sha512-uvilvAQbdJvnSBFcKJ2td4016urcGvsiR+N4dHGU87ml8O2Vl6l+ErOi9w0kXSPiwJ1AYlIW+0pDXDWWMOiWbw==", | |
1900 | 1900 | "dev": true |
1901 | 1901 | }, |
1902 | 1902 | "@types/prop-types": { |
... | ... | @@ -5372,9 +5372,9 @@ |
5372 | 5372 | "dev": true |
5373 | 5373 | }, |
5374 | 5374 | "electron-to-chromium": { |
5375 | - "version": "1.3.354", | |
5376 | - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.354.tgz", | |
5377 | - "integrity": "sha512-24YMkNiZWOUeF6YeoscWfIGP0oMx+lJpU/miwI+lcu7plIDpyZn8Gx0lx0qTDlzGoz7hx+lpyD8QkbkX5L2Pqw==", | |
5375 | + "version": "1.3.355", | |
5376 | + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz", | |
5377 | + "integrity": "sha512-zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ==", | |
5378 | 5378 | "dev": true |
5379 | 5379 | }, |
5380 | 5380 | "elliptic": { |
... | ... | @@ -8673,9 +8673,9 @@ |
8673 | 8673 | } |
8674 | 8674 | }, |
8675 | 8675 | "make-error": { |
8676 | - "version": "1.3.5", | |
8677 | - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", | |
8678 | - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", | |
8676 | + "version": "1.3.6", | |
8677 | + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", | |
8678 | + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", | |
8679 | 8679 | "dev": true |
8680 | 8680 | }, |
8681 | 8681 | "make-fetch-happen": { |
... | ... | @@ -9418,7 +9418,7 @@ |
9418 | 9418 | } |
9419 | 9419 | }, |
9420 | 9420 | "ngx-flowchart": { |
9421 | - "version": "git://github.com/thingsboard/ngx-flowchart.git#684c71fa3f15f99c5c22c8a6cf69a12d0b12be6e", | |
9421 | + "version": "git://github.com/thingsboard/ngx-flowchart.git#97a77477ca8579becf0e3a07866046b4536fe30a", | |
9422 | 9422 | "from": "git://github.com/thingsboard/ngx-flowchart.git#master", |
9423 | 9423 | "requires": { |
9424 | 9424 | "tslib": "^1.10.0" |
... | ... | @@ -11124,9 +11124,9 @@ |
11124 | 11124 | } |
11125 | 11125 | }, |
11126 | 11126 | "postcss-value-parser": { |
11127 | - "version": "4.0.2", | |
11128 | - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", | |
11129 | - "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==", | |
11127 | + "version": "4.0.3", | |
11128 | + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", | |
11129 | + "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", | |
11130 | 11130 | "dev": true |
11131 | 11131 | }, |
11132 | 11132 | "prepend-http": { |
... | ... | @@ -13972,9 +13972,9 @@ |
13972 | 13972 | "dev": true |
13973 | 13973 | }, |
13974 | 13974 | "uglify-js": { |
13975 | - "version": "3.7.7", | |
13976 | - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz", | |
13977 | - "integrity": "sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==", | |
13975 | + "version": "3.8.0", | |
13976 | + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz", | |
13977 | + "integrity": "sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==", | |
13978 | 13978 | "optional": true, |
13979 | 13979 | "requires": { |
13980 | 13980 | "commander": "~2.20.3", | ... | ... |
... | ... | @@ -13,33 +13,33 @@ |
13 | 13 | }, |
14 | 14 | "private": true, |
15 | 15 | "dependencies": { |
16 | - "@angular/animations": "~9.0.0", | |
17 | - "@angular/cdk": "~9.0.0", | |
18 | - "@angular/common": "~9.0.0", | |
19 | - "@angular/compiler": "~9.0.0", | |
20 | - "@angular/core": "~9.0.0", | |
16 | + "@angular/animations": "^9.0.1", | |
17 | + "@angular/cdk": "^9.0.0", | |
18 | + "@angular/common": "^9.0.1", | |
19 | + "@angular/compiler": "^9.0.1", | |
20 | + "@angular/core": "^9.0.1", | |
21 | 21 | "@angular/flex-layout": "^9.0.0-beta.29", |
22 | - "@angular/forms": "~9.0.0", | |
22 | + "@angular/forms": "^9.0.1", | |
23 | 23 | "@angular/material": "^9.0.0", |
24 | - "@angular/platform-browser": "~9.0.0", | |
25 | - "@angular/platform-browser-dynamic": "~9.0.0", | |
26 | - "@angular/router": "~9.0.0", | |
24 | + "@angular/platform-browser": "^9.0.1", | |
25 | + "@angular/platform-browser-dynamic": "^9.0.1", | |
26 | + "@angular/router": "^9.0.1", | |
27 | 27 | "@auth0/angular-jwt": "^4.0.0", |
28 | - "@date-io/date-fns": "^2.3.0", | |
28 | + "@date-io/date-fns": "^2.4.0", | |
29 | 29 | "@flowjs/flow.js": "^2.14.0", |
30 | 30 | "@flowjs/ngx-flow": "^0.4.3", |
31 | - "@mat-datetimepicker/core": "^4.0.0", | |
32 | - "@material-ui/core": "^4.9.2", | |
31 | + "@mat-datetimepicker/core": "^4.0.1", | |
32 | + "@material-ui/core": "^4.9.3", | |
33 | 33 | "@material-ui/icons": "^4.9.1", |
34 | 34 | "@material-ui/pickers": "^3.2.10", |
35 | 35 | "@ngrx/effects": "^8.6.0", |
36 | 36 | "@ngrx/store": "^8.6.0", |
37 | 37 | "@ngrx/store-devtools": "^8.6.0", |
38 | 38 | "@ngx-share/core": "^7.1.4", |
39 | - "@ngx-translate/core": "^12.0.0", | |
39 | + "@ngx-translate/core": "^12.1.1", | |
40 | 40 | "@ngx-translate/http-loader": "^4.0.0", |
41 | 41 | "ace-builds": "^1.4.8", |
42 | - "angular-gridster2": "^9.0.0", | |
42 | + "angular-gridster2": "^9.0.1", | |
43 | 43 | "angular2-hotkeys": "^2.1.5", |
44 | 44 | "base64-js": "^1.3.1", |
45 | 45 | "canvas-gauges": "^2.1.5", |
... | ... | @@ -52,15 +52,15 @@ |
52 | 52 | "font-awesome": "^4.7.0", |
53 | 53 | "javascript-detect-element-resize": "^0.5.3", |
54 | 54 | "jquery": "^3.4.1", |
55 | - "jquery.terminal": "^2.12.0", | |
55 | + "jquery.terminal": "^2.14.0", | |
56 | 56 | "js-beautify": "^1.10.3", |
57 | 57 | "json-schema-defaults": "^0.4.0", |
58 | - "jstree": "^3.3.8", | |
58 | + "jstree": "^3.3.9", | |
59 | 59 | "jstree-bootstrap-theme": "^1.0.1", |
60 | 60 | "material-design-icons": "^3.0.1", |
61 | 61 | "messageformat": "^2.3.0", |
62 | 62 | "moment": "^2.24.0", |
63 | - "ngx-clipboard": "^12.3.0", | |
63 | + "ngx-clipboard": "^12.3.1", | |
64 | 64 | "ngx-color-picker": "^9.0.0", |
65 | 65 | "ngx-daterangepicker-material": "^2.2.0", |
66 | 66 | "ngx-flowchart": "git://github.com/thingsboard/ngx-flowchart.git#master", |
... | ... | @@ -77,7 +77,7 @@ |
77 | 77 | "reactcss": "^1.2.3", |
78 | 78 | "rxjs": "^6.5.4", |
79 | 79 | "schema-inspector": "1.6.8", |
80 | - "screenfull": "^5.0.1", | |
80 | + "screenfull": "^5.0.2", | |
81 | 81 | "split.js": "^1.5.11", |
82 | 82 | "systemjs": "0.21.5", |
83 | 83 | "tinycolor2": "^1.4.1", |
... | ... | @@ -89,40 +89,37 @@ |
89 | 89 | }, |
90 | 90 | "devDependencies": { |
91 | 91 | "@angular-builders/custom-webpack": "^9.0.0-beta.7", |
92 | - "@angular-devkit/build-angular": "~0.900.1", | |
93 | - "@angular/cli": "^9.0.1", | |
94 | - "@angular/compiler-cli": "~9.0.0", | |
95 | - "@angular/language-service": "~9.0.0", | |
92 | + "@angular-devkit/build-angular": "^0.900.2", | |
93 | + "@angular/cli": "^9.0.2", | |
94 | + "@angular/compiler-cli": "^9.0.1", | |
95 | + "@angular/language-service": "^9.0.1", | |
96 | 96 | "@types/canvas-gauges": "^2.1.2", |
97 | - "@types/flot": "0.0.31", | |
98 | - "@types/jasmine": "^3.5.3", | |
99 | - "@types/jasminewd2": "~2.0.8", | |
97 | + "@types/flot": "^0.0.31", | |
98 | + "@types/jasmine": "^3.5.5", | |
99 | + "@types/jasminewd2": "^2.0.8", | |
100 | 100 | "@types/jquery": "^3.3.32", |
101 | 101 | "@types/js-beautify": "^1.8.1", |
102 | 102 | "@types/jstree": "^3.3.39", |
103 | - "@types/node": "^13.7.0", | |
103 | + "@types/node": "^13.7.2", | |
104 | 104 | "@types/raphael": "^2.1.30", |
105 | - "@types/react": "^16.9.19", | |
105 | + "@types/react": "^16.9.20", | |
106 | 106 | "@types/react-dom": "^16.9.5", |
107 | 107 | "@types/tinycolor2": "^1.4.2", |
108 | - "@types/tooltipster": "0.0.29", | |
109 | - "codelyzer": "^5.1.2", | |
108 | + "@types/tooltipster": "^0.0.29", | |
109 | + "codelyzer": "^5.2.1", | |
110 | 110 | "compression-webpack-plugin": "^3.1.0", |
111 | 111 | "directory-tree": "^2.2.4", |
112 | - "jasmine-core": "~3.5.0", | |
113 | - "jasmine-spec-reporter": "~4.2.1", | |
114 | - "karma": "~4.4.1", | |
115 | - "karma-chrome-launcher": "~3.1.0", | |
116 | - "karma-coverage-istanbul-reporter": "~2.1.1", | |
117 | - "karma-jasmine": "~3.1.0", | |
112 | + "jasmine-core": "^3.5.0", | |
113 | + "jasmine-spec-reporter": "^4.2.1", | |
114 | + "karma": "^4.4.1", | |
115 | + "karma-chrome-launcher": "^3.1.0", | |
116 | + "karma-coverage-istanbul-reporter": "^2.1.1", | |
117 | + "karma-jasmine": "^3.1.1", | |
118 | 118 | "karma-jasmine-html-reporter": "^1.5.2", |
119 | 119 | "ngrx-store-freeze": "^0.2.4", |
120 | 120 | "protractor": "^5.4.3", |
121 | - "ts-node": "~8.6.2", | |
122 | - "tslint": "~6.0.0", | |
123 | - "typescript": "~3.7.5" | |
124 | - }, | |
125 | - "resolutions": { | |
126 | - "serialize-javascript": "^2.1.1" | |
121 | + "ts-node": "^8.6.2", | |
122 | + "tslint": "^6.0.0", | |
123 | + "typescript": "^3.7.5" | |
127 | 124 | } |
128 | 125 | } | ... | ... |
ui-ngx/proxy.conf.json
deleted
100644 → 0
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | + | |
16 | 17 | .tb-nav-tree-container { |
17 | 18 | padding: 15px; |
18 | 19 | font-family: Roboto, "Helvetica Neue", sans-serif; |
... | ... | @@ -20,7 +21,7 @@ |
20 | 21 | &.jstree-proton, &.jstree-proton-small, &.jstree-proton-large { |
21 | 22 | .jstree-node, |
22 | 23 | .jstree-icon { |
23 | - background-image: url("../../../assets/jstree/32px.png"); | |
24 | + background-image: url("../../../assets/jstree/tb32px.png"); | |
24 | 25 | } |
25 | 26 | |
26 | 27 | .jstree-last { |
... | ... | @@ -43,6 +44,14 @@ |
43 | 44 | .jstree-anchor { |
44 | 45 | font-size: 16px; |
45 | 46 | } |
47 | + | |
48 | + .jstree-file { | |
49 | + background: url("../../../assets/jstree/tb32px.png") -101px -69px no-repeat; | |
50 | + } | |
51 | + | |
52 | + .jstree-folder { | |
53 | + background: url("../../../assets/jstree/tb32px.png") -261px -5px no-repeat; | |
54 | + } | |
46 | 55 | } |
47 | 56 | |
48 | 57 | &.jstree-proton-small { |
... | ... | @@ -56,6 +65,14 @@ |
56 | 65 | .jstree-anchor { |
57 | 66 | font-size: 14px; |
58 | 67 | } |
68 | + | |
69 | + .jstree-file { | |
70 | + background: url("../../../assets/jstree/tb32px.png") -103px -71px no-repeat; | |
71 | + } | |
72 | + | |
73 | + .jstree-folder { | |
74 | + background: url("../../../assets/jstree/tb32px.png") -263px -7px no-repeat; | |
75 | + } | |
59 | 76 | } |
60 | 77 | |
61 | 78 | &.jstree-proton-large { |
... | ... | @@ -69,6 +86,14 @@ |
69 | 86 | .jstree-anchor { |
70 | 87 | font-size: 20px; |
71 | 88 | } |
89 | + | |
90 | + .jstree-file { | |
91 | + background: url("../../../assets/jstree/tb32px.png") -96px -64px no-repeat; | |
92 | + } | |
93 | + | |
94 | + .jstree-folder { | |
95 | + background: url("../../../assets/jstree/tb32px.png") -256px 0px no-repeat; | |
96 | + } | |
72 | 97 | } |
73 | 98 | |
74 | 99 | a { |
... | ... | @@ -120,6 +145,15 @@ |
120 | 145 | } |
121 | 146 | } |
122 | 147 | |
148 | +#jstree-dnd { | |
149 | + &.jstree-proton, &.jstree-proton-small, &.jstree-proton-large { | |
150 | + .jstree-ok, | |
151 | + .jstree-er { | |
152 | + background-image: url("../../../assets/jstree/tb32px.png"); | |
153 | + } | |
154 | + } | |
155 | +} | |
156 | + | |
123 | 157 | @media (max-width: 768px) { |
124 | 158 | .tb-nav-tree-container { |
125 | 159 | &.jstree-proton-responsive { |
... | ... | @@ -128,7 +162,7 @@ |
128 | 162 | .jstree-node > .jstree-ocl, |
129 | 163 | .jstree-themeicon, |
130 | 164 | .jstree-checkbox { |
131 | - background-image: url("../../../assets/jstree/40px.png"); | |
165 | + background-image: url("../../../assets/jstree/tb40px.png"); | |
132 | 166 | background-size: 120px 240px; |
133 | 167 | } |
134 | 168 | |
... | ... | @@ -215,6 +249,15 @@ |
215 | 249 | background-position: -40px -40px; |
216 | 250 | } |
217 | 251 | |
252 | + .jstree-file { | |
253 | + background: url("../../../assets/jstree/tb40px.png") 0 -160px no-repeat; | |
254 | + background-size: 120px 240px; | |
255 | + } | |
256 | + .jstree-folder { | |
257 | + background: url("../../../assets/jstree/tb40px.png") -40px -40px no-repeat; | |
258 | + background-size: 120px 240px; | |
259 | + } | |
260 | + | |
218 | 261 | .jstree-checkbox, |
219 | 262 | .jstree-checkbox:hover { |
220 | 263 | background-position: -40px -80px; |
... | ... | @@ -289,6 +332,24 @@ |
289 | 332 | } |
290 | 333 | } |
291 | 334 | |
335 | +@media (max-width: 768px) { | |
336 | + #jstree-dnd { | |
337 | + &.jstree-dnd-responsive { | |
338 | + .jstree-ok, | |
339 | + .jstree-er { | |
340 | + background-image: url("../../../assets/jstree/tb40px.png"); | |
341 | + background-size: 120px 240px; | |
342 | + } | |
343 | + .jstree-ok { | |
344 | + background-position: 0 -200px; | |
345 | + } | |
346 | + .jstree-er { | |
347 | + background-position: -40px -200px; | |
348 | + } | |
349 | + } | |
350 | + } | |
351 | +} | |
352 | + | |
292 | 353 | .tb-nav-tree .mat-button.tb-active { |
293 | 354 | font-weight: 500; |
294 | 355 | background-color: rgba(255, 255, 255, .15); | ... | ... |
ui-ngx/src/assets/jstree/tb32px.png
renamed from
ui-ngx/src/assets/jstree/32px.png
19 KB
ui-ngx/src/assets/jstree/tb40px.png
renamed from
ui-ngx/src/assets/jstree/40px.png
1.84 KB