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

UI: Fixed not load advanced settings in widget

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-11-04 18:05:13 +02:00
parent a3206358c7
commit df08320eea
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/shared/components/json-form/react/json-form-ace-editor.tsx
View File

@ -20,16 +20,15 @@ import Button from '@material-ui/core/Button';
import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
import { IEditorProps } from 'react-ace/src/types'; import { IEditorProps } from 'react-ace/src/types';
import { mergeMap } from 'rxjs/operators'; import { mergeMap } from 'rxjs/operators';
import { loadAceDependencies } from '@shared/models/ace/ace.models'; import { getAce } from '@shared/models/ace/ace.models';
import { from } from 'rxjs'; import { from } from 'rxjs';
import { Observable } from 'rxjs/internal/Observable'; import { Observable } from 'rxjs/internal/Observable';
import { CircularProgress, IconButton } from '@material-ui/core'; import { CircularProgress, IconButton } from '@material-ui/core';
import { MouseEvent } from 'react'; import { MouseEvent } from 'react';
import { Help, HelpOutline } from '@material-ui/icons'; import { Help, HelpOutline } from '@material-ui/icons';
import { position } from 'html2canvas/dist/types/css/property-descriptors/position';
const ReactAce = React.lazy(() => { const ReactAce = React.lazy(() => {
return loadAceDependencies().pipe( return getAce().pipe(
mergeMap(() => { mergeMap(() => {
return from(import('react-ace')); return from(import('react-ace'));
}) })

2
ui-ngx/src/app/shared/models/ace/ace.models.ts
View File

@ -22,7 +22,7 @@ import { map, mergeMap, tap } from 'rxjs/operators';
let aceDependenciesLoaded = false; let aceDependenciesLoaded = false;
let aceModule: any; let aceModule: any;
export function loadAceDependencies(): Observable<any> { function loadAceDependencies(): Observable<any> {
if (aceDependenciesLoaded) { if (aceDependenciesLoaded) {
return of(null); return of(null);
} else { } else {