From d6631c2797ba580ac87cd701897014e1e9b385fd Mon Sep 17 00:00:00 2001 From: chaishi Date: Sun, 5 Jun 2022 15:42:35 +0800 Subject: [PATCH 1/4] feat(table): some features --- examples/table/demos/drag-col-sort.vue | 7 +-- examples/table/demos/drag-sort-handler.vue | 7 +-- examples/table/demos/drag-sort.vue | 7 +-- examples/table/demos/filter-controlled.vue | 12 ++++- examples/table/demos/tree.vue | 2 +- examples/table/table.md | 17 ++++--- src/table/base-table-props.ts | 13 ++++-- src/table/filter-controller.tsx | 54 ++++++++++++---------- src/table/hooks/tree-store.ts | 8 +++- src/table/hooks/useDragSort.ts | 10 +++- src/table/primary-table-props.ts | 2 +- src/table/type.ts | 38 +++++++++++---- 12 files changed, 117 insertions(+), 60 deletions(-) diff --git a/examples/table/demos/drag-col-sort.vue b/examples/table/demos/drag-col-sort.vue index c9f63b83d2..f25b441038 100644 --- a/examples/table/demos/drag-col-sort.vue +++ b/examples/table/demos/drag-col-sort.vue @@ -44,10 +44,11 @@ const data = ref(initialData); const columns = ref(initialColumns); -const onDragSort = ({ currentIndex, targetIndex, current, target, currentData, e, sort }) => { - console.log('交换行', currentIndex, targetIndex, current, target, currentData, e, sort); +// currentData is going to be deprecated +const onDragSort = ({ currentIndex, targetIndex, current, target, data, newData, e, sort }) => { + console.log('交换行', currentIndex, targetIndex, current, target, data, newData, e, sort); if (sort === 'col') { - columns.value = currentData; + columns.value = newData; } }; diff --git a/examples/table/demos/drag-sort-handler.vue b/examples/table/demos/drag-sort-handler.vue index d86e7e3d1c..940285b1f4 100644 --- a/examples/table/demos/drag-sort-handler.vue +++ b/examples/table/demos/drag-sort-handler.vue @@ -80,8 +80,9 @@ const resetData = () => { data.value = []; }; -const onDragSort = ({ currentIndex, targetIndex, current, target, currentData, e }) => { - console.log('交换行', currentIndex, targetIndex, current, target, currentData, e); - data.value = currentData; +// currentData is going to be deprecated +const onDragSort = ({ currentIndex, targetIndex, current, target, data, newData, e }) => { + console.log('交换行', currentIndex, targetIndex, current, target, data, newData, e); + data.value = newData; }; diff --git a/examples/table/demos/drag-sort.vue b/examples/table/demos/drag-sort.vue index 3a94bf5165..a1033a572a 100644 --- a/examples/table/demos/drag-sort.vue +++ b/examples/table/demos/drag-sort.vue @@ -42,8 +42,9 @@ const initialData = new Array(4).fill(5).map((_, i) => ({ const data = ref(initialData); -const onDragSort = ({ currentIndex, targetIndex, current, target, currentData, e }) => { - console.log('交换行', currentIndex, targetIndex, current, target, currentData, e); - data.value = currentData; +// currentData is going to be deprecated +const onDragSort = ({ currentIndex, targetIndex, current, target, data, newData, e }) => { + console.log('交换行', currentIndex, targetIndex, current, target, data, newData, e); + data.value = newData; }; diff --git a/examples/table/demos/filter-controlled.vue b/examples/table/demos/filter-controlled.vue index 493cf96af0..0bd807ad3f 100644 --- a/examples/table/demos/filter-controlled.vue +++ b/examples/table/demos/filter-controlled.vue @@ -41,6 +41,7 @@