diff --git a/lerna.json b/lerna.json index 621b01195..7129a0588 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": ["packages/*"], "npmClient": "yarn", "useWorkspaces": true, - "version": "0.11.9", + "version": "0.12.0-alpha.10", "command": { "version": { "message": "chore(release): publish %s" diff --git a/packages/apsara-icons/package.json b/packages/apsara-icons/package.json index 5e715f4bb..bcab60bfb 100644 --- a/packages/apsara-icons/package.json +++ b/packages/apsara-icons/package.json @@ -1,6 +1,6 @@ { "name": "@goto-company/icons", - "version": "0.11.9", + "version": "0.12.0-alpha.10", "description": "Apsara icons", "scripts": { "build": "node scripts/build.js", diff --git a/packages/apsara-ui/package.json b/packages/apsara-ui/package.json index 7ca5002f7..c160bf8f6 100644 --- a/packages/apsara-ui/package.json +++ b/packages/apsara-ui/package.json @@ -1,6 +1,6 @@ { "name": "@goto-company/apsara", - "version": "0.11.9", + "version": "0.12.0-alpha.10", "description": "A list of base components for apsara", "author": "Praveen Yadav ", "license": "Apache-2.0", diff --git a/packages/apsara-ui/src/DiffTimeline/DiffTimeline.tsx b/packages/apsara-ui/src/DiffTimeline/DiffTimeline.tsx index 4c1803b52..1bffc0777 100644 --- a/packages/apsara-ui/src/DiffTimeline/DiffTimeline.tsx +++ b/packages/apsara-ui/src/DiffTimeline/DiffTimeline.tsx @@ -80,6 +80,7 @@ const DiffTable = ({ diff }: any) => { const DiffTimelineBlock = ({ timelineBlockData }: any) => { const [isActive, setIsActive] = useState(false); + const { withTag = true } = timelineBlockData; return (
  • @@ -95,7 +96,9 @@ const DiffTimelineBlock = ({ timelineBlockData }: any) => { {timelineBlockData.user && ( - {`by @${timelineBlockData.user}`} + {`by ${withTag ? "@" : ""}${ + timelineBlockData.user + }`} )} @@ -108,11 +111,11 @@ const DiffTimelineBlock = ({ timelineBlockData }: any) => { - {timelineBlockData.renderDiff ? + {timelineBlockData.renderDiff ? ( timelineBlockData.renderDiff() - : - } - + ) : ( + + )} )} diff --git a/packages/apsara-ui/src/TableV2/Table.tsx b/packages/apsara-ui/src/TableV2/Table.tsx index 477a0fa02..140dd2d42 100644 --- a/packages/apsara-ui/src/TableV2/Table.tsx +++ b/packages/apsara-ui/src/TableV2/Table.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect } from "react"; import { StyledTable, PaginationWrapper, TableWrapper, EmptyHeader, EmptyText } from "./Table.styles"; import { createColumnHelper, @@ -77,6 +77,10 @@ function Table({ pageSize: initialPageSize, }); + useEffect(() => { + setPagination({ pageIndex: initialPageIndex, pageSize: initialPageSize }); + }, [initialPageIndex, initialPageSize]); + const fetchDataOptions = { pageIndex, pageSize,