diff --git a/src/components/Device/components/BatchActions/Application/index.vue b/src/components/Device/components/BatchActions/Application/index.vue index 5482a82..e785c4d 100644 --- a/src/components/Device/components/BatchActions/Application/index.vue +++ b/src/components/Device/components/BatchActions/Application/index.vue @@ -24,7 +24,7 @@ export default { for (let index = 0; index < this.devices.length; index++) { const item = this.devices[index] await this.$refs.applicationProxyRef.invoke(item) - await sleep(2 * 1000) + await sleep(1 * 1000) } }, }, diff --git a/src/components/Device/components/BatchActions/Screenshot/index.vue b/src/components/Device/components/BatchActions/Screenshot/index.vue index 5d91b48..4adeb46 100644 --- a/src/components/Device/components/BatchActions/Screenshot/index.vue +++ b/src/components/Device/components/BatchActions/Screenshot/index.vue @@ -24,7 +24,7 @@ export default { for (let index = 0; index < this.devices.length; index++) { const item = this.devices[index] await this.$refs.screenshotProxyRef.invoke(item) - await sleep(2 * 1000) + await sleep(1 * 1000) } }, }, diff --git a/src/components/Preference/components/PreferenceForm/index.vue b/src/components/Preference/components/PreferenceForm/index.vue index fb58e5f..601e7e6 100644 --- a/src/components/Preference/components/PreferenceForm/index.vue +++ b/src/components/Preference/components/PreferenceForm/index.vue @@ -119,14 +119,14 @@ const preferenceData = defineModel('modelValue', { const preferenceStore = usePreferenceStore() -const collapseValue = ref([]) - const preferenceModel = computed(() => omit(preferenceStore.model, props.excludes), ) const preferenceModelKeys = Object.keys(preferenceModel.value ?? {}) +const collapseValue = ref([]) + if (preferenceModelKeys.length) { if (props.collapseProps.accordion) { collapseValue.value = preferenceModelKeys[0] @@ -136,18 +136,6 @@ if (preferenceModelKeys.length) { } } -watch( - () => props.deviceScope, - (value) => { - if (!value) { - return false - } - - preferenceData.value = preferenceStore.getData(value) - }, - { immediate: true }, -) - function subModel(item) { const children = item?.children || {} diff --git a/src/components/Preference/components/ScopeSelect/index.vue b/src/components/Preference/components/ScopeSelect/index.vue new file mode 100644 index 0000000..5206d0a --- /dev/null +++ b/src/components/Preference/components/ScopeSelect/index.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/components/Preference/index.vue b/src/components/Preference/index.vue index d53baf6..9a2d061 100644 --- a/src/components/Preference/index.vue +++ b/src/components/Preference/index.vue @@ -4,43 +4,11 @@ class="mr-4 pb-4 flex items-center justify-between flex-none border-b border-gray-200 dark:border-gray-700" >
- - - - - + @device-change="onDeviceChange" + />
@@ -52,7 +20,7 @@ {{ $t('preferences.config.edit.name') }} - + {{ $t('preferences.config.reset.name') }}
@@ -73,47 +41,32 @@