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

Merge branch 'feature/bulk-import/device-credentials' of https://github.com/vvlladd28/thingsboard into feature/bulk-import/device-credentials

Browse Source
This commit is contained in:
Viacheslav Klimov 2021-08-19 14:24:56 +03:00
commit 78cc97d96b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/utils/TypeCastUtil.java
View File

@ -45,7 +45,7 @@ public class TypeCastUtil {
} }
private static boolean isNumber(String value) { private static boolean isNumber(String value) {
return NumberUtils.isParsable(value.replace(',', '.')); return NumberUtils.isNumber(value.replace(',', '.'));
} }
private static boolean isSimpleDouble(String valueAsString) { private static boolean isSimpleDouble(String valueAsString) {

5
ui-ngx/src/app/modules/home/components/import-export/import-dialog-csv.component.ts
View File

@ -247,11 +247,11 @@ export class ImportDialogCsvComponent extends DialogComponent<ImportDialogCsvCom
initEditor() { initEditor() {
if (!this.initEditorComponent) { if (!this.initEditorComponent) {
this.createEditor(this.failureDetailsEditorElmRef, this.statistical.errorsList.join('\n')); this.createEditor(this.failureDetailsEditorElmRef, this.statistical.errorsList);
} }
} }
private createEditor(editorElementRef: ElementRef, content: string): void { private createEditor(editorElementRef: ElementRef, contents: string[]): void {
const editorElement = editorElementRef.nativeElement; const editorElement = editorElementRef.nativeElement;
let editorOptions: Partial<Ace.EditorOptions> = { let editorOptions: Partial<Ace.EditorOptions> = {
mode: 'ace/mode/java', mode: 'ace/mode/java',
@ -268,6 +268,7 @@ export class ImportDialogCsvComponent extends DialogComponent<ImportDialogCsvCom
}; };
editorOptions = {...editorOptions, ...advancedOptions}; editorOptions = {...editorOptions, ...advancedOptions};
const content = contents.map(error => error.replace('\n', '')).join('\n');
getAce().subscribe( getAce().subscribe(
(ace) => { (ace) => {
const editor = ace.edit(editorElement, editorOptions); const editor = ace.edit(editorElement, editorOptions);