From f34b0eafb924ad21886018e50c632292bf364805 Mon Sep 17 00:00:00 2001 From: yiyunwan Date: Mon, 4 Jul 2022 14:30:53 +0800 Subject: [PATCH] fix: fix eslint warning --- packages/.eslintrc | 1 + .../src/__builtins__/shared/create-context.ts | 4 ++-- packages/components/src/__builtins__/shared/portal.ts | 2 +- packages/components/src/array-base/index.ts | 3 --- packages/components/src/array-table/index.ts | 6 +++--- packages/components/src/array-tabs/index.ts | 2 +- packages/components/src/cascader/index.ts | 2 +- packages/components/src/checkbox/index.ts | 4 ++-- packages/components/src/form-collapse/index.ts | 2 +- packages/components/src/form-item/index.ts | 9 ++------- .../src/form-layout/useResponsiveFormLayout.ts | 10 ++-------- packages/components/src/form-tab/index.ts | 1 + packages/components/src/form/index.ts | 2 +- packages/components/src/preview-text/index.ts | 1 - packages/components/src/upload/index.ts | 3 ++- 15 files changed, 20 insertions(+), 32 deletions(-) diff --git a/packages/.eslintrc b/packages/.eslintrc index 009293d..88324b1 100644 --- a/packages/.eslintrc +++ b/packages/.eslintrc @@ -38,6 +38,7 @@ "@typescript-eslint/explicit-module-boundary-types": 0, "@typescript-eslint/triple-slash-reference": 0, "@typescript-eslint/no-empty-function": 0, + "vue/require-prop-types": 0, "no-console": [ "error", { diff --git a/packages/components/src/__builtins__/shared/create-context.ts b/packages/components/src/__builtins__/shared/create-context.ts index 1d6c334..93b609c 100644 --- a/packages/components/src/__builtins__/shared/create-context.ts +++ b/packages/components/src/__builtins__/shared/create-context.ts @@ -1,4 +1,4 @@ -import type { Component, DefineComponent } from 'vue' +import type { DefineComponent } from 'vue' import { defineComponent, provide, @@ -32,7 +32,7 @@ export const createContext = (defaultValue?: T): CreateContext => { }, setup(props, { slots }) { const value = toRef(props, 'value' as never) - provide(injectKey, readonly(value)) + provide(injectKey, readonly(value as never)) return () => slots?.default?.() }, }), diff --git a/packages/components/src/__builtins__/shared/portal.ts b/packages/components/src/__builtins__/shared/portal.ts index ea21f15..c804d21 100644 --- a/packages/components/src/__builtins__/shared/portal.ts +++ b/packages/components/src/__builtins__/shared/portal.ts @@ -16,7 +16,7 @@ export const createPortalProvider = (id: string | symbol) => { }, }, - setup(props, { slots }) { + setup(props) { onBeforeUnmount(() => { const { id } = props if (id && PortalMap.has(id)) { diff --git a/packages/components/src/array-base/index.ts b/packages/components/src/array-base/index.ts index 7940d0f..52205a0 100644 --- a/packages/components/src/array-base/index.ts +++ b/packages/components/src/array-base/index.ts @@ -179,9 +179,6 @@ const ArrayBaseItem = defineComponent({ const ArrayBaseSortHandle = defineComponent({ name: 'ArrayBaseSortHandle', props: ['index'], - directives: { - // handle: HandleDirective, - }, setup(props, { attrs }) { const array = useArray() const prefixCls = `${stylePrefix}-array-base` diff --git a/packages/components/src/array-table/index.ts b/packages/components/src/array-table/index.ts index b90e72b..862372a 100644 --- a/packages/components/src/array-table/index.ts +++ b/packages/components/src/array-table/index.ts @@ -260,9 +260,9 @@ const StatusSelect = observer( return (props.options as { label: string; value: number }[])?.map( ({ label, value }) => { const hasError = errors.some(({ address }) => { - const currentIndex = parseIndex(address!) - const startIndex = (value - 1) * props.pageSize! - const endIndex = value * props.pageSize! + const currentIndex = parseIndex(address) + const startIndex = (value - 1) * props.pageSize + const endIndex = value * props.pageSize return ( currentIndex >= startIndex && currentIndex <= endIndex ) diff --git a/packages/components/src/array-tabs/index.ts b/packages/components/src/array-tabs/index.ts index d56b12c..e9ecdc4 100644 --- a/packages/components/src/array-tabs/index.ts +++ b/packages/components/src/array-tabs/index.ts @@ -124,7 +124,7 @@ export const ArrayTabs = observer( onEdit(null, 'add') !(attrs as any)?.['tab-add']?.() }, - onChange: (...args: any[]) => {}, + onChange: () => {}, }, { default: () => [renderItems()], diff --git a/packages/components/src/cascader/index.ts b/packages/components/src/cascader/index.ts index 1ca0a3e..4a407c0 100644 --- a/packages/components/src/cascader/index.ts +++ b/packages/components/src/cascader/index.ts @@ -1,5 +1,5 @@ import { defineComponent, h } from 'vue' -import { connect, mapProps, mapReadPretty, useField } from '@formily/vue' +import { useField } from '@formily/vue' import { observer } from '@formily/reactive-vue' import { isVoidField, Field } from '@formily/core' import { ElCascader } from 'element-plus' diff --git a/packages/components/src/checkbox/index.ts b/packages/components/src/checkbox/index.ts index 4e9cbff..435ae46 100644 --- a/packages/components/src/checkbox/index.ts +++ b/packages/components/src/checkbox/index.ts @@ -106,7 +106,7 @@ const CheckboxGroupOption: Component = defineComponent({ optionType: customProps.optionType, }, slots?.option - ? { default: () => slots.option!({ option }) } + ? { default: () => slots.option({ option }) } : {} ) } else { @@ -117,7 +117,7 @@ const CheckboxGroupOption: Component = defineComponent({ optionType: customProps.optionType, }, slots?.option - ? { default: () => slots.option!({ option }) } + ? { default: () => slots.option({ option }) } : {} ) } diff --git a/packages/components/src/form-collapse/index.ts b/packages/components/src/form-collapse/index.ts index 27a6f28..6379c8d 100644 --- a/packages/components/src/form-collapse/index.ts +++ b/packages/components/src/form-collapse/index.ts @@ -10,7 +10,6 @@ import { import { observer } from '@formily/reactive-vue' import { Schema, SchemaKey } from '@formily/json-schema' import { ElCollapse, ElCollapseItem, ElBadge } from 'element-plus' -import type { ElCollapseItem as ElCollapseItemProps } from 'element-plus' import { toArr } from '@formily/shared' import { GeneralField } from '@formily/core' @@ -105,6 +104,7 @@ const FormCollapse = observer( type: [String, Number], }, }, + emits: ['input'], setup(props, { attrs, emit }) { const field = useField() const schema = useFieldSchema() diff --git a/packages/components/src/form-item/index.ts b/packages/components/src/form-item/index.ts index 26690a7..90eeefc 100644 --- a/packages/components/src/form-item/index.ts +++ b/packages/components/src/form-item/index.ts @@ -1,7 +1,6 @@ import { ref, defineComponent, - onMounted, Ref, onBeforeUnmount, watch, @@ -11,10 +10,6 @@ import { import { isVoidField } from '@formily/core' import { connect, mapProps } from '@formily/vue' -// error: () => h('i', { class: 'el-icon-circle-close' }, {}), -// success: () => h('i', { class: 'el-icon-circle-check' }, {}), -// warning: () => h('i', { class: 'el-icon-warning-outline' }, {}), - import { InfoFilled, CircleClose, @@ -26,7 +21,7 @@ import { composeExport, resolveComponent, stylePrefix } from '../__builtins__' import { Component } from 'vue' import { ElTooltip, ElIcon } from 'element-plus' import ResizeObserver from 'resize-observer-polyfill' -import { IFormGridProps, useGridColumn } from '../form-grid' +import { useGridColumn } from '../form-grid' export type FormItemProps = { className?: string @@ -149,7 +144,7 @@ export const FormBaseItem = defineComponent({ bordered: { default: true }, inset: { default: false }, }, - setup(props, { slots, attrs }) { + setup(props, { slots }) { const active = ref(false) const deepLayoutRef = useFormLayout() const prefixCls = `${stylePrefix}-form-item` diff --git a/packages/components/src/form-layout/useResponsiveFormLayout.ts b/packages/components/src/form-layout/useResponsiveFormLayout.ts index 51147c9..fb0f1e6 100644 --- a/packages/components/src/form-layout/useResponsiveFormLayout.ts +++ b/packages/components/src/form-layout/useResponsiveFormLayout.ts @@ -1,6 +1,6 @@ import { isArr, isValid } from '@formily/shared' -import { onMounted, Ref, ref, getCurrentInstance } from 'vue' -import type, { ComponentInternalInstance } from 'vue' +import { onMounted, ref, getCurrentInstance } from 'vue' +import type { ComponentInternalInstance } from 'vue' interface IProps { breakpoints?: number[] @@ -24,12 +24,6 @@ interface ICalculateProps { (target: Element, props: IProps): IProps } -interface IUseResponsiveFormLayout { - (props: IProps): { - props: Ref - } -} - const calcBreakpointIndex: ICalcBreakpointIndex = (breakpoints, width) => { for (let i = 0; i < breakpoints.length; i++) { if (width <= breakpoints[i]) { diff --git a/packages/components/src/form-tab/index.ts b/packages/components/src/form-tab/index.ts index c30df4f..1abc86b 100644 --- a/packages/components/src/form-tab/index.ts +++ b/packages/components/src/form-tab/index.ts @@ -70,6 +70,7 @@ const FormTab = observer( type: String, }, }, + emits: ['input'], setup(props, { attrs, emit }: any) { const field = useField() const prefixCls = `${stylePrefix}-form-tab` diff --git a/packages/components/src/form/index.ts b/packages/components/src/form/index.ts index 6025aa6..f02454d 100644 --- a/packages/components/src/form/index.ts +++ b/packages/components/src/form/index.ts @@ -1,5 +1,5 @@ import { Component, VNode, defineComponent } from 'vue' -import type, { SetupContext } from 'vue' +import type { SetupContext } from 'vue' import { Form as FormType, IFormFeedback } from '@formily/core' import { FormProvider as _FormProvider, useForm, h } from '@formily/vue' diff --git a/packages/components/src/preview-text/index.ts b/packages/components/src/preview-text/index.ts index 000416d..6415073 100644 --- a/packages/components/src/preview-text/index.ts +++ b/packages/components/src/preview-text/index.ts @@ -10,7 +10,6 @@ import { observer } from '@formily/reactive-vue' import { useField } from '@formily/vue' import { isArr, isValid } from '@formily/shared' import { stylePrefix } from '../__builtins__/configs' -import { InputProps } from '../input' import type { SelectProps } from '../select' import type { CascaderProps } from '../cascader' import type { DatePickerProps } from '../date-picker' diff --git a/packages/components/src/upload/index.ts b/packages/components/src/upload/index.ts index bdba7d0..d4ce6b7 100644 --- a/packages/components/src/upload/index.ts +++ b/packages/components/src/upload/index.ts @@ -31,11 +31,12 @@ const UploadWrapper = defineComponent({ type: Array, }, }, + emits: ['change'], setup(curProps: any, { slots, attrs, emit }) { return () => { const fieldRef = useField() const setFeedBack = (error?: ErrorEvent) => { - const message = curProps.errorAdaptor!(error) + const message = curProps.errorAdaptor(error) fieldRef.value.setFeedback({ type: 'error',