From f3063e00c0e6e59ee1041781a92963488ba7354a Mon Sep 17 00:00:00 2001 From: ajuner <53512912+ajuner@users.noreply.github.com> Date: Sat, 14 Nov 2020 13:56:39 +0800 Subject: [PATCH] fix: update components type (#3165) --- components/auto-complete/index.tsx | 10 +++++----- components/badge/ScrollNumber.tsx | 7 +------ components/cascader/index.tsx | 4 ++-- components/collapse/Collapse.tsx | 4 ++-- components/collapse/CollapsePanel.tsx | 4 ++-- components/drawer/index.tsx | 4 ++-- components/form/Form.tsx | 4 ++-- components/input/ResizableTextArea.tsx | 2 +- components/input/calculateNodeHeight.tsx | 2 +- 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/components/auto-complete/index.tsx b/components/auto-complete/index.tsx index 027cdcf27..55b9b419e 100644 --- a/components/auto-complete/index.tsx +++ b/components/auto-complete/index.tsx @@ -10,8 +10,8 @@ import warning from '../_util/warning'; const { Option, OptGroup } = Select; -function isSelectOptionOrSelectOptGroup(child: any): Boolean { - return child && child.type && (child.type.isSelectOption || child.type.isSelectOptGroup); +function isSelectOptionOrSelectOptGroup(child: any): boolean { + return child?.type?.isSelectOption || child?.type?.isSelectOptGroup; } const AutoCompleteProps = { @@ -83,12 +83,12 @@ const AutoComplete = defineComponent({ render() { const { size, prefixCls: customizePrefixCls, dataSource } = this; - let optionChildren: any; + let optionChildren: VNode[]; const { getPrefixCls } = this.configProvider; const prefixCls = getPrefixCls('select', customizePrefixCls); - const { class: className } = this.$attrs as any; + const { class: className } = this.$attrs; const cls = { - [className]: !!className, + [className as string]: !!className, [`${prefixCls}-lg`]: size === 'large', [`${prefixCls}-sm`]: size === 'small', [`${prefixCls}-show-search`]: true, diff --git a/components/badge/ScrollNumber.tsx b/components/badge/ScrollNumber.tsx index e1a3ffd80..6d2b7629f 100644 --- a/components/badge/ScrollNumber.tsx +++ b/components/badge/ScrollNumber.tsx @@ -161,12 +161,7 @@ export default defineComponent({ }, render() { - const { - prefixCls: customizePrefixCls, - title, - component: Tag = 'sup' as any, - displayComponent, - } = this; + const { prefixCls: customizePrefixCls, title, component: Tag = 'sup', displayComponent } = this; const getPrefixCls = this.configProvider.getPrefixCls; const prefixCls = getPrefixCls('scroll-number', customizePrefixCls); const { class: className, style = {} } = this.$attrs as { diff --git a/components/cascader/index.tsx b/components/cascader/index.tsx index ae48295af..e5adbaceb 100644 --- a/components/cascader/index.tsx +++ b/components/cascader/index.tsx @@ -161,7 +161,7 @@ function defaultSortFilteredOption( inputValue: string, names: FilledFieldNamesType, ) { - function callback(elem) { + function callback(elem: CascaderOptionType) { return elem[names.label].indexOf(inputValue) > -1; } @@ -327,7 +327,7 @@ const Cascader = defineComponent({ }, handleInputChange(e: Event) { - const inputValue = (e.target as any).value; + const inputValue = (e.target as HTMLInputElement).value; this.setState({ inputValue }); this.$emit('search', inputValue); }, diff --git a/components/collapse/Collapse.tsx b/components/collapse/Collapse.tsx index 26c46ad5e..91239faa2 100644 --- a/components/collapse/Collapse.tsx +++ b/components/collapse/Collapse.tsx @@ -60,9 +60,9 @@ export default defineComponent({ const { prefixCls: customizePrefixCls, bordered, expandIconPosition } = this; const getPrefixCls = this.configProvider.getPrefixCls; const prefixCls = getPrefixCls('collapse', customizePrefixCls); - const { class: className, ...restAttrs } = this.$attrs as any; + const { class: className, ...restAttrs } = this.$attrs; const collapseClassName = { - [className]: className, + [className as string]: className, [`${prefixCls}-borderless`]: !bordered, [`${prefixCls}-icon-position-${expandIconPosition}`]: true, }; diff --git a/components/collapse/CollapsePanel.tsx b/components/collapse/CollapsePanel.tsx index 2624d4ec5..ef34ee8a6 100644 --- a/components/collapse/CollapsePanel.tsx +++ b/components/collapse/CollapsePanel.tsx @@ -31,9 +31,9 @@ export default defineComponent({ const { prefixCls: customizePrefixCls, showArrow = true } = this; const getPrefixCls = this.configProvider.getPrefixCls; const prefixCls = getPrefixCls('collapse', customizePrefixCls); - const { class: className, ...restAttrs } = this.$attrs as any; + const { class: className, ...restAttrs } = this.$attrs; const collapsePanelClassName = { - [className]: className, + [className as string]: className, [`${prefixCls}-no-arrow`]: !showArrow, }; diff --git a/components/drawer/index.tsx b/components/drawer/index.tsx index 8d0582ea1..06d30a93f 100644 --- a/components/drawer/index.tsx +++ b/components/drawer/index.tsx @@ -225,7 +225,7 @@ const Drawer = defineComponent({ const handler = getComponent(this, 'handle') || false; const getPrefixCls = this.configProvider.getPrefixCls; const prefixCls = getPrefixCls('drawer', customizePrefixCls); - const { class: className } = this.$attrs as any; + const { class: className } = this.$attrs; const vcDrawerProps: any = { ...this.$attrs, ...omit(rest, [ @@ -253,7 +253,7 @@ const Drawer = defineComponent({ showMask: mask, placement, class: classnames({ - [className]: !!className, + [className as string]: !!className, [wrapClassName]: !!wrapClassName, [haveMask]: !!haveMask, }), diff --git a/components/form/Form.tsx b/components/form/Form.tsx index 50731d4ab..142f45044 100755 --- a/components/form/Form.tsx +++ b/components/form/Form.tsx @@ -52,7 +52,7 @@ export const FormProps = { prefixCls: PropTypes.string, hideRequiredMark: PropTypes.looseBool, model: PropTypes.object, - rules: { type: Object as PropType<{[k: string]: ValidationRule[] | ValidationRule}> }, + rules: { type: Object as PropType<{ [k: string]: ValidationRule[] | ValidationRule }> }, validateMessages: PropTypes.object, validateOnRuleChange: PropTypes.looseBool, // 提交失败自动滚动到第一个错误字段 @@ -63,7 +63,7 @@ export const FormProps = { validateTrigger: { type: [String, Array] as PropType }, }; -function isEqualName(name1: any, name2: any) { +function isEqualName(name1: NamePath, name2: NamePath) { return isEqual(toArray(name1), toArray(name2)); } diff --git a/components/input/ResizableTextArea.tsx b/components/input/ResizableTextArea.tsx index 734a0a163..6c8ceca56 100644 --- a/components/input/ResizableTextArea.tsx +++ b/components/input/ResizableTextArea.tsx @@ -64,7 +64,7 @@ const ResizableTextArea = defineComponent({ saveTextArea(textArea: HTMLTextAreaElement) { this.textArea = textArea; }, - handleResize(size: any) { + handleResize(size: { width: number; height: number }) { const { resizeStatus } = this.$data; if (resizeStatus !== RESIZE_STATUS_NONE) { diff --git a/components/input/calculateNodeHeight.tsx b/components/input/calculateNodeHeight.tsx index 2042abcf4..7f220c4e4 100644 --- a/components/input/calculateNodeHeight.tsx +++ b/components/input/calculateNodeHeight.tsx @@ -120,7 +120,7 @@ export default function calculateNodeHeight( let minHeight = Number.MIN_SAFE_INTEGER; let maxHeight = Number.MAX_SAFE_INTEGER; let height = hiddenTextarea.scrollHeight; - let overflowY: any; + let overflowY: string; if (boxSizing === 'border-box') { // border-box: add border, since height = content + padding + border