Skip to content

Commit

Permalink
fix some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@jemu75
jemu75 committed Mar 12, 2021
1 parent da67683 commit 35f1205
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 32 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Das Attribut `appOptions` kann mit unterschiedlichen Parametern befüllt werden,
"connected": { object }, - bindet zusätzliche Devices in das Template ein
"home": "true", - zeigt ein Device auf der Startseite an
"dashboard": "true", - zeigt ein Device im Dashboard an
"system":"true", - zeigt ein Device in den Systemeinstellungen an
"system": "true", - zeigt ein Device in den Systemeinstellungen an
"chartDef": ["def1", "def2", ...],- legt die Datenquellen für Grafiken fest
"link": "string", - gibt den URL-Pfad für Panels an
"toggle": ["def1", "def2", ...], - ermöglicht die Definition von "Schaltern"für Panels
Expand Down
54 changes: 29 additions & 25 deletions src/plugins/fhem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,32 +390,36 @@ export default class Fhem extends EventEmitter {
let idx = 1;
let target = [];

for(const item of res.Results) {
if('PossibleSets' in item) delete item.PossibleSets;
if('PossibleAttrs' in item) delete item.PossibleAttrs;

let options = this.createOptions(item);

if(options) {
item.Options = options;
this.createConnected(item)
.then(async (connected) => {
item.Connected = await connected;
target.push(item);

if(idx === res.Results.length) {
this.app.data.deviceList = Object.assign([], target);
this.app.options.loading = false
}
idx ++;
})
.catch((err) => {
this.log = { type: 'error', message: 'Add Connected Element failed.', meta: err };
this.app.options.loading = false;
});
} else {
this.app.options.loading = false;
if(res.Results.length > 0) {
for(const item of res.Results) {
if('PossibleSets' in item) delete item.PossibleSets;
if('PossibleAttrs' in item) delete item.PossibleAttrs;

let options = this.createOptions(item);

if(options) {
item.Options = options;
this.createConnected(item)
.then(async (connected) => {
item.Connected = await connected;
target.push(item);

if(idx === res.Results.length) {
this.app.data.deviceList = Object.assign([], target);
this.app.options.loading = false
}
idx ++;
})
.catch((err) => {
this.log = { type: 'error', message: 'Add Connected Element failed.', meta: err };
this.app.options.loading = false;
});
} else {
this.app.options.loading = false;
}
}
} else {
this.app.options.loading = false
}
})
.catch((err) => {
Expand Down
5 changes: 3 additions & 2 deletions vue.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ module.exports = {
"vuetify"
],

outputDir: 'www/fhemapp'
}
outputDir: 'www/fhemapp',
publicPath: '/'
}
2 changes: 1 addition & 1 deletion www/fhemapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="/favicon.png"><title>fhemapp</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/css/chunk-03454508.55c011d2.css" rel="prefetch"><link href="/css/chunk-03dea3f3.55c011d2.css" rel="prefetch"><link href="/css/chunk-0458398b.c4749bc4.css" rel="prefetch"><link href="/css/chunk-098d33d4.61e1e199.css" rel="prefetch"><link href="/css/chunk-0c535319.55c011d2.css" rel="prefetch"><link href="/css/chunk-0cc2145f.55c011d2.css" rel="prefetch"><link href="/css/chunk-130a45b2.611711b5.css" rel="prefetch"><link href="/css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="/css/chunk-2268dc1a.55c011d2.css" rel="prefetch"><link href="/css/chunk-27250ed3.55c011d2.css" rel="prefetch"><link href="/css/chunk-2c05d556.cb4d0868.css" rel="prefetch"><link href="/css/chunk-3ddbf9db.55c011d2.css" rel="prefetch"><link href="/css/chunk-58038582.55c011d2.css" rel="prefetch"><link href="/css/chunk-6080f988.55c011d2.css" rel="prefetch"><link href="/css/chunk-72b2e77a.55c011d2.css" rel="prefetch"><link href="/css/chunk-72c6e8d8.5998f8b1.css" rel="prefetch"><link href="/css/chunk-8161d788.55c011d2.css" rel="prefetch"><link href="/css/chunk-98f267aa.55c011d2.css" rel="prefetch"><link href="/css/chunk-a9a9ce50.55c011d2.css" rel="prefetch"><link href="/css/chunk-d584b056.4c33e4ab.css" rel="prefetch"><link href="/css/chunk-e998d306.55c011d2.css" rel="prefetch"><link href="/css/chunk-f087d6f2.288ff701.css" rel="prefetch"><link href="/css/chunk-f90907bc.01cf6fd8.css" rel="prefetch"><link href="/js/chunk-03454508.ae897793.js" rel="prefetch"><link href="/js/chunk-03dea3f3.69a324ce.js" rel="prefetch"><link href="/js/chunk-0458398b.ff29fd68.js" rel="prefetch"><link href="/js/chunk-098d33d4.2eb3b3bc.js" rel="prefetch"><link href="/js/chunk-0c535319.93a35ed2.js" rel="prefetch"><link href="/js/chunk-0cc2145f.002bcc46.js" rel="prefetch"><link href="/js/chunk-130a45b2.312bbacd.js" rel="prefetch"><link href="/js/chunk-15fa718e.ca3c3011.js" rel="prefetch"><link href="/js/chunk-2268dc1a.fa567475.js" rel="prefetch"><link href="/js/chunk-27250ed3.3d736564.js" rel="prefetch"><link href="/js/chunk-2c05d556.94e28585.js" rel="prefetch"><link href="/js/chunk-2d212bf1.c4942ad5.js" rel="prefetch"><link href="/js/chunk-3ddbf9db.45dc4ab8.js" rel="prefetch"><link href="/js/chunk-58038582.a8afb898.js" rel="prefetch"><link href="/js/chunk-6080f988.1449be5f.js" rel="prefetch"><link href="/js/chunk-72b2e77a.09276532.js" rel="prefetch"><link href="/js/chunk-72c6e8d8.7a32d934.js" rel="prefetch"><link href="/js/chunk-8161d788.c6648e6e.js" rel="prefetch"><link href="/js/chunk-98f267aa.eb1f1545.js" rel="prefetch"><link href="/js/chunk-a9a9ce50.5ab8566b.js" rel="prefetch"><link href="/js/chunk-d584b056.65eba95a.js" rel="prefetch"><link href="/js/chunk-e998d306.82399090.js" rel="prefetch"><link href="/js/chunk-f087d6f2.1bc41a25.js" rel="prefetch"><link href="/js/chunk-f90907bc.e2ff7967.js" rel="prefetch"><link href="/css/chunk-vendors.9656408d.css" rel="preload" as="style"><link href="/js/app.320d8872.js" rel="preload" as="script"><link href="/js/chunk-vendors.09d38c92.js" rel="preload" as="script"><link href="/css/chunk-vendors.9656408d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.09d38c92.js"></script><script src="/js/app.320d8872.js"></script></body></html>
<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="/favicon.png"><title>fhemapp</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/css/chunk-03454508.55c011d2.css" rel="prefetch"><link href="/css/chunk-03dea3f3.55c011d2.css" rel="prefetch"><link href="/css/chunk-0458398b.c4749bc4.css" rel="prefetch"><link href="/css/chunk-098d33d4.61e1e199.css" rel="prefetch"><link href="/css/chunk-0c535319.55c011d2.css" rel="prefetch"><link href="/css/chunk-0cc2145f.55c011d2.css" rel="prefetch"><link href="/css/chunk-130a45b2.611711b5.css" rel="prefetch"><link href="/css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="/css/chunk-2268dc1a.55c011d2.css" rel="prefetch"><link href="/css/chunk-27250ed3.55c011d2.css" rel="prefetch"><link href="/css/chunk-2c05d556.cb4d0868.css" rel="prefetch"><link href="/css/chunk-3ddbf9db.55c011d2.css" rel="prefetch"><link href="/css/chunk-58038582.55c011d2.css" rel="prefetch"><link href="/css/chunk-6080f988.55c011d2.css" rel="prefetch"><link href="/css/chunk-72b2e77a.55c011d2.css" rel="prefetch"><link href="/css/chunk-72c6e8d8.5998f8b1.css" rel="prefetch"><link href="/css/chunk-8161d788.55c011d2.css" rel="prefetch"><link href="/css/chunk-98f267aa.55c011d2.css" rel="prefetch"><link href="/css/chunk-a9a9ce50.55c011d2.css" rel="prefetch"><link href="/css/chunk-d584b056.4c33e4ab.css" rel="prefetch"><link href="/css/chunk-e998d306.55c011d2.css" rel="prefetch"><link href="/css/chunk-f087d6f2.288ff701.css" rel="prefetch"><link href="/css/chunk-f90907bc.01cf6fd8.css" rel="prefetch"><link href="/js/chunk-03454508.ae897793.js" rel="prefetch"><link href="/js/chunk-03dea3f3.69a324ce.js" rel="prefetch"><link href="/js/chunk-0458398b.ff29fd68.js" rel="prefetch"><link href="/js/chunk-098d33d4.2eb3b3bc.js" rel="prefetch"><link href="/js/chunk-0c535319.93a35ed2.js" rel="prefetch"><link href="/js/chunk-0cc2145f.002bcc46.js" rel="prefetch"><link href="/js/chunk-130a45b2.312bbacd.js" rel="prefetch"><link href="/js/chunk-15fa718e.ca3c3011.js" rel="prefetch"><link href="/js/chunk-2268dc1a.fa567475.js" rel="prefetch"><link href="/js/chunk-27250ed3.3d736564.js" rel="prefetch"><link href="/js/chunk-2c05d556.94e28585.js" rel="prefetch"><link href="/js/chunk-2d212bf1.c4942ad5.js" rel="prefetch"><link href="/js/chunk-3ddbf9db.45dc4ab8.js" rel="prefetch"><link href="/js/chunk-58038582.a8afb898.js" rel="prefetch"><link href="/js/chunk-6080f988.1449be5f.js" rel="prefetch"><link href="/js/chunk-72b2e77a.09276532.js" rel="prefetch"><link href="/js/chunk-72c6e8d8.7a32d934.js" rel="prefetch"><link href="/js/chunk-8161d788.c6648e6e.js" rel="prefetch"><link href="/js/chunk-98f267aa.eb1f1545.js" rel="prefetch"><link href="/js/chunk-a9a9ce50.5ab8566b.js" rel="prefetch"><link href="/js/chunk-d584b056.65eba95a.js" rel="prefetch"><link href="/js/chunk-e998d306.82399090.js" rel="prefetch"><link href="/js/chunk-f087d6f2.1bc41a25.js" rel="prefetch"><link href="/js/chunk-f90907bc.e2ff7967.js" rel="prefetch"><link href="/css/chunk-vendors.9656408d.css" rel="preload" as="style"><link href="/js/app.3de55f02.js" rel="preload" as="script"><link href="/js/chunk-vendors.09d38c92.js" rel="preload" as="script"><link href="/css/chunk-vendors.9656408d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.09d38c92.js"></script><script src="/js/app.3de55f02.js"></script></body></html>
1 change: 0 additions & 1 deletion www/fhemapp/js/app.320d8872.js.map
View file

This file was deleted.

4 changes: 2 additions & 2 deletions www/fhemapp/js/app.320d8872.js → www/fhemapp/js/app.3de55f02.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions www/fhemapp/js/app.3de55f02.js.map
View file

Large diffs are not rendered by default.

0 comments on commit 35f1205

Please sign in to comment.