fix: fullProps and fullEmits error

SoulLyoko · Jun 16, 2022 · 69c1ab6 · 69c1ab6
1 parent db4866a
commit 69c1ab6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 29 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -30,7 +30,6 @@ module.exports = {
     "@typescript-eslint/ban-types": 0,
     "@typescript-eslint/no-var-requires": 0,
     "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-unused-vars": 0,
     "vue/require-render-return": 0,
     "vue/require-explicit-emits": 0,
     "vue/require-default-prop": 0,

diff --git a/packages/components/checkbox/src/index.ts b/packages/components/checkbox/src/index.ts
@@ -2,7 +2,7 @@ import type { SetupContext, ExtractPropTypes } from "vue-demi";
 
 import { defineComponent } from "vue-demi";
 
-import { basicProps, basicEmits, useListeners } from "~/constants";
+import { basicProps, buttonProps, basicEmits, useListeners } from "~/constants";
 import { h, dynamicComponent } from "~/utils";
 import { useDict } from "~/composables";
 
@@ -11,7 +11,7 @@ export type CheckboxEmits = typeof checkboxEmits;
 export type CheckboxEmitFn = SetupContext<CheckboxEmits>["emit"];
 export type CheckboxInstance = InstanceType<typeof VDictCheckbox>;
 
-export const checkboxProps = { ...basicProps, button: { type: Boolean } };
+export const checkboxProps = { ...basicProps, ...buttonProps };
 export const checkboxEmits = basicEmits;
 
 export const VDictCheckbox = defineComponent({

diff --git a/packages/components/radio/src/index.ts b/packages/components/radio/src/index.ts
@@ -2,7 +2,7 @@ import type { SetupContext, ExtractPropTypes } from "vue-demi";
 
 import { defineComponent } from "vue-demi";
 
-import { basicProps, basicEmits, useListeners } from "~/constants";
+import { basicProps, buttonProps, basicEmits, useListeners } from "~/constants";
 import { h, dynamicComponent } from "~/utils";
 import { useDict } from "~/composables";
 
@@ -11,7 +11,7 @@ export type RadioEmits = typeof radioEmits;
 export type RadioEmitFn = SetupContext<RadioEmits>["emit"];
 export type RadioInstance = InstanceType<typeof VDictRadio>;
 
-export const radioProps = { ...basicProps, button: { type: Boolean } };
+export const radioProps = { ...basicProps, ...buttonProps };
 export const radioEmits = basicEmits;
 
 export const VDictRadio = defineComponent({

diff --git a/packages/components/select/src/index.ts b/packages/components/select/src/index.ts
@@ -2,7 +2,7 @@ import type { SetupContext, ExtractPropTypes } from "vue-demi";
 
 import { defineComponent } from "vue-demi";
 
-import { basicProps, basicEmits, useListeners } from "~/constants";
+import { basicProps, basicEmits, selectRestEmits, useListeners } from "~/constants";
 import { h, dynamicComponent } from "~/utils";
 import { useDict } from "~/composables";
 
@@ -12,14 +12,7 @@ export type SelectEmitFn = SetupContext<SelectEmits>["emit"];
 export type SelectInstance = InstanceType<typeof VDictSelect>;
 
 export const selectProps = basicProps;
-export const selectEmits = {
-  ...basicEmits,
-  "visible-change": (v: boolean) => true,
-  "remove-tag": (...args: any[]) => true,
-  clear: () => true,
-  blur: (event: Event) => true,
-  focus: (event: Event) => true
-};
+export const selectEmits = { ...basicEmits, ...selectRestEmits };
 
 export const VDictSelect = defineComponent({
   name: "VDictSelect",

diff --git a/packages/constants/emits.ts b/packages/constants/emits.ts
@@ -1,4 +1,4 @@
-import { checkboxEmits, radioEmits, selectEmits } from "../components";
+/* eslint-disable @typescript-eslint/no-unused-vars */
 
 export const vModelEmits = {
   input: (...args: any[]) => true, // Vue2
@@ -14,13 +14,20 @@ export const basicEmits = {
   ...changeEmits
 };
 
-export const fullEmits = {
-  ...checkboxEmits,
-  ...radioEmits,
-  ...selectEmits
+export const selectRestEmits = {
+  "visible-change": (v: boolean) => true,
+  "remove-tag": (...args: any[]) => true,
+  clear: () => true,
+  blur: (event: Event) => true,
+  focus: (event: Event) => true
+};
+
+export const cascaderRestEmits = {
+  "expand-change": (...args: any[]) => true
 };
 
-// export const cascaderEmits = {
-//   ...selectEmits,
-//   "expand-change": (...args: any[]) => true
-// };
+export const fullEmits = {
+  ...basicEmits,
+  ...selectRestEmits,
+  ...cascaderRestEmits
+};
diff --git a/packages/constants/props.ts b/packages/constants/props.ts
@@ -1,8 +1,6 @@
 import type { PropType } from "vue-demi";
 import type { DictValue, DictData, Config } from "../types";
 
-import { checkboxProps, radioProps, selectProps } from "../components";
-
 export const basicProps = {
   value: { type: [String, Number, Array] as PropType<DictValue>, default: "" }, // Vue2
   modelValue: { type: [String, Number, Array] as PropType<DictValue>, default: "" }, // Vue3
@@ -11,9 +9,16 @@ export const basicProps = {
   cache: { type: String, default: "" }
 };
 
+export const typeProps = {
+  type: { type: String as PropType<"select" | "radio" | "checkbox" | "text">, default: "select" }
+};
+
+export const buttonProps = {
+  button: { type: Boolean }
+};
+
 export const fullProps = {
-  type: { type: String as PropType<"select" | "radio" | "checkbox" | "text">, default: "select" },
-  ...checkboxProps,
-  ...radioProps,
-  ...selectProps
+  ...basicProps,
+  ...typeProps,
+  ...buttonProps
 };