feat(client): enhance action typings

cordiverse · May 25, 2024 · ac0598d · ac0598d
1 parent 7d34483
commit ac0598d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/client/app/layout/layout.vue b/packages/client/app/layout/layout.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="layout-container" :class="[container, styles]">
-    <aside class="layout-aside layout-left" :class="left" v-if="$slots.left">
+  <div class="k-layout layout-container" :class="[container, styles]">
+    <aside class="layout-aside layout-left flex flex-col" :class="left" v-if="$slots.left">
       <slot name="left"></slot>
     </aside>
 
@@ -9,7 +9,7 @@
       <layout-header
         v-model:isLeftAsideOpen="isLeftAsideOpen"
         v-model:isRightAsideOpen="isRightAsideOpen"
-        :menu-key="typeof menu === 'string' ? menu : null"
+        :menu-key="typeof menu === 'string' ? menu : undefined"
         :menu-data="menuData">
         <template #left>
           <slot name="header">{{ route.meta.activity?.name }}</slot>

diff --git a/packages/client/client/plugins/action.ts b/packages/client/client/plugins/action.ts
@@ -7,9 +7,9 @@ import { ActionContext } from '..'
 declare module '../context' {
   interface Context {
     $action: ActionService
-    action(id: string, options: ActionOptions): () => void
+    action(id: string, options: ActionOptions | ActionOptions['action']): () => void
     menu(id: string, items: MenuItem[]): () => void
-    define<K extends keyof ActionContext>(key: K, value: MaybeRefOrGetter<ActionContext[K]>): () => void
+    define<K extends keyof ActionContext>(key: K, value: MaybeRefOrGetter<ActionContext[K] | undefined>): () => void
   }
 
   interface Internal {
@@ -116,7 +116,8 @@ export default class ActionService extends Service {
     })
   }
 
-  action(id: string, options: ActionOptions) {
+  action(id: string, options: ActionOptions | ActionOptions['action']) {
+    if (typeof options === 'function') options = { action: options }
     markRaw(options)
     return this[Context.current].effect(() => {
       this.ctx.internal.actions[id] = options