fix(client): fix slot disabled

koishijs · May 29, 2023 · 8eb3309 · 8eb3309
1 parent eb3b7e5
commit 8eb3309
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/packages/client/app/layout/menu-item.vue b/packages/client/app/layout/menu-item.vue
@@ -15,7 +15,7 @@ const props = defineProps<LegacyMenuItem>()
 
 const ctx = useContext()
 
-const disabled = computed(() => props.disabled ? toValue(props.disabled) : true)
+const disabled = computed(() => props.disabled ? toValue(props.disabled) : false)
 
 function toValue<T>(getter: MaybeGetter<T>): T {
   if (typeof getter !== 'function') return getter

diff --git a/packages/client/app/settings/settings.vue b/packages/client/app/settings/settings.vue
@@ -18,7 +18,8 @@
     <keep-alive>
       <k-content :key="path">
         <template v-for="item of ctx.internal.settings[path]">
-          <component v-if="item.component" :is="item.component" />
+          <template v-if="item.disabled?.()"></template>
+          <component v-else-if="item.component" :is="item.component" />
           <k-form v-else-if="item.schema" :schema="item.schema" v-model="config" :initial="config" />
         </template>
       </k-content>

diff --git a/packages/client/client/config.ts b/packages/client/client/config.ts
@@ -1,5 +1,6 @@
 import { RemovableRef, useLocalStorage, usePreferredDark } from '@vueuse/core'
 import { computed, reactive, watchEffect } from 'vue'
+import { Config } from '.'
 
 export let useStorage = <T extends object>(key: string, version: number, fallback?: () => T): RemovableRef<T> => {
   const initial = fallback ? fallback() : {} as T
@@ -31,19 +32,6 @@ export function createStorage<T extends object>(key: string, version: number, fa
   return reactive<T>(storage.value['data'])
 }
 
-export interface Config {
-  theme: Config.Theme
-  locale?: string
-}
-
-export namespace Config {
-  export interface Theme {
-    mode: 'auto' | 'dark' | 'light'
-    dark: string
-    light: string
-  }
-}
-
 export const config = useStorage<Config>('config', 1.1, () => ({
   theme: {
     mode: 'auto',

diff --git a/packages/client/client/context.ts b/packages/client/client/context.ts
@@ -57,6 +57,7 @@ interface SettingOptions {
   id: string
   title?: string
   order?: number
+  disabled?: () => boolean
   schema?: Schema
   component?: Component
 }

diff --git a/packages/client/client/index.ts b/packages/client/client/index.ts
@@ -19,6 +19,19 @@ export default install
 
 export interface ActionContext {}
 
+export interface Config {
+  theme: Config.Theme
+  locale?: string
+}
+
+export namespace Config {
+  export interface Theme {
+    mode: 'auto' | 'dark' | 'light'
+    dark: string
+    light: string
+  }
+}
+
 export const root = new Context()
 
 export const router = createRouter({

diff --git a/packages/client/client/loader.ts b/packages/client/client/loader.ts
@@ -77,7 +77,10 @@ export const initTask = new Promise<void>((resolve) => {
 
     await Promise.all(newValue.map(load))
 
-    if (!oldValue) resolve()
+    if (!oldValue) {
+      resolve()
+      if (!root.events.isActive) root.start()
+    }
   }, { deep: true })
 })