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

Merge branch 'rc'

Browse Source
This commit is contained in:
Igor Kulikov 2024-09-26 13:31:18 +03:00
commit f6eb2d922b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
View File

@ -638,7 +638,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
ImageCacheKey key = getKeyFromUrl(tenantId, url);
if (key != null) {
var imageInfo = getImageInfoByTenantIdAndKey(key.getTenantId(), key.getResourceKey());
if (imageInfo != null) {
if (imageInfo != null && !(TenantId.SYS_TENANT_ID.equals(imageInfo.getTenantId()) && ResourceSubType.SCADA_SYMBOL.equals(imageInfo.getResourceSubType()))) {
byte[] data = key.isPreview() ? getImagePreview(tenantId, imageInfo.getId()) : getImageData(tenantId, imageInfo.getId());
ImageDescriptor descriptor = getImageDescriptor(imageInfo, key.isPreview());
String tbImagePrefix = "";

2
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
View File

@ -609,7 +609,7 @@ export class TbTimeSeriesChart {
echartsModule.init();
this.renderer.setStyle(this.chartElement, 'letterSpacing', 'normal');
this.timeSeriesChart = echarts.init(this.chartElement, null, {
renderer: 'canvas'
renderer: 'svg'
});
this.timeSeriesChartOptions = {
darkMode: this.darkMode,