Browse Source

fix: lint error

fix
Jin Mao 2 weeks ago
parent
commit
d614b0638e
  1. 22
      packages/@core/ui-kit/menu-ui/src/components/menu.vue
  2. 2
      packages/effects/plugins/src/vxe-table/use-vxe-grid.vue

22
packages/@core/ui-kit/menu-ui/src/components/menu.vue

@ -1,15 +1,8 @@
<script lang="ts" setup>
import type { UseResizeObserverReturn } from '@vueuse/core';
import { useResizeObserver } from '@vueuse/core';
import type { SetupContext, VNodeArrayChildren } from 'vue';
import type {
MenuItemClicked,
MenuItemRegistered,
MenuProps,
MenuProvider,
} from '../types';
import {
computed,
nextTick,
@ -21,11 +14,16 @@ import {
watchEffect,
} from 'vue';
import type {
MenuItemClicked,
MenuItemRegistered,
MenuProps,
MenuProvider,
} from '../types';
import { useNamespace } from '@vben-core/composables';
import { Ellipsis } from '@vben-core/icons';
import { useResizeObserver } from '@vueuse/core';
import {
createMenuContext,
createSubMenuContext,
@ -351,14 +349,14 @@ function getActivePaths() {
role="menu"
>
<template v-if="mode === 'horizontal' && getSlot.showSlotMore">
<template v-for="item in getSlot.slotDefault" :key="item.key">
<template v-for="(item, key) in getSlot.slotDefault" :key="key">
<component :is="item" />
</template>
<SubMenu is-sub-menu-more path="sub-menu-more">
<template #title>
<Ellipsis class="size-4" />
</template>
<template v-for="item in getSlot.slotMore" :key="item.key">
<template v-for="(item, key) in getSlot.slotMore" :key="key">
<component :is="item" />
</template>
</SubMenu>

2
packages/effects/plugins/src/vxe-table/use-vxe-grid.vue

@ -315,7 +315,7 @@ async function init() {
'[Vben Vxe Table]: The formConfig in the grid is not supported, please use the `formOptions` props',
);
}
props.api?.setState?.({ gridOptions: defaultGridOptions });
props.api?.setState?.({ gridOptions: defaultGridOptions as any });
// form vben-form query
extendProxyOptions(props.api, defaultGridOptions, () =>
formApi.getLatestSubmissionValues(),

Loading…
Cancel
Save