@christianriedl/utils 1.0.64 → 1.0.66
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/appState.js +1 -1
- package/dist/appState.js.map +1 -1
- package/package.json +1 -1
- package/src/views/SettingsPage.vue +13 -3
package/dist/appState.js
CHANGED
|
@@ -53,7 +53,7 @@ export class AppState {
|
|
|
53
53
|
if (window.screen && window.screen.availWidth == 800)
|
|
54
54
|
this.device = EDevice.PiTouch7;
|
|
55
55
|
*/
|
|
56
|
-
if (sUsrAg.indexOf("
|
|
56
|
+
if (sUsrAg.indexOf("CrOS armv7l") >= 0) {
|
|
57
57
|
if (window.screen && window.screen.availWidth == 800)
|
|
58
58
|
this.device = EDevice.PiTouch7;
|
|
59
59
|
else
|
package/dist/appState.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appState.js","sourceRoot":"","sources":["../src/appState.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"appState.js","sourceRoot":"","sources":["../src/appState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
-
import { inject, computed, onBeforeUnmount } from 'vue';
|
|
2
|
+
import { inject, computed, ref, nextTick, onBeforeUnmount } from 'vue';
|
|
3
3
|
import { onBeforeRouteLeave } from 'vue-router'
|
|
4
4
|
import { IAppConfig, IConfigItem, IAppState } from '@christianriedl/utils'
|
|
5
5
|
import SettingsLine from '../components/SettingsLine.vue';
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
const emits = defineEmits<{ (e: 'configchange', item: IConfigItem): void }>();
|
|
8
8
|
const appState = inject<IAppState>('appstate')!;
|
|
9
9
|
const appConfig = inject<IAppConfig>('appconfig')!;
|
|
10
|
-
|
|
11
10
|
const heightStyle = computed(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
|
|
11
|
+
const scopes = ref(appState.scopes);
|
|
12
12
|
|
|
13
13
|
let changed = false;
|
|
14
14
|
const subscribePushNotifications = appConfig.subscribePush ? appConfig.items["subscribePushNotifications"] : null;
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
|
|
29
29
|
async function saveConfiguration(): Promise<boolean> {
|
|
30
30
|
if (changed) {
|
|
31
|
+
const useServerWait = appConfig.items['smartHomeUseServerWait'].value;
|
|
31
32
|
appConfig.save();
|
|
32
33
|
if (subscribePushNotifications && subscribePushNotifications.value != wasSubscribed) {
|
|
33
34
|
console.log(`Subscribe changed to ${subscribePushNotifications.value}`)
|
|
@@ -45,6 +46,15 @@
|
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
function onChange(item: IConfigItem) {
|
|
49
|
+
if (item.name === 'smartHomeUseServerWait') {
|
|
50
|
+
const acqCycleItem = appConfig.items['smartHomeAcqCycle'];
|
|
51
|
+
if (acqCycleItem)
|
|
52
|
+
acqCycleItem.value = item.value ? 30000 : 1000;
|
|
53
|
+
scopes.value = 0;
|
|
54
|
+
nextTick(() => {
|
|
55
|
+
scopes.value = appState.scopes
|
|
56
|
+
});
|
|
57
|
+
}
|
|
48
58
|
emits('configchange', item);
|
|
49
59
|
changed = true;
|
|
50
60
|
}
|
|
@@ -61,7 +71,7 @@
|
|
|
61
71
|
</tr>
|
|
62
72
|
</thead>
|
|
63
73
|
<tbody>
|
|
64
|
-
<settings-line v-for="config in appConfig.items" :key="config.name" :item="config" :scopes="
|
|
74
|
+
<settings-line v-for="config in appConfig.items" :key="config.name" :item="config" :scopes="scopes" @change="onChange(config)"></settings-line>
|
|
65
75
|
</tbody>
|
|
66
76
|
</v-table>
|
|
67
77
|
</v-container>
|