dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,865 Commits 106 Branches 71 Tags
Commit Graph

521 Commits

Author SHA1 Message Date
Igor Kulikov
e72c689e9c Fix compile errors 2020-08-13 19:52:17 +03:00
Igor Kulikov
1533a95fa1 Upgrade angular to 10 2020-08-13 19:00:48 +03:00
Vladyslav_Prykhodko
1cf49faebc Fixed icon show marker in edit mode map into production build 2020-08-13 18:11:44 +03:00
Vladyslav_Prykhodko
cb64c860ec Update tootlip create marker/polygon 2020-08-12 13:48:11 +03:00
Vladyslav_Prykhodko
968f2745a0 Updated example delete marker/polygon for map 2020-08-12 13:07:09 +03:00
Igor Kulikov
d646ff5b41 Fix web camera input widget 2020-08-11 19:49:30 +03:00
Igor Kulikov
2bc2624a60
Merge pull request #3286 from vvlladd28/bugs/map/edit-polygon 
Fix createed and updated polygon
 2020-08-11 19:44:32 +03:00
Vladyslav_Prykhodko
3e2600cbbc Fix createed and updated polygon 2020-08-11 19:42:28 +03:00
Vladyslav_Prykhodko
fb3fa52ae8 Fix updated data from web camera input widget 2020-08-11 19:20:14 +03:00
Igor Kulikov
2a8379c3eb
Merge pull request #3282 from vvlladd28/improvment/map/name-value 
Fix parameter name map
 2020-08-11 17:49:04 +03:00
Vladyslav_Prykhodko
ac2564c75e Fix parameter name map 2020-08-11 17:46:53 +03:00
Igor Kulikov
5833ac3521
Merge pull request #3281 from vvlladd28/improvement/sort-meta-key 
Add sort metadata key for rule chain
 2020-08-11 17:45:07 +03:00
Vladyslav_Prykhodko
ce649822e2 Add sort metadata key 2020-08-11 17:43:19 +03:00
Igor Kulikov
a1f2ef40e5
Merge pull request #3280 from MrKartoshka/editable-polygons 
Editable polygons
 2020-08-11 17:25:12 +03:00
Vladyslav_Prykhodko
a1fb61ff4c Clear code 2020-08-11 16:58:26 +03:00
Mrkartoshka
ac6e946b2b moved from Array<> to LatLngTuple[] types 2020-08-11 16:23:41 +03:00
Igor Kulikov
80bc235975 Improve entities and alarms table widget title processing. 2020-08-11 14:35:36 +03:00
Vladyslav_Prykhodko
e3b8c28bc6 Add sorting object key 2020-08-11 13:43:37 +03:00
Mrkartoshka
9413b68ebf Editable polygons 2020-08-11 13:36:13 +03:00
Mrkartoshka
5596bd9f61 Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons 
 Conflicts:
	ui-ngx/package-lock.json
	ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts
 2020-08-11 12:04:34 +03:00
Mrkartoshka
c661343a32 Fixed types 2020-08-11 11:37:43 +03:00
Mrkartoshka
423a491e80 Editable Polygons without proper typings 2020-08-10 22:52:26 +03:00
Igor Kulikov
e8e2f21193 Map widgets fixes 2020-08-10 20:05:11 +03:00
Vladyslav_Prykhodko
31d0425cd8 Fix calculation value in function for map widget 2020-08-10 16:09:38 +03:00
Igor Kulikov
2bce12fa70
Merge pull request #3268 from vvlladd28/improvement/map/bounds-marker-cluster 
[3.0] Fix updated bounds for marker cluster mode
 2020-08-10 14:36:27 +03:00
Igor Kulikov
389988fbcf
Merge pull request #3267 from vvlladd28/improvmnet/map/empty-data 
[3.0] Fixed loading of data used by post-processing function in key setting
 2020-08-10 14:35:20 +03:00
Igor Kulikov
c1b53afd8a Add entity description to datasource. Fix map markers color. 2020-08-10 14:34:05 +03:00
Vladyslav_Prykhodko
cffe2135f2 Fix updated bounds for marker cluster mode 2020-08-10 10:29:55 +03:00
Vladyslav Prykhodko
ec7ea7042a Fixed loading of data used by post-processing function in key settings for map widgets 2020-08-10 00:15:09 +03:00
Vladyslav_Prykhodko
c4ae27795a Add use createdLabelForDatasource 2020-08-07 19:44:30 +03:00
Vladyslav_Prykhodko
13c21cca65 Optimize created marker label and tooltip 2020-08-07 19:41:04 +03:00
Igor Kulikov
6a4cd0d54a Add map widget loading indicator 2020-08-07 18:26:06 +03:00
Igor Kulikov
02b6cf6de7 Fix alarm data subscription. Maps cluster mode optimizations. 2020-08-07 14:39:46 +03:00
Igor Kulikov
8750b26f1d Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-07 10:39:02 +03:00
Igor Kulikov
c0f95aa520 Improve entities and alarms table, preserve columns width while loading data 2020-08-07 10:38:51 +03:00
Vladyslav_Prykhodko
9ef632d728 Add angular Sanitizer for widgetContext 2020-08-06 19:05:46 +03:00
Vladyslav_Prykhodko
4e75efddb8 Added trim for creating/editing alias or filter name 2020-08-05 17:38:20 +03:00
Igor Kulikov
4aede40c5e
Merge pull request #3235 from vvlladd28/improvement/alarm-widget/add-disable-sort 
[3.0] Disabled column sort for alarm widget for details key
 2020-08-05 11:26:54 +03:00
Vladyslav_Prykhodko
39e438c392 Disabled column sort for alarm widget for details key 2020-08-04 13:16:17 +03:00
Vladyslav_Prykhodko
f008dd14c6 Change get index date for map widget 2020-08-03 12:52:05 +03:00
Igor Kulikov
9b76d785b1 UI: Fix unresolved alias processing 2020-08-03 12:41:36 +03:00
Vladyslav_Prykhodko
e77138a187 Add support correct entityField key name: entityName and entityType 2020-08-03 10:18:28 +03:00
Vladyslav_Prykhodko
6e1b343f50 Alarm widget fix show the incorrect value from alarm details 2020-07-31 18:32:29 +03:00
Chantsova Ekaterina
46487aa576 Refactoring 2020-07-29 22:07:34 +03:00
Chantsova Ekaterina
51462e8017 Fix error on subscribing on attributes, that will be used in labels 2020-07-29 21:53:46 +03:00
Vladyslav_Prykhodko
d151455f3d Set DEFAULT_MAP_PAGE_SIZE 2020-07-28 14:47:40 +03:00
Vladyslav_Prykhodko
1785ea8723 Refactoring 2020-07-28 14:47:40 +03:00
Vladyslav_Prykhodko
557b0642b8 Added setting pageSize for a map, deleted deprecated map provider and fix creating a markers 2020-07-28 14:47:40 +03:00
Vladyslav_Prykhodko
56275a5c09 Improvement show edit filter dialog for customer 2020-07-28 14:45:31 +03:00
Vladyslav_Prykhodko
48e59782f1 Added trim to dataKeyName 2020-07-27 19:38:21 +03:00