optimize ts type

This commit is contained in:
xiaoma
2021-09-24 09:08:23 +08:00
parent 7929a74d20
commit ef4912636e
13 changed files with 490 additions and 373 deletions

View File

@@ -1,5 +1,4 @@
import type { FormProps, FormActionType, UseFormReturnType } from '../types/form';
// @ts-ignore
import type { DynamicProps } from '/#/utils';
import { ref, onUnmounted, unref, nextTick, watch } from 'vue';

View File

@@ -88,7 +88,6 @@
VerticalRightOutlined,
VerticalLeftOutlined,
} from '@vicons/antd';
// @ts-ignore
import Draggable from 'vuedraggable/src/vuedraggable';
import { useDesignSetting } from '@/hooks/setting/useDesignSetting';

View File

@@ -48,8 +48,7 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
const columns = cloneDeep(pageColumns);
return columns
.filter((column) => {
// @ts-ignore
return hasPermission(column.auth) && isIfShow(column);
return hasPermission(column.auth as string[]) && isIfShow(column);
})
.map((column) => {
//默认 ellipsis 为true
@@ -93,10 +92,10 @@ export function useColumns(propsRef: ComputedRef<BasicTableProps>) {
function handleActionColumn(propsRef: ComputedRef<BasicTableProps>, columns: BasicColumn[]) {
const { actionColumn } = unref(propsRef);
if (!actionColumn) return;
// @ts-ignore
!columns.find((col) => col.key === 'action') && columns.push({
...actionColumn,
});
!columns.find((col) => col.key === 'action') &&
columns.push({
...(actionColumn as any),
});
}
//设置

View File

@@ -1,7 +1,5 @@
// @ts-ignore
import { NButton } from 'naive-ui';
import { PermissionsEnum } from '@/enums/permissionsEnum';
// @ts-ignore
export interface ActionItem extends NButton.props {
onClick?: Fn;
label?: string;