100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: or-asset-viewer minor styling updates
Rich Turner09f04925d6ad
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 787524e0f..0331e78ce 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -41,7 +41,7 @@ export interface PanelConfig {}export interface AssetViewerConfig {- panels: {[name: string] : PanelConfig};+ panels: {[name: string]: PanelConfig};viewerStyles?: { [style: string]: string };propertyViewProvider?: (property: string, value: any, viewerConfig: AssetViewerConfig, panelConfig: PanelConfig) => TemplateResult | undefined;attributeViewProvider?: (attribute: Attribute, viewerConfig: AssetViewerConfig, panelConfig: PanelConfig) => TemplateResult | undefined;@@ -224,10 +224,10 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem</div><div id="container" style="${this._viewerConfig.viewerStyles ? styleMap(this._viewerConfig.viewerStyles) : ""}">${html`${Object.entries(this._viewerConfig.panels).map(([name, panelConfig]) => {- const panelTemplate = OrAssetViewer.getPanel(name, this.asset!, this._attributes!, this._viewerConfig!, panelConfig, this.shadowRoot);- return panelTemplate || ``;- })}`- }+ const panelTemplate = OrAssetViewer.getPanel(name, this.asset!, this._attributes!, this._viewerConfig!, panelConfig, this.shadowRoot);+ return panelTemplate || ``;+ })}`+ }</div></div>`;@@ -246,11 +246,11 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}}- this.onCompleted().then(() => {- onRenderComplete.startCallbacks().then(()=> {- OrAssetViewer.generateGrid(this.shadowRoot);- });- });+ this.onCompleted().then(() => {+ onRenderComplete.startCallbacks().then(()=> {+ OrAssetViewer.generateGrid(this.shadowRoot);+ });+ });}@@ -390,6 +390,17 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemor-attribute-history {--or-attribute-history-controls-margin: 0 0 0 204px;}++ @media screen and (max-width: 769px) {+ #history-controls {+ position: unset;+ margin: 0 auto 10px auto;+ }++ or-attribute-history {+ --or-attribute-history-controls-margin: 10px 0 0 0;+ }+ }</style><div id="history-controls"><or-input id="history-attribute-picker" value="${historyAttrs[0].name}" .label="${i18next.t("attribute")}" @or-input-changed="${(evt: OrInputChangedEvent) => attributeChanged(evt.detail.value)}" .type="${InputType.SELECT}" .options="${options}"></or-input>@@ -428,9 +439,9 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem} else {content = html`${attrs.sort((attr1, attr2) => attr1.name! < attr2.name! ? -1 : attr1.name! > attr2.name! ? 1 : 0).map((attr) => {- let style = styles ? styles[attr.name!] : undefined;- return this.getField(attr.name!, false, style, OrAssetViewer.getAttributeTemplate(asset, attr, viewerConfig, panelConfig));- })}+ let style = styles ? styles[attr.name!] : undefined;+ return this.getField(attr.name!, false, style, OrAssetViewer.getAttributeTemplate(asset, attr, viewerConfig, panelConfig));+ })}`;}diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 01b04160d..59d1e7e37 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -34,7 +34,7 @@ export const style = css`#container {box-sizing: border-box;display: grid;- padding: 30px 20px;+ padding: 20px 20px;grid-gap: 10px;grid-template-columns: repeat(auto-fill, minmax(calc(50% - 5px),1fr));grid-auto-rows: 5px;