From cb1759b257b00485b40e87c6314bcbf276e5050d Mon Sep 17 00:00:00 2001 From: vben Date: Wed, 1 Dec 2021 22:40:29 +0800 Subject: [PATCH] perf(table): remove ExpandIcon --- build/vite/optimizer.ts | 21 ---------------- build/vite/plugin/hmr.ts | 25 ------------------- src/components/Table/src/BasicTable.vue | 3 --- .../Table/src/components/ExpandIcon.tsx | 23 ----------------- .../Table/src/hooks/useRowSelection.ts | 3 --- src/components/Table/src/props.ts | 1 + src/components/Tree/src/Tree.vue | 2 +- src/components/Tree/src/TreeHeader.vue | 3 +-- 8 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 build/vite/optimizer.ts delete mode 100644 build/vite/plugin/hmr.ts delete mode 100644 src/components/Table/src/components/ExpandIcon.tsx diff --git a/build/vite/optimizer.ts b/build/vite/optimizer.ts deleted file mode 100644 index 8bb0fec1..00000000 --- a/build/vite/optimizer.ts +++ /dev/null @@ -1,21 +0,0 @@ -// TODO -import type { GetManualChunk } from 'rollup'; - -// -const vendorLibs: { match: string[]; output: string }[] = [ - // { - // match: ['xlsx'], - // output: 'xlsx', - // }, -]; - -// @ts-ignore -export const configManualChunk: GetManualChunk = (id: string) => { - if (/[\\/]node_modules[\\/]/.test(id)) { - const matchItem = vendorLibs.find((item) => { - const reg = new RegExp(`[\\/]node_modules[\\/]_?(${item.match.join('|')})(.*)`, 'ig'); - return reg.test(id); - }); - return matchItem ? matchItem.output : null; - } -}; diff --git a/build/vite/plugin/hmr.ts b/build/vite/plugin/hmr.ts deleted file mode 100644 index 2dcc8420..00000000 --- a/build/vite/plugin/hmr.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { Plugin } from 'vite'; - -/** - * TODO - * Temporarily solve the Vite circular dependency problem, and wait for a better solution to fix it later. I don't know what problems this writing will bring. - * @returns - */ - -export function configHmrPlugin(): Plugin { - return { - name: 'singleHMR', - // handleHotUpdate({ modules, file }) { - // if (file.match(/xml$/)) return []; - - // modules.forEach((m) => { - // if (!m.url.match(/\.(css|less)/)) { - // m.importedModules = new Set(); - // m.importers = new Set(); - // } - // }); - - // return modules; - // }, - }; -} diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 7fb1071d..52db7544 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -43,7 +43,6 @@ import { Table } from 'ant-design-vue'; import { BasicForm, useForm } from '/@/components/Form/index'; import { PageWrapperFixedHeightKey } from '/@/components/Page'; - import expandIcon from './components/ExpandIcon'; import HeaderCell from './components/HeaderCell.vue'; import { InnerHandlers } from './types/table'; @@ -222,10 +221,8 @@ const getBindValues = computed(() => { const dataSource = unref(getDataSourceRef); let propsData: Recordable = { - // ...(dataSource.length === 0 ? { getPopupContainer: () => document.body } : {}), ...attrs, customRow, - expandIcon: slots.expandIcon ? null : expandIcon(), ...unref(getProps), ...unref(getHeaderProps), scroll: unref(getScrollRef), diff --git a/src/components/Table/src/components/ExpandIcon.tsx b/src/components/Table/src/components/ExpandIcon.tsx deleted file mode 100644 index 3d1d98d9..00000000 --- a/src/components/Table/src/components/ExpandIcon.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { BasicArrow } from '/@/components/Basic'; - -export default () => { - return (props: Recordable) => { - if (!props.expandable) { - if (props.needIndentSpaced) { - return ; - } else { - return ; - } - } - return ( - { - props.onExpand(props.record, e); - }} - expand={props.expanded} - /> - ); - }; -}; diff --git a/src/components/Table/src/hooks/useRowSelection.ts b/src/components/Table/src/hooks/useRowSelection.ts index ffae9b52..3439a223 100644 --- a/src/components/Table/src/hooks/useRowSelection.ts +++ b/src/components/Table/src/hooks/useRowSelection.ts @@ -21,11 +21,8 @@ export function useRowSelection( return { selectedRowKeys: unref(selectedRowKeysRef), - hideDefaultSelections: false, onChange: (selectedRowKeys: string[]) => { setSelectedRowKeys(selectedRowKeys); - // selectedRowKeysRef.value = selectedRowKeys; - // selectedRowRef.value = selectedRows; }, ...omit(rowSelection, ['onChange']), }; diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts index 302bb3be..f63da4ce 100644 --- a/src/components/Table/src/props.ts +++ b/src/components/Table/src/props.ts @@ -10,6 +10,7 @@ import type { SizeType, } from './types/table'; import type { FormProps } from '/@/components/Form'; + import { DEFAULT_FILTER_FN, DEFAULT_SORT_FN, FETCH_SETTING, DEFAULT_SIZE } from './const'; import { propTypes } from '/@/utils/propTypes'; diff --git a/src/components/Tree/src/Tree.vue b/src/components/Tree/src/Tree.vue index 0bc5955c..9c36373d 100644 --- a/src/components/Tree/src/Tree.vue +++ b/src/components/Tree/src/Tree.vue @@ -13,6 +13,7 @@ watch, onMounted, } from 'vue'; + import TreeHeader from './TreeHeader.vue'; import { Tree, Empty } from 'ant-design-vue'; import { TreeIcon } from './TreeIcon'; import { ScrollContainer } from '/@/components/Container'; @@ -23,7 +24,6 @@ import { useTree } from './useTree'; import { useContextMenu } from '/@/hooks/web/useContextMenu'; import { CreateContextOptions } from '/@/components/ContextMenu'; - import TreeHeader from './TreeHeader.vue'; import { treeEmits, treeProps } from './tree'; import { createBEM } from '/@/utils/bem'; diff --git a/src/components/Tree/src/TreeHeader.vue b/src/components/Tree/src/TreeHeader.vue index 48d6785c..d2124a9f 100644 --- a/src/components/Tree/src/TreeHeader.vue +++ b/src/components/Tree/src/TreeHeader.vue @@ -5,7 +5,7 @@ {{ title }}
@@ -46,7 +46,6 @@ const [bem] = createBEM('tree-header'); - // eslint-disable vue/valid-define-emits const props = defineProps({ helpMessage: { type: [String, Array] as PropType, -- GitLab