mirror/sunmao-ui
2
0
Fork 0
mirror of https://github.com/smartxworks/sunmao-ui.git synced 2025-03-31 21:30:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #704 from smartxworks/fix/arco-table

Browse Source 
Fix/arco table
This commit is contained in:
tanbowensg 2023-03-30 16:17:48 +08:00 committed by GitHub
commit ecfd7af8c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/arco-lib/src/components/Table/Table.tsx
View File

@ -215,7 +215,7 @@ export const Table = implementRuntimeComponent({
} = pagination;
const rowSelectionType = rowSelectionTypeMap[cProps.rowSelectionType];
const currentChecked = useRef<(string | number)[]>([]);
const currentChecked = useRef<Record<string, unknown>[]>([]);
const currentClickedRow = useRef<(string | number)[] | undefined>(undefined);
const [currentPage, setCurrentPage] = useStateValue<number>(
@ -274,15 +274,15 @@ export const Table = implementRuntimeComponent({
// reset selectedRows state when data changed
useEffect(() => {
const selectedRows = currentPageData.filter(d =>
currentChecked.current.includes(d[rowKey])
const currentCheckedRowKeys = currentChecked.current.map(
row => row[rowKey] as string
);
// TODO: Save clickedRow state when rowkey changes, save the UI of clickedRow when turning the page
const clickedRow = currentPageData.find(d => d[rowKey] === currentClickedRow.current);
if (!clickedRow) currentClickedRow.current = undefined;
mergeState({
selectedRowKeys: selectedRows.map(r => r[rowKey]),
selectedRows,
selectedRowKeys: currentCheckedRowKeys,
selectedRows: currentChecked.current,
clickedRow,
});
}, [currentPageData, mergeState, rowKey]);
@ -573,7 +573,7 @@ export const Table = implementRuntimeComponent({
// This option is required to achieve multi-selection across pages when customizing paging
preserveSelectedRowKeys: useCustomPagination ? checkCrossPage : undefined,
onChange(selectedRowKeys, selectedRows) {
currentChecked.current = selectedRowKeys;
currentChecked.current = selectedRows;
mergeState({
selectedRowKeys: selectedRowKeys as string[],
selectedRows,

3
packages/arco-lib/src/generated/types/Table.ts
View File

@ -367,7 +367,8 @@ export const TablePropsSpec = Type.Object({
checkCrossPage: Type.Boolean({
title: 'Check Cross Page',
category: Category.Basic,
description: 'Whether the checkboxes in multi-select mode cross pages',
description:
'Whether the checkboxes in multi-select mode cross pages。Please note that with this option on, if the data changes, the previous selected state will still be cached',
}),
rowSelectionType: StringUnion(['multiple', 'single', 'disable'], {
title: 'Row Selection Type',

10
packages/arco-lib/src/widgets/TablePrimaryKeyWidget.tsx
View File

@ -1,5 +1,5 @@
import React from 'react';
import { WidgetProps, implementWidget } from '@sunmao-ui/editor-sdk';
import { WidgetProps, implementWidget, isExpression } from '@sunmao-ui/editor-sdk';
import { ColumnSpec } from '../generated/types/Table';
import { Static } from '@sinclair/typebox';
import { Select } from '@arco-design/web-react';
@ -10,9 +10,13 @@ type TablePrimaryKeyWidgetID = 'arco/v1/primaryKey';
export const _TablePrimaryKeyWidget: React.FC<
WidgetProps<TablePrimaryKeyWidgetID, string>
> = props => {
const { value, onChange, component } = props;
const { value, onChange, component, services } = props;
const { properties } = component;
const columns = properties.columns as Static<typeof ColumnSpec>[];
const columns = (
isExpression(properties.columns)
? services.stateManager.deepEval(properties.columns as string)
: properties.columns
) as Static<typeof ColumnSpec>[];
const keys = columns.map(c => c.dataIndex);