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

Merge pull request #11725 from maxunbearable/fix/conflict-export-customer

Browse Source 
Refactored logic: Customer - Version Conflict - Export
This commit is contained in:
Igor Kulikov 2024-09-24 13:26:59 +03:00 committed by GitHub
commit 009f079dc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui-ngx/src/app/shared/import-export/import-export.service.ts
View File

@ -363,6 +363,7 @@ export class ImportExportService {
public exportEntity(entityData: EntityInfoData | RuleChainMetaData): void { public exportEntity(entityData: EntityInfoData | RuleChainMetaData): void {
const id = (entityData as EntityInfoData).id ?? (entityData as RuleChainMetaData).ruleChainId; const id = (entityData as EntityInfoData).id ?? (entityData as RuleChainMetaData).ruleChainId;
let fileName = (entityData as EntityInfoData).name;
let preparedData; let preparedData;
switch (id.entityType) { switch (id.entityType) {
case EntityType.DEVICE_PROFILE: case EntityType.DEVICE_PROFILE:
@ -389,13 +390,13 @@ export class ImportExportService {
preparedData = this.prepareDashboardExport(entityData as Dashboard); preparedData = this.prepareDashboardExport(entityData as Dashboard);
break; break;
case EntityType.CUSTOMER: case EntityType.CUSTOMER:
preparedData = this.prepareExport({...entityData, name: (entityData as Customer).title}); fileName = (entityData as Customer).title;
(entityData as EntityInfoData).name = (entityData as Customer).title; preparedData = this.prepareExport(entityData);
break; break;
default: default:
preparedData = this.prepareExport(entityData); preparedData = this.prepareExport(entityData);
} }
this.exportToPc(preparedData, (entityData as EntityInfoData).name); this.exportToPc(preparedData, fileName);
} }
private exportSelectedWidgetsBundle(widgetsBundle: WidgetsBundle): void { private exportSelectedWidgetsBundle(widgetsBundle: WidgetsBundle): void {