fix: ts type (#2475)

src/checkbox/checkbox.tsx

@@ -13,11 +13,11 @@ const classPrefixMixins = getClassPrefixMixins('checkbox');
 
 export type CheckboxGroupInstance = InstanceType<typeof Group>;
 
-interface CheckboxInstance extends Vue {
+export interface CheckboxParentInjectInstance extends Vue {
   checkboxGroup: CheckboxGroupInstance;
 }
 
-export default mixins(classPrefixMixins, Vue as VueConstructor<CheckboxInstance>).extend({
+export default mixins(classPrefixMixins, Vue as VueConstructor<CheckboxParentInjectInstance>).extend({
   name: 'TCheckbox',
 
   inheritAttrs: false,

src/input/input.tsx

@@ -28,12 +28,15 @@ function getValidAttrs(obj: object): object {
   return newObj;
 }
 
-interface InputInstance extends Vue {
+export interface InputParentInjectInstance extends Vue {
   composing: boolean;
   tFormItem: InstanceType<typeof FormItem>;
 }
 
-export default mixins(getConfigReceiverMixins<InputInstance, InputConfig>('input'), getGlobalIconMixins()).extend({
+export default mixins(
+  getConfigReceiverMixins<InputParentInjectInstance, InputConfig>('input'),
+  getGlobalIconMixins(),
+).extend({
   name: 'TInput',
   inheritAttrs: false,
 

src/radio/radio.tsx

@@ -1,21 +1,21 @@
 import Vue, { VueConstructor, VNode } from 'vue';
 import { omit } from '../utils/helper';
 import { renderContent } from '../utils/render-tnode';
-import props from './props';
 import { RadioGroupInstance, RadioButtonInstance } from './instance';
+import props from './props';
 import { emitEvent } from '../utils/event';
 import { TdRadioProps } from './type';
 import { getClassPrefixMixins } from '../config-provider/config-receiver';
 import mixins from '../utils/mixins';
 
 const classPrefixMixins = getClassPrefixMixins('radio');
 
-interface RadioInstance extends Vue {
+export interface RadioParentInjectInstance extends Vue {
   radioGroup: RadioGroupInstance;
   radioButton: RadioButtonInstance;
 }
 
-export default mixins(Vue as VueConstructor<RadioInstance>, classPrefixMixins).extend({
+export default mixins(Vue as VueConstructor<RadioParentInjectInstance>, classPrefixMixins).extend({
   name: 'TRadio',
 
   inheritAttrs: false,

src/tabs/tabs.tsx

@@ -10,11 +10,11 @@ import mixins from '../utils/mixins';
 
 const classPrefixMixins = getClassPrefixMixins('tabs');
 
-interface TabVue extends Vue {
+export interface TabParentInjectVue extends Vue {
   listPanels?: Array<VNode>;
 }
 
-export default mixins(Vue as VueConstructor<TabVue>, classPrefixMixins).extend({
+export default mixins(Vue as VueConstructor<TabParentInjectVue>, classPrefixMixins).extend({
   name: 'TTabs',
   model: {
     prop: 'value',
@@ -30,7 +30,7 @@ export default mixins(Vue as VueConstructor<TabVue>, classPrefixMixins).extend({
 
   props: { ...props },
 
-  provide(): { parent: TabVue } {
+  provide(): { parent: TabParentInjectVue } {
     return {
       parent: this,
     };

src/utils/map-props.ts

@@ -1,12 +1,13 @@
-import Vue, { ComponentOptions, CreateElement, VueConstructor } from 'vue';
+import Vue, { CreateElement, PluginObject } from 'vue';
+import { ExtendedVue } from 'vue/types/vue';
 
 const defaultModel = {
   prop: 'value',
   event: 'input',
 };
 
 function toCamel(str: string): string {
-  return str.replace(/-([a-z])/ig, (m, letter) => letter.toUpperCase());
+  return str.replace(/-([a-z])/gi, (m, letter) => letter.toUpperCase());
 }
 
 type PropOption = {
@@ -33,10 +34,7 @@ function getPropOptionMap(props: (string | PropOption)[], options: Option = {}):
   const { model } = options;
 
   function parseProp(propOption: PropOption): ParsedPropOption {
-    const {
-      name: propName,
-      ...others
-    } = propOption;
+    const { name: propName, ...others } = propOption;
     const camelName = propName.replace(/^[a-z]/, (letter: string) => letter.toUpperCase());
     const defaultName = `default${camelName}`;
     const dataName = `data${camelName}`;
@@ -76,8 +74,8 @@ function getPropOptionMap(props: (string | PropOption)[], options: Option = {}):
 }
 
 export default function (props: (string | PropOption)[], options: Option = {}) {
-  function mapProps(componentConstructor: VueConstructor | any) {
-    const component: ComponentOptions<Vue> = componentConstructor.prototype
+  function mapProps<T extends ExtendedVue<Vue, any, any, any, any>>(componentConstructor: T) {
+    const component = componentConstructor.prototype
       ? componentConstructor.prototype.constructor.options
       : componentConstructor;
     const model = options.model || defaultModel;
@@ -193,10 +191,7 @@ export default function (props: (string | PropOption)[], options: Option = {}) {
 
         Object.keys(propOptionMap).forEach((propName: string): void => {
           const { dataName, events } = propOptionMap[propName];
-          if (
-            propName in this.$vnode.componentOptions.propsData
-            || typeof this[dataName] !== 'undefined'
-          ) {
+          if (propName in this.$vnode.componentOptions.propsData || typeof this[dataName] !== 'undefined') {
             propMap[propName] = this[dataName];
           }
           // 只监听第一个定义的事件，参数取第一个事件参数
@@ -222,7 +217,8 @@ export default function (props: (string | PropOption)[], options: Option = {}) {
           },
 
           on: {
-            ...this._listeners as Record<string, any>,
+            // @ts-ignore
+            ...(this._listeners as Record<string, any>),
             ...handlerMap,
           },
 
@@ -245,7 +241,7 @@ export default function (props: (string | PropOption)[], options: Option = {}) {
         },
         ...defineMethods,
       },
-    });
+    }) as T & PluginObject<T>;
   }
 
   return mapProps;