From b4e4248d23701d72be2bf65ca13df3084daf1244 Mon Sep 17 00:00:00 2001 From: Mikiko <112603073+wenzhuo2022@users.noreply.github.com> Date: Mon, 20 May 2024 10:13:51 +0800 Subject: [PATCH 1/5] [ci skip]Update README-CN.md (#3780) --- README-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-CN.md b/README-CN.md index 5888e17ef..c6446c568 100644 --- a/README-CN.md +++ b/README-CN.md @@ -92,7 +92,7 @@ ILLA CLI 使您能够以超乎想象的速度部署 ILLA Builder。 [单击此 加入 ILLA 社区，分享您的想法、建议或问题，并与其他用户和贡献者交流。 加入微信群： -![IMG_7144](https://github.com/illacloud/illa-builder/assets/112603073/79498626-cf31-4f0b-a2aa-0cff28f05b92) +![IMG_7296](https://github.com/illacloud/illa-builder/assets/112603073/afc9e5b7-a7c4-469d-a5aa-36f1731d55ee) Discord与Github社区入口 From bfb294c061c9abb54807d308b0a71847dbb6a85f Mon Sep 17 00:00:00 2001 From: Mikiko <112603073+wenzhuo2022@users.noreply.github.com> Date: Tue, 21 May 2024 14:36:27 +0800 Subject: [PATCH 2/5] [ci skip]Update README-CN.md (#3783) --- README-CN.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README-CN.md b/README-CN.md index c6446c568..bb780daf4 100644 --- a/README-CN.md +++ b/README-CN.md @@ -108,14 +108,6 @@ Discord与Github社区入口 `apps/builder/src/i18n/locale/*`目录是通过Crowdin自动更新的。如果你想作出贡献，请查看我们的[官方翻译页面](https://crowdin.com/project/illa-builder)。 -## 🔥正在招聘 - -你寻找一个充满激情和创造力的团队吗？ 我们正在积极招聘工程师担任以下职位： - -- 前端工程师 -- Golang 工程师 - -联系我们：hr@illasoft.com ## 版权说明 ILLA是 [Apache License 2.0](./LICENSE)。 From a0eec5d945a8b095b3fffd09fbc6933a570a5ee6 Mon Sep 17 00:00:00 2001 From: Mikiko <112603073+wenzhuo2022@users.noreply.github.com> Date: Mon, 27 May 2024 10:46:05 +0800 Subject: [PATCH 3/5] [ci skip]Update README-CN.md (#3784) --- README-CN.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README-CN.md b/README-CN.md index bb780daf4..b10c1d3ac 100644 --- a/README-CN.md +++ b/README-CN.md @@ -92,7 +92,8 @@ ILLA CLI 使您能够以超乎想象的速度部署 ILLA Builder。 [单击此 加入 ILLA 社区，分享您的想法、建议或问题，并与其他用户和贡献者交流。 加入微信群： -![IMG_7296](https://github.com/illacloud/illa-builder/assets/112603073/afc9e5b7-a7c4-469d-a5aa-36f1731d55ee) +![IMG_7420](https://github.com/illacloud/illa-builder/assets/112603073/02a4c9d7-4609-49d9-89e3-0e4253ef5723) + Discord与Github社区入口 From c4571789474e9050d790152a7801ea0fefe9bdf3 Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Fri, 31 May 2024 11:05:37 +0800 Subject: [PATCH 4/5] fix: data grid export --- apps/builder/package.json | 2 +- .../DataGridWidget/Toolbar/index.tsx | 23 +------------------ pnpm-lock.yaml | 22 +++++++++--------- 3 files changed, 13 insertions(+), 34 deletions(-) diff --git a/apps/builder/package.json b/apps/builder/package.json index 10d3b02c4..d9b677c3a 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -73,7 +73,7 @@ "@illa-public/utils": "workspace:*", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", - "@mui/x-data-grid-premium": "^6.19.6", + "@mui/x-data-grid-premium": "^6.20.0", "@protobuf-ts/runtime": "^2.8.3", "@react-google-maps/api": "^2.18.1", "@reduxjs/toolkit": "^2.0.1", diff --git a/apps/builder/src/widgetLibrary/DataGridWidget/Toolbar/index.tsx b/apps/builder/src/widgetLibrary/DataGridWidget/Toolbar/index.tsx index 52c557947..753d175f7 100644 --- a/apps/builder/src/widgetLibrary/DataGridWidget/Toolbar/index.tsx +++ b/apps/builder/src/widgetLibrary/DataGridWidget/Toolbar/index.tsx @@ -2,18 +2,12 @@ import FilterAltIcon from "@mui/icons-material/FilterAlt" import RefreshIcon from "@mui/icons-material/Refresh" import { Button } from "@mui/material" import { - GridGetRowsToExportParams, GridToolbarColumnsButton, GridToolbarContainer, GridToolbarDensitySelector, GridToolbarExport, GridToolbarFilterButton, GridToolbarQuickFilter, - gridPaginatedVisibleSortedGridRowIdsSelector, -} from "@mui/x-data-grid-premium" -import { - GridCsvGetRowsToExportParams, - GridPrintGetRowsToExportParams, } from "@mui/x-data-grid-premium" import { FC } from "react" import { useTranslation } from "react-i18next" @@ -47,22 +41,7 @@ export const Toolbar: FC = (props) => { /> )} {densitySetting && } - {exportSetting && ( - - gridPaginatedVisibleSortedGridRowIdsSelector(params.apiRef), - }} - csvOptions={{ - getRowsToExport: (params: GridCsvGetRowsToExportParams) => - gridPaginatedVisibleSortedGridRowIdsSelector(params.apiRef), - }} - printOptions={{ - getRowsToExport: (params: GridPrintGetRowsToExportParams) => - gridPaginatedVisibleSortedGridRowIdsSelector(params.apiRef), - }} - /> - )} + {exportSetting && } {exportAllSetting && } {refreshSetting && (