From 3afc43206223dfe0bb8c057f17b89704328063ca Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sun, 10 Nov 2019 08:59:21 +0000 Subject: [PATCH 1/2] Update typescript to version 3.7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fdab62592f..2e91b16415 100644 --- a/package.json +++ b/package.json @@ -238,7 +238,7 @@ "stylelint-config-standard": "^19.0.0", "stylelint-declaration-block-no-ignored-properties": "^2.1.0", "stylelint-order": "^3.0.0", - "typescript": "~3.6.2", + "typescript": "~3.7.2", "xhr-mock": "^2.4.1", "xhr2": "^0.2.0", "yaml-front-matter": "^4.0.0" From 91fcf9874102f1e991ccbf2be925c1ba13848d71 Mon Sep 17 00:00:00 2001 From: afc163 Date: Sun, 10 Nov 2019 18:05:43 +0800 Subject: [PATCH 2/2] :bug: fix error for typescript@3.7.2 --- components/table/util.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/table/util.tsx b/components/table/util.tsx index 41ec210034..526d149b71 100644 --- a/components/table/util.tsx +++ b/components/table/util.tsx @@ -58,7 +58,7 @@ export function normalizeColumns(elements: React.ReactChildren) { return; } const column: any = { - ...element.props, + ...(element.props as Object), }; if (element.key) { column.key = element.key;