From 5202b0e016cd8af889234fcd2b972b7bd26caa63 Mon Sep 17 00:00:00 2001 From: Uyarn Date: Tue, 24 May 2022 14:36:49 +0800 Subject: [PATCH 1/3] chore: remove console --- src/table/PrimaryTable.tsx | 1 - src/table/hooks/useFilter.tsx | 1 - 2 files changed, 2 deletions(-) diff --git a/src/table/PrimaryTable.tsx b/src/table/PrimaryTable.tsx index 913354033..cd9d8935a 100644 --- a/src/table/PrimaryTable.tsx +++ b/src/table/PrimaryTable.tsx @@ -82,7 +82,6 @@ export default function PrimaryTable(props: TPrimaryTableProps) { const sortIcon = item.sorter ? renderSortIcon(p) : null; const filterIcon = item.filter ? renderFilterIcon(p) : null; const attach = primaryTableRef.current?.tableContentRef; - console.log(primaryTableRef.current?.tableContentRef); return renderTitleWidthIcon([titleContent, sortIcon, filterIcon], p.col, p.colIndex, ellipsisTitle, attach); }; item.ellipsisTitle = false; diff --git a/src/table/hooks/useFilter.tsx b/src/table/hooks/useFilter.tsx index 95afadc05..5f934adb4 100644 --- a/src/table/hooks/useFilter.tsx +++ b/src/table/hooks/useFilter.tsx @@ -90,7 +90,6 @@ export default function useFilter(props: TdPrimaryTableProps, primaryTableRef: M } function onInnerFilterChange(val: any, column: PrimaryTableCol) { - console.log(val); const filterValue = { ...innerFilterValue, [column.colKey]: val, From dd368f321bb85c14ac1bb65a3f9ad4c5f27b2975 Mon Sep 17 00:00:00 2001 From: Uyarn Date: Wed, 25 May 2022 11:14:18 +0800 Subject: [PATCH 2/3] fix: table filterfocus --- src/table/FilterController.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/table/FilterController.tsx b/src/table/FilterController.tsx index 81b16f4d0..0e2c7eae7 100644 --- a/src/table/FilterController.tsx +++ b/src/table/FilterController.tsx @@ -39,7 +39,7 @@ export interface TableFilterControllerProps { } export default function TableFilterController(props: TableFilterControllerProps) { - const { tFilterValue, innerFilterValue, tableFilterClasses, isFocusClass, column, primaryTableElement } = props; + const { tFilterValue, innerFilterValue, tableFilterClasses, isFocusClass, column } = props; const triggerElementRef = useRef(null); const [locale, t] = useLocaleReceiver('table'); @@ -111,7 +111,7 @@ export default function TableFilterController(props: TableFilterControllerProps) const defaultFilterIcon = t(locale.filterIcon) || ; return ( primaryTableElement : undefined} + // attach={primaryTableElement ? () => primaryTableElement : undefined} visible={filterPopupVisible} destroyOnClose trigger="click" From d6f5b36ef99c4ae6c68322ee7ba38b8e4726ee1b Mon Sep 17 00:00:00 2001 From: Uyarn Date: Wed, 25 May 2022 11:36:09 +0800 Subject: [PATCH 3/3] chore: fix ts version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71d66cd41..189b00aee 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "ts-jest": "^27.1.2", "ts-morph": "^13.0.02", "ts-node": "^10.4.0", - "typescript": "^4.5.4", + "typescript": "~4.5.4", "vite": "^2.9.9", "vite-plugin-istanbul": "^2.3.0", "vite-plugin-pwa": "^0.11.11",