${metaKeyName} to substitute variables from metadata","entity-type-pattern":"Type pattern","entity-type-pattern-required":"Type pattern is required","entity-type-pattern-hint":"Type pattern, use ${metaKeyName} to substitute variables from metadata","entity-cache-expiration":"Entities cache expiration time (sec)","entity-cache-expiration-hint":"Specifies maximum time interval allowed to store found entity records. 0 value means that records will never expire.","entity-cache-expiration-required":"Entities cache expiration time is required.","entity-cache-expiration-range":"Entities cache expiration time should be greater than or equal to 0.","customer-name-pattern":"Customer name pattern","customer-name-pattern-required":"Customer name pattern is required","create-customer-if-not-exists":"Create new customer if not exists","customer-cache-expiration":"Customers cache expiration time (sec)","customer-name-pattern-hint":"Customer name pattern, use ${metaKeyName} to substitute variables from metadata","customer-cache-expiration-hint":"Specifies maximum time interval allowed to store found customer records. 0 value means that records will never expire.","customer-cache-expiration-required":"Customers cache expiration time is required.","customer-cache-expiration-range":"Customers cache expiration time should be greater than or equal to 0.","start-interval":"Start Interval","end-interval":"End Interval","start-interval-time-unit":"Start Interval Time Unit","end-interval-time-unit":"End Interval Time Unit","fetch-mode":"Fetch mode","fetch-mode-hint":"If selected fetch mode 'ALL' you able to choose telemetry sampling order.","order-by":"Order by","order-by-hint":"Select to choose telemetry sampling order.","time-unit-milliseconds":"Milliseconds","time-unit-seconds":"Seconds","time-unit-minutes":"Minutes","time-unit-hours":"Hours","time-unit-days":"Days","time-value-range":"Time value should be in a range from 1 to 2147483647'.","start-interval-value-required":"Start interval value is required.","end-interval-value-required":"End interval value is required.",filter:"Filter",switch:"Switch","message-type":"Message type","message-type-required":"Message type is required.","message-types-filter":"Message types filter","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one!","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","latest-timeseries":"Latest timeseries","data-keys":"Message data","metadata-keys":"Message metadata","relations-query":"Relations query","device-relations-query":"Device relations query","max-relation-level":"Max relation level","relation-type-pattern":"Relation type pattern","relation-type-pattern-hint":"Relation type pattern, use ${metaKeyName} to substitute variables from metadata","relation-type-pattern-required":"Relation type pattern is required","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","attr-mapping":"Attributes mapping","source-attribute":"Source attribute","source-attribute-required":"Source attribute is required.","source-telemetry":"Source telemetry","source-telemetry-required":"Source telemetry is required.","target-attribute":"Target attribute","target-attribute-required":"Target attribute is required.","attr-mapping-required":"At least one attribute mapping should be specified.","fields-mapping":"Fields mapping","fields-mapping-required":"At least one field mapping should be specified.","source-field":"Source field","source-field-required":"Source field is required.","originator-source":"Originator source","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata",generate:"Generate","test-generator-function":"Test generator function",generator:"Generator","test-filter-function":"Test filter function","test-switch-function":"Test switch function","test-transformer-function":"Test transformer function",transformer:"Transformer","alarm-create-condition":"Alarm create condition","test-condition-function":"Test condition function","alarm-clear-condition":"Alarm clear condition","alarm-details-builder":"Alarm details builder","test-details-function":"Test details function","alarm-type":"Alarm type","alarm-type-required":"Alarm type is required.","alarm-severity":"Alarm severity","alarm-severity-required":"Alarm severity is required",propagate:"Propagate",condition:"Condition",details:"Details","to-string":"To string","test-to-string-function":"Test to string function","from-template":"From Template","from-template-required":"From Template is required","from-template-hint":"From address template, use ${metaKeyName} to substitute variables from metadata","to-template":"To Template","to-template-required":"To Template is required","mail-address-list-template-hint":"Comma separated address list, use ${metaKeyName} to substitute variables from metadata","cc-template":"Cc Template","bcc-template":"Bcc Template","subject-template":"Subject Template","subject-template-required":"Subject Template is required","subject-template-hint":"Mail subject template, use ${metaKeyName} to substitute variables from metadata","body-template":"Body Template","body-template-required":"Body Template is required","body-template-hint":"Mail body template, use ${metaKeyName} to substitute variables from metadata","request-id-metadata-attribute":"Request Id Metadata attribute name","timeout-sec":"Timeout in seconds","timeout-required":"Timeout is required","min-timeout-message":"Only 0 minimum timeout value is allowed.","endpoint-url-pattern":"Endpoint URL pattern","endpoint-url-pattern-required":"Endpoint URL pattern is required","endpoint-url-pattern-hint":"HTTP URL address pattern, use ${metaKeyName} to substitute variables from metadata","request-method":"Request method","use-simple-client-http-factory":"Use simple client HTTP factory",headers:"Headers","headers-hint":"Use ${metaKeyName} in header/value fields to substitute variables from metadata",header:"Header","header-required":"Header is required",value:"Value","value-required":"Value is required","topic-pattern":"Topic pattern","topic-pattern-required":"Topic pattern is required","mqtt-topic-pattern-hint":"MQTT topic pattern, use ${metaKeyName} to substitute variables from metadata","bootstrap-servers":"Bootstrap servers","bootstrap-servers-required":"Bootstrap servers value is required","other-properties":"Other properties",key:"Key","key-required":"Key is required",retries:"Automatically retry times if fails","min-retries-message":"Only 0 minimum retries is allowed.","batch-size-bytes":"Produces batch size in bytes","min-batch-size-bytes-message":"Only 0 minimum batch size is allowed.","linger-ms":"Time to buffer locally (ms)","min-linger-ms-message":"Only 0 ms minimum value is allowed.","buffer-memory-bytes":"Client buffer max size in bytes","min-buffer-memory-message":"Only 0 minimum buffer size is allowed.",acks:"Number of acknowledgments","key-serializer":"Key serializer","key-serializer-required":"Key serializer is required","value-serializer":"Value serializer","value-serializer-required":"Value serializer is required","topic-arn-pattern":"Topic ARN pattern","topic-arn-pattern-required":"Topic ARN pattern is required","topic-arn-pattern-hint":"Topic ARN pattern, use ${metaKeyName} to substitute variables from metadata","aws-access-key-id":"AWS Access Key ID","aws-access-key-id-required":"AWS Access Key ID is required","aws-secret-access-key":"AWS Secret Access Key","aws-secret-access-key-required":"AWS Secret Access Key is required","aws-region":"AWS Region","aws-region-required":"AWS Region is required","exchange-name-pattern":"Exchange name pattern","routing-key-pattern":"Routing key pattern","message-properties":"Message properties",host:"Host","host-required":"Host is required",port:"Port","port-required":"Port is required","port-range":"Port should be in a range from 1 to 65535.","virtual-host":"Virtual host",username:"Username",password:"Password","automatic-recovery":"Automatic recovery","connection-timeout-ms":"Connection timeout (ms)","min-connection-timeout-ms-message":"Only 0 ms minimum value is allowed.","handshake-timeout-ms":"Handshake timeout (ms)","min-handshake-timeout-ms-message":"Only 0 ms minimum value is allowed.","client-properties":"Client properties","queue-url-pattern":"Queue URL pattern","queue-url-pattern-required":"Queue URL pattern is required","queue-url-pattern-hint":"Queue URL pattern, use ${metaKeyName} to substitute variables from metadata","delay-seconds":"Delay (seconds)","min-delay-seconds-message":"Only 0 seconds minimum value is allowed.","max-delay-seconds-message":"Only 900 seconds maximum value is allowed.",name:"Name","name-required":"Name is required","queue-type":"Queue type","sqs-queue-standard":"Standard","sqs-queue-fifo":"FIFO","message-attributes":"Message attributes","message-attributes-hint":"Use ${metaKeyName} in name/value fields to substitute variables from metadata","connect-timeout":"Connection timeout (sec)","connect-timeout-required":"Connection timeout is required.","connect-timeout-range":"Connection timeout should be in a range from 1 to 200.","client-id":"Client ID","clean-session":"Clean session","enable-ssl":"Enable SSL",credentials:"Credentials","credentials-type":"Credentials type","credentials-type-required":"Credentials type is required.","credentials-anonymous":"Anonymous","credentials-basic":"Basic","credentials-pem":"PEM","username-required":"Username is required.","password-required":"Password is required.","ca-cert":"CA certificate file *","private-key":"Private key file *",cert:"Certificate file *","no-file":"No file selected.","drop-file":"Drop a file or click to select a file to upload.","private-key-password":"Private key password","use-system-smtp-settings":"Use system SMTP settings","use-metadata-interval-patterns":"Use metadata interval patterns","use-metadata-interval-patterns-hint":"If selected, rule node use start and end interval patterns from message metadata assuming that intervals are in the milliseconds.","use-message-alarm-data":"Use message alarm data","check-all-keys":"Check that all selected keys are present","check-all-keys-hint":"If selected, checks that all specified keys are present in the message data and metadata.","check-relation-to-specific-entity":"Check relation to specific entity","check-relation-hint":"Checks existence of relation to specific entity or to any entity based on direction and relation type.","delete-relation-to-specific-entity":"Delete relation to specific entity","delete-relation-hint":"Deletes relation from the originator of the incoming message to the specified entity or list of entities based on direction and type.","remove-current-relations":"Remove current relations","remove-current-relations-hint":"Removes current relations from the originator of the incoming message based on direction and type.","change-originator-to-related-entity":"Change originator to related entity","change-originator-to-related-entity-hint":"Used to process submitted message as a message from another entity.","start-interval-pattern":"Start interval pattern","end-interval-pattern":"End interval pattern","start-interval-pattern-required":"Start interval pattern is required","end-interval-pattern-required":"End interval pattern is required","start-interval-pattern-hint":"Start interval pattern, use ${metaKeyName} to substitute variables from metadata","end-interval-pattern-hint":"End interval pattern, use ${metaKeyName} to substitute variables from metadata","smtp-protocol":"Protocol","smtp-host":"SMTP host","smtp-host-required":"SMTP host is required.","smtp-port":"SMTP port","smtp-port-required":"You must supply a smtp port.","smtp-port-range":"SMTP port should be in a range from 1 to 65535.","timeout-msec":"Timeout ms","min-timeout-msec-message":"Only 0 ms minimum value is allowed.","enter-username":"Enter username","enter-password":"Enter password","enable-tls":"Enable TLS","min-period-0-seconds-message":"Only 0 second minimum period is allowed.","max-pending-messages":"Maximum pending messages","max-pending-messages-required":"Maximum pending messages is required.","max-pending-messages-range":"Maximum pending messages should be in a range from 1 to 100000.","originator-types-filter":"Originator types filter","interval-seconds":"Interval in seconds","interval-seconds-required":"Interval is required.","min-interval-seconds-message":"Only 1 second minimum interval is allowed.","output-timeseries-key-prefix":"Output timeseries key prefix","output-timeseries-key-prefix-required":"Output timeseries key prefix required.","separator-hint":'You should press "enter" to complete field input.',"entity-details":"Select entity details:","entity-details-country":"Country","entity-details-state":"State","entity-details-zip":"Zip","entity-details-address":"Address","entity-details-address2":"Address2","entity-details-additional_info":"Additional Info","entity-details-phone":"Phone","entity-details-email":"Email","add-to-metadata":"Add selected details to message metadata","add-to-metadata-hint":"If selected, adds the selected details keys to the message metadata instead of message data.","entity-details-list-empty":"No entity details selected.","no-entity-details-matching":"No entity details matching were found.","custom-table-name":"Custom table name","custom-table-name-required":"Table Name is required","custom-table-hint":"You should enter the table name without prefix 'cs_tb_'.","message-field":"Message field","message-field-required":"Message field is required.","table-col":"Table column","table-col-required":"Table column is required.","latitude-key-name":"Latitude key name","longitude-key-name":"Longitude key name","latitude-key-name-required":"Latitude key name is required.","longitude-key-name-required":"Longitude key name is required.","fetch-perimeter-info-from-message-metadata":"Fetch perimeter information from message metadata","perimeter-circle":"Circle","perimeter-polygon":"Polygon","perimeter-type":"Perimeter type","circle-center-latitude":"Center latitude","circle-center-latitude-required":"Center latitude is required.","circle-center-longitude":"Center longitude","circle-center-longitude-required":"Center longitude is required.","range-unit-meter":"Meter","range-unit-kilometer":"Kilometer","range-unit-foot":"Foot","range-unit-mile":"Mile","range-unit-nautical-mile":"Nautical mile","range-units":"Range units",range:"Range","range-required":"Range is required.","polygon-definition":"Polygon definition","polygon-definition-required":"Polygon definition is required.","polygon-definition-hint":"Please, use the following format for manual definition of polygon: [[lat1,lon1],[lon2,lon4], ... ,[latN,lonN]].","min-inside-duration":"Minimal inside duration","min-inside-duration-value-required":"Minimal inside duration is required","min-inside-duration-time-unit":"Minimal inside duration time unit","min-outside-duration":"Minimal outside duration","min-outside-duration-value-required":"Minimal outside duration is required","min-outside-duration-time-unit":"Minimal outside duration time unit"},"key-val":{key:"Key",value:"Value","remove-entry":"Remove entry","add-entry":"Add entry"}}};e.translations("en_US",t)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=n},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function a(e){(0,o.default)(e)}a.$inject=["$translateProvider"],Object.defineProperty(t,"__esModule",{value:!0}),t.default=a;var r=n(100),o=i(r)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=angular.module("thingsboard.ruleChain.config.types",[]).constant("ruleNodeTypes",{originatorSource:{CUSTOMER:{name:"tb.rulenode.originator-customer",value:"CUSTOMER"},TENANT:{name:"tb.rulenode.originator-tenant",value:"TENANT"},RELATED:{name:"tb.rulenode.originator-related",value:"RELATED"}},fetchModeType:["FIRST","LAST","ALL"],samplingOrder:["ASC","DESC"],httpRequestType:["GET","POST","PUT","DELETE"],entityDetails:{COUNTRY:{name:"tb.rulenode.entity-details-country",value:"COUNTRY"},STATE:{name:"tb.rulenode.entity-details-state",value:"STATE"},ZIP:{name:"tb.rulenode.entity-details-zip",value:"ZIP"},ADDRESS:{name:"tb.rulenode.entity-details-address",value:"ADDRESS"},ADDRESS2:{name:"tb.rulenode.entity-details-address2",value:"ADDRESS2"},PHONE:{name:"tb.rulenode.entity-details-phone",value:"PHONE"},EMAIL:{name:"tb.rulenode.entity-details-email",value:"EMAIL"},ADDITIONAL_INFO:{name:"tb.rulenode.entity-details-additional_info",
diff --git a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
index ff92864690..243043c699 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -34,6 +34,7 @@ transport:
boss_group_thread_count: "${NETTY_BOSS_GROUP_THREADS:1}"
worker_group_thread_count: "${NETTY_WORKER_GROUP_THREADS:12}"
max_payload_size: "${NETTY_MAX_PAYLOAD_SIZE:65536}"
+ so_keep_alive: "${NETTY_SO_KEEPALIVE:false}"
# MQTT SSL configuration
ssl:
# Enable/disable SSL support
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 84f64c627d..b683fef949 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -5239,14 +5239,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -5261,20 +5259,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -5391,8 +5386,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -5404,7 +5398,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -5419,7 +5412,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -5427,14 +5419,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -5453,7 +5443,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -5534,8 +5523,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -5547,7 +5535,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -5669,7 +5656,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js
index ed75737ca7..8e85e1a054 100644
--- a/ui/src/app/common/types.constant.js
+++ b/ui/src/app/common/types.constant.js
@@ -276,6 +276,16 @@ export default angular.module('thingsboard.types', [])
name: 'alias.filter-type-entity-view-search-query'
}
},
+ direction: {
+ column: {
+ value: "column",
+ name: "direction.column"
+ },
+ row: {
+ value: "row",
+ name: "direction.row"
+ }
+ },
position: {
top: {
value: "top",
diff --git a/ui/src/app/components/legend-config-panel.controller.js b/ui/src/app/components/legend-config-panel.controller.js
index 9365c3a2f2..6253da01a5 100644
--- a/ui/src/app/components/legend-config-panel.controller.js
+++ b/ui/src/app/components/legend-config-panel.controller.js
@@ -21,10 +21,26 @@ export default function LegendConfigPanelController(mdPanelRef, $scope, types, l
vm.legendConfig = legendConfig;
vm.onLegendConfigUpdate = onLegendConfigUpdate;
vm.positions = types.position;
+ vm.directions = types.direction;
+ vm.isRowDirection = vm.legendConfig.direction === types.direction.row.value;
vm._mdPanelRef.config.onOpenComplete = function () {
$scope.theForm.$setPristine();
- }
+ };
+
+ vm.onChangeDirection = function() {
+ if (vm.legendConfig.direction === types.direction.row.value) {
+ vm.isRowDirection = true;
+ vm.legendConfig.position = types.position.bottom.value;
+ vm.legendConfig.showMin = false;
+ vm.legendConfig.showMax = false;
+ vm.legendConfig.showAvg = false;
+ vm.legendConfig.showTotal = false;
+ }
+ else {
+ vm.isRowDirection = false;
+ }
+ };
$scope.$watch('vm.legendConfig', function () {
if (onLegendConfigUpdate) {
diff --git a/ui/src/app/components/legend-config-panel.tpl.html b/ui/src/app/components/legend-config-panel.tpl.html
index 2e4eb5f00a..848330744d 100644
--- a/ui/src/app/components/legend-config-panel.tpl.html
+++ b/ui/src/app/components/legend-config-panel.tpl.html
@@ -20,24 +20,34 @@
| {{ 'legend.min' | translate }} | {{ 'legend.max' | translate }} | @@ -26,7 +26,7 @@||
|---|---|---|---|
| 实体视图别名在仪表板中必须是唯一的。",
+ "configure-alias": "配置 '{{alias}}' 别名",
+ "no-entity-views-matching": "没有实体视图匹配 '{{entity}}' 被找到。",
+ "alias": "别名",
+ "alias-required": "视图实体别名必填。",
+ "remove-alias": "移除视图实体别名",
+ "add-alias": "添加视图实体别名",
+ "name-starts-with": "实体视图名称前缀",
+ "entity-view-list": "实体视图列表",
+ "use-entity-view-name-filter": "使用过滤器",
+ "entity-view-list-empty": "未选择任何实体视图。",
+ "entity-view-name-filter-required": "实体视图名称过滤器必填。",
+ "entity-view-name-filter-no-entity-view-matched": "没有实体视图名称前缀 '{{entityView}}' 被找到。",
+ "add": "添加视图实体",
+ "assign-to-customer": "分配给客户",
+ "assign-entity-view-to-customer": "将实体视图分配给客户",
+ "assign-entity-view-to-customer-text": "请选择要分配给客户的实体视图",
+ "no-entity-views-text": "找不到实体视图",
+ "assign-to-customer-text": "请选择客户以分配实体视图",
+ "entity-view-details": "实体视图详细信息",
+ "add-entity-view-text": "添加新的实体视图",
+ "delete": "删除实体视图",
+ "assign-entity-views": "分配实体视图",
+ "assign-entity-views-text": "分配 { count, plural, 1 {1 实体视图} other {# 实体视图} } 给客户",
+ "delete-entity-views": "移除实体视图",
+ "unassign-from-customer": "取消分配客户",
+ "unassign-entity-views": "取消分配实体视图",
+ "unassign-entity-views-action-title": "从客户处取消分配 { count, plural, 1 {1 实体视图} other {# 实体视图} }",
+ "assign-new-entity-view": "分配新的实体视图",
+ "delete-entity-view-title": "您确定要删除实体视图 '{{entityViewName}}'吗？",
+ "delete-entity-view-text": "请注意，在确认后实体视图和所有相关数据将变得不可恢复。",
+ "delete-entity-views-title": "你确定要删除 { count, plural, 1 {1 实体视图} other {# 实体视图} }吗？",
+ "delete-entity-views-action-title": "删除 { count, plural, 1 {1 实体视图} other {# 实体视图} }",
+ "delete-entity-views-text": "请注意，在确认后将删除所有选定的实体视图，并且所有相关数据将变为不可恢复。",
+ "unassign-entity-view-title": "您确定要取消分配实体视图 '{{entityViewName}}'吗？",
+ "unassign-entity-view-text": "确认后，实体视图将被取消分配，客户将无法访问。",
+ "unassign-entity-view": "取消分配实体视图",
+ "unassign-entity-views-title": "你确定要取消分配 { count, plural, 1 {1 实体视图} other {# 实体视图} }吗？",
+ "unassign-entity-views-text": "确认后，所有选定的实体视图都将被取消分配，客户将无法访问。",
+ "entity-view-type": "实体视图类型",
+ "entity-view-type-required": "实体视图类型必填。",
+ "select-entity-view-type": "选择实体视图类型",
+ "enter-entity-view-type": "输入实体视图类型",
+ "any-entity-view": "任何实体视图",
+ "no-entity-view-types-matching": "没有找到匹配 '{{entitySubtype}}' 的实体视图类型。",
+ "entity-view-type-list-empty": "未选择任何实体视图类型。",
+ "entity-view-types": "实体视图类型",
+ "name": "名称",
+ "name-required": "名称必填。",
+ "description": "描述",
+ "events": "事件",
+ "details": "详情",
+ "copyId": "复制实体视图ID",
+ "assignedToCustomer": "分配给客户",
+ "unable-entity-view-device-alias-title": "无法删除实体视图别名",
+ "unable-entity-view-device-alias-text": "设备别名 '{{entityViewAlias}}' 无法删除，因为它由以下小部件使用： {{widgetsList}}", + "select-entity-view": "选择实体视图", + "make-public": "将实体视图公开", + "make-private": "将实体视图设为私有", + "start-date": "开始日期", + "start-ts": "开始时间", + "end-date": "结束日期", + "end-ts": "结束时间", + "date-limits": "日期范围", + "client-attributes": "客户属性", + "shared-attributes": "共享属性", + "server-attributes": "服务器属性", + "timeseries": "时间序列", + "client-attributes-placeholder": "客户属性", + "shared-attributes-placeholder": "共享属性", + "server-attributes-placeholder": "服务器属性", + "timeseries-placeholder": "时间序列", + "target-entity": "目标实体", + "attributes-propagation": "属性传播", + "attributes-propagation-hint": "每次保存或更新此实体视图时，实体视图将自动从目标实体复制指定的属性。出于性能原因，目标实体属性不会在每次属性更改时传播到实体视图。通过在规则链中配置“copy to view”规则节点，并将“Post attributes”和“Attributes Updated”消息链接到新的规则节点，可以启用自动传播。", + "timeseries-data": "时间序列数据", + "timeseries-data-hint": "配置实体视图可访问目标实体的时间序列数据键。此时间序列数据是只读的。", + "make-public-entity-view-title": "您确定要将实体视图 '{{entityViewName}}' 设为公开吗？", + "make-public-entity-view-text": "确认后，设备及其所有数据将被设为公开并可被其他人访问。", + "make-private-entity-view-title": "您确定要将实体视图 '{{entityViewName}}' 设为私有吗？", + "make-private-entity-view-text": "确认后，设备及其所有数据将被设为私有，不被其他人访问。" + }, "event": { "event-type": "事件类型", "type-error": "错误", @@ -1442,7 +1538,7 @@ "Dec": "12月", "January": "一月", "February": "二月", - "March": "游行", + "March": "三月", "April": "四月", "June": "六月", "July": "七月", @@ -1472,7 +1568,7 @@ "6 months": "6个月", "Custom interval": "自定义间隔", "Interval": "间隔", - "Step size": "一步的大小", + "Step size": "步长", "Ok": "Ok" } } @@ -1509,4 +1605,4 @@ "uk_UA": "乌克兰" } } -} \ No newline at end of file +} diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js index a21f7a0876..6acbc3e988 100644 --- a/ui/src/app/widget/lib/google-map.js +++ b/ui/src/app/widget/lib/google-map.js @@ -19,7 +19,7 @@ var gmGlobals = { } export default class TbGoogleMap { - constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, gmApiKey, gmDefaultMapType) { + constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, disableScrollZooming, minZoomLevel, gmApiKey, gmDefaultMapType) { var tbMap = this; this.utils = utils; @@ -44,7 +44,7 @@ export default class TbGoogleMap { function initGoogleMap() { tbMap.map = new google.maps.Map($containerElement[0], { // eslint-disable-line no-undef - scrollwheel: true, + scrollwheel: !disableScrollZooming, mapTypeId: getGoogleMapTypeId(tbMap.defaultMapType), zoom: tbMap.defaultZoomLevel || 8 }); diff --git a/ui/src/app/widget/lib/image-map.js b/ui/src/app/widget/lib/image-map.js index 1c50bae14b..17f0b13af3 100644 --- a/ui/src/app/widget/lib/image-map.js +++ b/ui/src/app/widget/lib/image-map.js @@ -20,7 +20,7 @@ const maxZoom = 4; export default class TbImageMap { - constructor(ctx, $containerElement, utils, initCallback, imageUrl, posFunction, imageEntityAlias, imageUrlAttribute) { + constructor(ctx, $containerElement, utils, initCallback, imageUrl, disableScrollZooming, posFunction, imageEntityAlias, imageUrlAttribute) { this.ctx = ctx; this.utils = utils; @@ -34,6 +34,7 @@ export default class TbImageMap { this.height = 0; this.markers = []; this.initCallback = initCallback; + this.disableScrollZooming = disableScrollZooming; if (angular.isDefined(posFunction) && posFunction.length > 0) { try { @@ -165,6 +166,7 @@ export default class TbImageMap { this.map = L.map(this.$containerElement[0], { minZoom: 1, maxZoom: maxZoom, + scrollWheelZoom: !this.disableScrollZooming, center: center, zoom: 1, crs: L.CRS.Simple, diff --git a/ui/src/app/widget/lib/map-widget2.js b/ui/src/app/widget/lib/map-widget2.js index f330bd61bf..fac3de7aa2 100644 --- a/ui/src/app/widget/lib/map-widget2.js +++ b/ui/src/app/widget/lib/map-widget2.js @@ -78,18 +78,29 @@ export default class TbMapWidgetV2 { tbMap.tooltipActionsMap[descriptor.name] = descriptor; }); + let openStreetMapProvider = {}; if (mapProvider === 'google-map') { - this.map = new TbGoogleMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType); + this.map = new TbGoogleMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType); } else if (mapProvider === 'openstreet-map') { - this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.mapProvider); + if (settings.useCustomProvider && settings.customProviderTileUrl) { + openStreetMapProvider.name = settings.customProviderTileUrl; + openStreetMapProvider.isCustom = true; + } else { + openStreetMapProvider.name = settings.mapProvider; + } + this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, openStreetMapProvider); + } else if (mapProvider === 'here') { + openStreetMapProvider.name = settings.mapProvider; + this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, openStreetMapProvider, settings.credentials); } else if (mapProvider === 'image-map') { this.map = new TbImageMap(this.ctx, $element, this.utils, initCallback, settings.mapImageUrl, + settings.disableScrollZooming, settings.posFunction, settings.imageEntityAlias, settings.imageUrlAttribute); } else if (mapProvider === 'tencent-map') { - this.map = new TbTencentMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.tmApiKey, settings.tmDefaultMapType); + this.map = new TbTencentMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, settings.tmApiKey, settings.tmDefaultMapType); } @@ -663,6 +674,8 @@ export default class TbMapWidgetV2 { return imageMapSettingsSchema; } else if (mapProvider === 'tencent-map') { schema = angular.copy(tencentMapSettingsSchema); + } else if (mapProvider === 'here') { + schema = angular.copy(hereMapSettingsSchema); } angular.merge(schema.schema.properties, commonMapSettingsSchema.schema.properties); schema.schema.required = schema.schema.required.concat(commonMapSettingsSchema.schema.required); @@ -790,6 +803,62 @@ const tencentMapSettingsSchema = ] }; +const hereMapSettingsSchema = + { + "schema": { + "title": "HERE Map Configuration", + "type": "object", + "properties": { + "mapProvider": { + "title": "Map layer", + "type": "string", + "default": "HERE.normalDay" + }, + "credentials":{ + "type": "object", + "properties": { + "app_id": { + "title": "HERE app id", + "type": "string" + }, + "app_code": { + "title": "HERE app code", + "type": "string" + } + }, + "required": ["app_id", "app_code"] + } + }, + "required": [] + }, + "form": [ + { + "key": "mapProvider", + "type": "rc-select", + "multiple": false, + "items": [ + { + "value": "HERE.normalDay", + "label": "HERE.normalDay (Default)" + }, + { + "value": "HERE.normalNight", + "label": "HERE.normalNight" + }, + { + "value": "HERE.hybridDay", + "label": "HERE.hybridDay" + }, + { + "value": "HERE.terrainDay", + "label": "HERE.terrainDay" + } + ] + }, + "credentials" + ] + }; + const openstreetMapSettingsSchema = { "schema": { @@ -800,7 +869,17 @@ const openstreetMapSettingsSchema = "title": "Map provider", "type": "string", "default": "OpenStreetMap.Mapnik" - } + }, + "useCustomProvider": { + "title": "Use custom provider", + "type": "boolean", + "default": false + }, + "customProviderTileUrl": { + "title": "Custom provider tile URL", + "type": "string", + "default": "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + } }, "required": [] }, @@ -839,7 +918,9 @@ const openstreetMapSettingsSchema = "label": "CartoDB.DarkMatter" } ] - } + }, + "useCustomProvider", + "customProviderTileUrl" ] }; @@ -858,6 +939,11 @@ const commonMapSettingsSchema = "type": "boolean", "default": true }, + "disableScrollZooming": { + "title": "Disable scroll zooming", + "type": "boolean", + "default": false + }, "latKeyName": { "title": "Latitude key name", "type": "string", @@ -998,6 +1084,7 @@ const commonMapSettingsSchema = "form": [ "defaultZoomLevel", "fitMapBounds", + "disableScrollZooming", "latKeyName", "lngKeyName", "showLabel", @@ -1109,6 +1196,11 @@ const imageMapSettingsSchema = "type": "string", "default": "" }, + "disableScrollZooming": { + "title": "Disable scroll zooming", + "type": "boolean", + "default": false + }, "xPosKeyName": { "title": "X position key name", "type": "string", @@ -1226,6 +1318,7 @@ const imageMapSettingsSchema = }, "imageEntityAlias", "imageUrlAttribute", + "disableScrollZooming", "xPosKeyName", "yPosKeyName", "showLabel", diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js index 33f9ae09e2..c7d253ea3f 100644 --- a/ui/src/app/widget/lib/openstreet-map.js +++ b/ui/src/app/widget/lib/openstreet-map.js @@ -19,7 +19,7 @@ import 'leaflet-providers'; export default class TbOpenStreetMap { - constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, mapProvider) { + constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, disableScrollZooming, minZoomLevel, mapProvider, credentials) { this.utils = utils; this.defaultZoomLevel = defaultZoomLevel; @@ -28,13 +28,23 @@ export default class TbOpenStreetMap { this.tooltips = []; if (!mapProvider) { - mapProvider = "OpenStreetMap.Mapnik"; + mapProvider = { + name: "OpenStreetMap.Mapnik" + }; + } + + if (mapProvider.name.startsWith("HERE.")) { + credentials.app_id = credentials.app_id || "AhM6TzD9ThyK78CT3ptx"; + credentials.app_code = credentials.app_code || "p6NPiITB3Vv0GMUFnkLOOg"; } this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8); - var tileLayer = L.tileLayer.provider(mapProvider); + if (disableScrollZooming) { + this.map.scrollWheelZoom.disable(); + } + var tileLayer = mapProvider.isCustom ? L.tileLayer(mapProvider.name) : L.tileLayer.provider(mapProvider.name, credentials); tileLayer.addTo(this.map); if (initCallback) { diff --git a/ui/src/app/widget/lib/tencent-map.js b/ui/src/app/widget/lib/tencent-map.js index 9638667317..6c3f5b1921 100644 --- a/ui/src/app/widget/lib/tencent-map.js +++ b/ui/src/app/widget/lib/tencent-map.js @@ -19,7 +19,7 @@ var tmGlobals = { } export default class TbTencentMap { - constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, tmApiKey, tmDefaultMapType) { + constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, disableScrollZooming, minZoomLevel, tmApiKey, tmDefaultMapType) { var tbMap = this; this.utils = utils; this.defaultZoomLevel = defaultZoomLevel; @@ -42,7 +42,7 @@ export default class TbTencentMap { function initTencentMap() { tbMap.map = new qq.maps.Map($containerElement[0], { // eslint-disable-line no-undef - scrollwheel: true, + scrollwheel: !disableScrollZooming, mapTypeId: getTencentMapTypeId(tbMap.defaultMapType), zoom: tbMap.defaultZoomLevel || 8 }); diff --git a/ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js b/ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js index 5d7cc78943..2188353141 100644 --- a/ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js +++ b/ui/src/app/widget/lib/tripAnimation/trip-animation-widget.js @@ -286,7 +286,7 @@ function tripAnimationController($document, $scope, $log, $http, $timeout, $filt } } vm.dontFitMapBounds = vm.ctx.settings.fitMapBounds === false; - vm.map = new TbOpenStreetMap(vm.ctx.$element, vm.utils, initCallback, vm.defaultZoomLevel, vm.dontFitMapBounds, null, vm.staticSettings.mapProvider); + vm.map = new TbOpenStreetMap(vm.ctx.$element, vm.utils, initCallback, vm.defaultZoomLevel, vm.dontFitMapBounds, vm.staticSettings.disableScrollZooming, null, vm.staticSettings.mapProvider); vm.map.bounds = vm.map.createBounds(); vm.map.invalidateSize(true); vm.map.bounds = vm.map.createBounds(); @@ -307,7 +307,8 @@ function tripAnimationController($document, $scope, $log, $http, $timeout, $filt staticSettings.disabledButtonColor = tinycolor(vm.widgetConfig.color).setAlpha(0.3).toRgbString(); staticSettings.polygonColor = tinycolor(vm.ctx.settings.polygonColor).toHexString(); staticSettings.polygonStrokeColor = tinycolor(vm.ctx.settings.polygonStrokeColor).toHexString(); - staticSettings.mapProvider = vm.ctx.settings.mapProvider || "OpenStreetMap.Mapnik"; + staticSettings.mapProvider = vm.ctx.settings.mapProvider ? {name: vm.ctx.settings.mapProvider} : {name: "OpenStreetMap.Mapnik"}; + staticSettings.disableScrollZooming = vm.ctx.settings.disableScrollZooming || false; staticSettings.latKeyName = vm.ctx.settings.latKeyName || "latitude"; staticSettings.lngKeyName = vm.ctx.settings.lngKeyName || "longitude"; staticSettings.polKeyName = vm.ctx.settings.polKeyName || "coordinates"; @@ -362,6 +363,12 @@ function tripAnimationController($document, $scope, $log, $http, $timeout, $filt iconSize: [30, 30], iconAnchor: [15, 15] }); + + if (vm.ctx.settings.useCustomProvider && vm.ctx.settings.customProviderTileUrl) { + staticSettings.mapProvider.name = vm.ctx.settings.customProviderTileUrl; + staticSettings.mapProvider.isCustom = true; + } + if (angular.isDefined(vm.ctx.settings.markerImage)) { staticSettings.icon = L.icon({ iconUrl: vm.ctx.settings.markerImage, | |||