diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg index 71fe5b35a..672056774 100755 --- a/.husky/prepare-commit-msg +++ b/.husky/prepare-commit-msg @@ -1,4 +1,6 @@ #!/bin/sh +[[ "$(uname -a)" = *"MINGW64"* ]] && exit 0 +[ -n "$CI" ] && exit 0 . "$(dirname "$0")/_/husky.sh" exec < /dev/tty && npx git-cz --hook || true \ No newline at end of file diff --git a/src/_util/callBoth.ts b/src/_util/callBoth.ts index b47df5661..57e0bac7a 100644 --- a/src/_util/callBoth.ts +++ b/src/_util/callBoth.ts @@ -9,7 +9,6 @@ export default function callBoth any>(...fns: T[]) lastResult = fn(...args); } } - return lastResult; }) as T; } diff --git a/src/table/BaseTable.tsx b/src/table/BaseTable.tsx index b6b4f0c79..35373f80a 100644 --- a/src/table/BaseTable.tsx +++ b/src/table/BaseTable.tsx @@ -157,7 +157,7 @@ const BaseTable = forwardRef((props: TBaseTableProps, ref) => { const getTFootHeight = () => { if (!tableElmRef.current) return; const timer = setTimeout(() => { - const height = tableElmRef.current.querySelector('tfoot')?.getBoundingClientRect().height; + const height = tableElmRef.current?.querySelector('tfoot')?.getBoundingClientRect().height; setTableFootHeight(height); clearTimeout(timer); });