Skip to content

Commit

Permalink
Merge pull request #3787 from illacloud/beta
Browse files Browse the repository at this point in the history
fix: data grid export
  • Loading branch information
Wangtaofeng authored May 31, 2024
2 parents 28d9844 + dbc1472 commit 19aec67
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 44 deletions.
11 changes: 2 additions & 9 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ ILLA CLI 使您能够以超乎想象的速度部署 ILLA Builder。 [单击此
加入 ILLA 社区,分享您的想法、建议或问题,并与其他用户和贡献者交流。

加入微信群:
![IMG_7144](https://github.com/illacloud/illa-builder/assets/112603073/79498626-cf31-4f0b-a2aa-0cff28f05b92)
![IMG_7420](https://github.com/illacloud/illa-builder/assets/112603073/02a4c9d7-4609-49d9-89e3-0e4253ef5723)



Discord与Github社区入口
Expand All @@ -108,14 +109,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)
4 changes: 2 additions & 2 deletions apps/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"author": "ILLA Cloud <opensource@illasoft.com>",
"license": "Apache-2.0",
"version": "4.8.1",
"version": "4.8.2",
"scripts": {
"dev": "vite --strictPort --force",
"build-cloud": "NODE_OPTIONS=--max-old-space-size=12288 vite build --mode cloud",
Expand Down Expand Up @@ -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",
Expand Down
23 changes: 1 addition & 22 deletions apps/builder/src/widgetLibrary/DataGridWidget/Toolbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -47,22 +41,7 @@ export const Toolbar: FC<ToolbarProps> = (props) => {
/>
)}
{densitySetting && <GridToolbarDensitySelector />}
{exportSetting && (
<GridToolbarExport
excelOptions={{
getRowsToExport: (params: GridGetRowsToExportParams) =>
gridPaginatedVisibleSortedGridRowIdsSelector(params.apiRef),
}}
csvOptions={{
getRowsToExport: (params: GridCsvGetRowsToExportParams) =>
gridPaginatedVisibleSortedGridRowIdsSelector(params.apiRef),
}}
printOptions={{
getRowsToExport: (params: GridPrintGetRowsToExportParams) =>
gridPaginatedVisibleSortedGridRowIdsSelector(params.apiRef),
}}
/>
)}
{exportSetting && <GridToolbarExport />}
{exportAllSetting && <ExportAllSetting />}
{refreshSetting && (
<Button
Expand Down
22 changes: 11 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 19aec67

Please sign in to comment.