From e08c6da9b5146a0ef4bc271b02b70b8fa1ec62f9 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 20 Jan 2022 10:56:17 +0800 Subject: [PATCH] refactor: cascader --- components/auto-complete/Option.tsx | 4 +- components/cascader/demo/basic.vue | 8 +- components/cascader/demo/change-on-select.vue | 15 +- components/cascader/demo/custom-render.vue | 17 +- components/cascader/demo/custom-trigger.vue | 17 +- components/cascader/demo/disabled-option.vue | 13 +- components/cascader/demo/fields-name.vue | 10 +- components/cascader/demo/hover.vue | 14 +- components/cascader/demo/lazy.vue | 11 +- components/cascader/demo/search.vue | 9 +- components/cascader/demo/size.vue | 14 +- components/cascader/demo/suffix.vue | 8 +- components/cascader/index.tsx | 878 ++++++------------ components/cascader/index1.tsx | 647 +++++++++++++ components/cascader/style/index.less | 270 ++---- .../cascader/style/{index.ts => index.tsx} | 2 +- components/cascader/style/rtl.less | 19 + components/vc-cascader2/Cascader.tsx | 787 ++++++++-------- .../vc-cascader2/OptionList/Checkbox.tsx | 4 +- components/vc-cascader2/OptionList/Column.tsx | 85 +- components/vc-cascader2/OptionList/index.tsx | 393 ++++---- .../vc-cascader2/OptionList/useActive.ts | 28 +- .../vc-cascader2/OptionList/useKeyboard.ts | 91 +- components/vc-cascader2/context.ts | 6 +- .../vc-cascader2/hooks/useDisplayValues.ts | 45 +- components/vc-cascader2/hooks/useEntities.ts | 4 +- .../vc-cascader2/hooks/useSearchConfig.ts | 20 +- components/vc-cascader2/index.tsx | 12 + components/vc-cascader2/utils/treeUtil.ts | 8 +- components/vc-select/BaseSelect.tsx | 19 +- components/vc-select/SelectTrigger.tsx | 4 +- components/vc-select/Selector/Input.tsx | 10 +- 32 files changed, 1863 insertions(+), 1609 deletions(-) create mode 100644 components/cascader/index1.tsx rename components/cascader/style/{index.ts => index.tsx} (78%) create mode 100644 components/cascader/style/rtl.less create mode 100644 components/vc-cascader2/index.tsx diff --git a/components/auto-complete/Option.tsx b/components/auto-complete/Option.tsx index fba28e326..3fa4771db 100644 --- a/components/auto-complete/Option.tsx +++ b/components/auto-complete/Option.tsx @@ -1,7 +1,7 @@ import type { FunctionalComponent } from 'vue'; -import type { OptionCoreData } from '../vc-select/interface'; +import type { DefaultOptionType } from '../vc-select/Select'; -export interface OptionProps extends Omit { +export interface OptionProps extends Omit { /** Save for customize data */ [prop: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any } diff --git a/components/cascader/demo/basic.vue b/components/cascader/demo/basic.vue index 244ab8c02..1f1f77ff5 100644 --- a/components/cascader/demo/basic.vue +++ b/components/cascader/demo/basic.vue @@ -20,12 +20,8 @@ Cascade selection box for selecting province/city/district.