ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: improve table schema initializer

Browse Source
This commit is contained in:
chenos 2022-02-26 14:31:08 +08:00
parent 0125ae8df9
commit 8c3e30df52
8 changed files with 247 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/client/src/collection-manager/sub-table.tsx
View File

@ -1,7 +1,7 @@
import { observer, useForm } from '@formily/react';
import { cloneDeep } from 'lodash';
import React, { createContext, useContext, useState } from 'react';
import { CollectionOptions, CollectionProvider, useActionContext, useRecord, useRequest } from '../';
import { CollectionOptions, CollectionProvider, useActionContext, useRecord, useRecordIndex, useRequest } from '../';
import { useAPIClient } from '../api-client';
import { options } from './Configuration/interfaces';
@ -104,10 +104,10 @@ const useBulkDestroyAction = () => {
const { selectedRowKeys, setSelectedRowKeys } = ctx;
return {
async run() {
const dataSource = ctx.dataSource || [];
const dataSource: any[] = ctx.dataSource || [];
ctx.setDataSource(
dataSource.filter((item) => {
return !selectedRowKeys.includes(item[ctx.rowKey]);
dataSource.filter((_, index) => {
return !selectedRowKeys.includes(index);
}),
);
setSelectedRowKeys([]);
@ -116,16 +116,15 @@ const useBulkDestroyAction = () => {
};
const useUpdateAction = () => {
const record = useRecord();
const recordIndex = useRecordIndex();
const form = useForm();
const { setVisible } = useActionContext();
const ctx = useContext(DataSourceContext);
return {
async run() {
const dataSource = ctx?.dataSource || [];
const rowKey = ctx?.rowKey;
const values = dataSource.map((item) => {
if (record[rowKey] === item[rowKey]) {
const dataSource: any[] = ctx?.dataSource || [];
const values = dataSource.map((item, index) => {
if (index === recordIndex) {
return { ...form.values };
}
return item;
@ -137,15 +136,14 @@ const useUpdateAction = () => {
};
const useDestroyAction = () => {
const record = useRecord();
const recordIndex = useRecordIndex();
const ctx = useContext(DataSourceContext);
return {
async run() {
const rowKey = ctx.rowKey;
const dataSource = ctx.dataSource || [];
const dataSource: any[] = ctx.dataSource || [];
ctx.setDataSource(
dataSource.filter((item) => {
return record[rowKey] !== item[rowKey];
dataSource.filter((_, index) => {
return recordIndex !== index;
}),
);
},
@ -216,7 +214,7 @@ export const SubFieldDataSourceProvider = observer((props) => {
});
export const DataSourceProvider = observer((props: any) => {
const { rowKey = 'id', collection, association } = props;
const { rowKey, collection, association } = props;
const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const [dataSource, setDataSource] = useState([]);
const record = useRecord();

11
packages/client/src/record-provider/index.tsx
View File

@ -1,13 +1,22 @@
import { useRequest } from 'ahooks';
import React, { createContext, useContext } from 'react';
export const RecordContext = createContext({});
export const RecordIndexContext = createContext(null);
export const RecordProvider: React.FC<{ record: any }> = (props) => {
const { record, children } = props;
return <RecordContext.Provider value={record}>{children}</RecordContext.Provider>;
};
export const RecordIndexProvider: React.FC<{ index: any }> = (props) => {
const { index, children } = props;
return <RecordIndexContext.Provider value={index}>{children}</RecordIndexContext.Provider>;
};
export function useRecord<D = any>() {
return useContext(RecordContext) as D;
}
export function useRecordIndex() {
return useContext(RecordIndexContext);
}

16
packages/client/src/schema-component/antd/table/Table.Array.tsx
View File

@ -5,7 +5,7 @@ import { Table, TableColumnProps } from 'antd';
import cls from 'classnames';
import React, { useState } from 'react';
import { DndContext } from '../..';
import { RecordProvider, useRequest, useSchemaInitializer } from '../../../';
import { RecordIndexProvider, RecordProvider, useRequest, useSchemaInitializer } from '../../../';
const isColumnComponent = (schema: Schema) => {
return schema['x-component']?.endsWith('.Column') > -1;
@ -29,9 +29,11 @@ const useTableColumns = () => {
render: (v, record) => {
const index = field.value?.indexOf(record);
return (
<RecordProvider record={record}>
<RecursionField schema={s} name={index} onlyRenderProperties />
</RecordProvider>
<RecordIndexProvider index={index}>
<RecordProvider record={record}>
<RecursionField schema={s} name={index} onlyRenderProperties />
</RecordProvider>
</RecordIndexProvider>
);
},
} as TableColumnProps<any>;
@ -119,9 +121,15 @@ export const TableArray: React.FC<any> = observer((props) => {
}
: undefined,
};
const defaultRowKey = (record: any) => {
return field.value?.indexOf?.(record);
};
return (
<div>
<Table
rowKey={defaultRowKey}
{...others}
{...restProps}
components={components}

3
packages/client/src/schema-component/antd/table/Table.Void.tsx
View File

@ -76,7 +76,7 @@ const useDefSelectedRowKeys = () => {
};
export const TableVoid: React.FC<TableVoidProps> = observer((props) => {
const { useDataSource = useDef, useSelectedRowKeys = useDefSelectedRowKeys } = props;
const { rowKey = 'id', useDataSource = useDef, useSelectedRowKeys = useDefSelectedRowKeys } = props;
const field = useField<Field>();
const fieldSchema = useFieldSchema();
const form = useMemo(() => createForm(), []);
@ -108,6 +108,7 @@ export const TableVoid: React.FC<TableVoidProps> = observer((props) => {
<FieldContext.Provider value={f}>
<TableArray
{...props}
rowKey={rowKey}
useSelectedRowKeys={useSelectedRowKeys}
loading={result?.loading}
pagination={usePaginationProps(props, result)}

4
packages/client/src/schema-initializer/Initializers/Items/SubTableFieldInitializer.tsx
View File

@ -26,7 +26,6 @@ export const SubTableFieldInitializer = (props) => {
type: 'void',
'x-component': 'DataSourceProvider',
'x-component-props': {
rowKey: 'id',
collection: item?.field?.target,
association: {
name: item.field.name,
@ -127,7 +126,6 @@ export const SubTableFieldInitializer = (props) => {
expandable: {
childrenColumnName: '__nochildren__',
},
rowKey: 'id',
rowSelection: {
type: 'checkbox',
},
@ -142,7 +140,7 @@ export const SubTableFieldInitializer = (props) => {
'x-decorator': 'Table.Column.ActionBar',
'x-component': 'Table.Column',
'x-designer': 'Table.RowActionDesigner',
'x-initializer': 'TableRecordActionInitializers',
'x-initializer': 'TableFieldRecordActionInitializers',
properties: {
actions: {
type: 'void',

186
packages/client/src/schema-initializer/Initializers/TableFieldRecordActionInitializers.tsx Normal file
View File

@ -0,0 +1,186 @@
import { MenuOutlined } from '@ant-design/icons';
import { css } from '@emotion/css';
import { useFieldSchema } from '@formily/react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { SchemaInitializer } from '../..';
import { useAPIClient } from '../../api-client';
import { createDesignable, useDesignable } from '../../schema-component';
export const TableFieldRecordActionInitializers = (props: any) => {
const fieldSchema = useFieldSchema();
const api = useAPIClient();
const { refresh } = useDesignable();
const { t } = useTranslation();
return (
<SchemaInitializer.Button
className={css`
border: 0 !important;
color: #fff !important;
background: none !important;
height: auto !important;
line-height: 12px !important;
width: 12px !important;
padding: 0;
font-size: 12px;
`}
insertPosition={'beforeEnd'}
insert={(schema) => {
const spaceSchema = fieldSchema.reduceProperties((buf, schema) => {
if (schema['x-component'] === 'Space') {
return schema;
}
return buf;
}, null);
if (!spaceSchema) {
return;
}
const dn = createDesignable({
api,
refresh,
current: spaceSchema,
});
dn.loadAPIClientEvents();
dn.insertBeforeEnd(schema);
}}
items={[
{
type: 'itemGroup',
title: t('Enable actions'),
children: [
{
type: 'item',
title: t('View'),
component: 'ActionInitializer',
schema: {
title: '{{ t("View") }}',
type: 'void',
'x-action': 'view',
'x-designer': 'Action.Designer',
'x-component': 'Action.Link',
'x-component-props': {},
properties: {
drawer: {
type: 'void',
'x-component': 'Action.Drawer',
title: '{{ t("View record") }}',
properties: {
tabs: {
type: 'void',
'x-component': 'Tabs',
'x-component-props': {},
properties: {
tab1: {
type: 'void',
title: '详情',
'x-component': 'Tabs.TabPane',
'x-component-props': {},
properties: {
grid: {
type: 'void',
'x-decorator': 'Form',
'x-component': 'Grid',
'x-read-pretty': true,
'x-item-initializer': 'RecordBlockInitializer',
properties: {},
},
},
},
},
},
},
},
},
},
},
{
type: 'item',
title: t('Edit'),
component: 'ActionInitializer',
schema: {
title: '{{ t("Edit") }}',
type: 'void',
'x-action': 'update',
'x-designer': 'Action.Designer',
'x-component': 'Action.Link',
'x-component-props': {},
properties: {
drawer: {
type: 'void',
'x-decorator': 'Form',
'x-decorator-props': {
useValues: '{{ cm.useValuesFromRecord }}',
},
'x-component': 'Action.Drawer',
title: '{{ t("Edit record") }}',
properties: {
grid: {
type: 'void',
'x-component': 'Grid',
'x-initializer': 'GridFormItemInitializers',
properties: {},
},
footer: {
type: 'void',
'x-component': 'Action.Drawer.Footer',
properties: {
actions: {
type: 'void',
'x-decorator': 'DndContext',
'x-component': 'ActionBar',
'x-component-props': {
layout: 'one-column',
},
properties: {
cancel: {
title: '{{ t("Cancel") }}',
'x-action': 'cancel',
'x-component': 'Action',
'x-component-props': {
useAction: '{{ cm.useCancelAction }}',
},
},
submit: {
title: '{{ t("Submit") }}',
'x-action': 'submit',
'x-component': 'Action',
'x-component-props': {
type: 'primary',
useAction: '{{ ds.useUpdateAction }}',
},
},
},
},
},
},
},
},
},
},
},
{
type: 'item',
title: t('Delete'),
component: 'ActionInitializer',
schema: {
title: '{{ t("Delete") }}',
'x-action': 'destroy',
'x-designer': 'Action.Designer',
'x-component': 'Action.Link',
'x-component-props': {
confirm: {
title: "{{t('Delete record')}}",
content: "{{t('Are you sure you want to delete it?')}}",
},
useAction: '{{ ds.useDestroyAction }}',
},
},
},
],
},
]}
>
<MenuOutlined />
</SchemaInitializer.Button>
);
};

24
packages/client/src/schema-initializer/Initializers/TableRecordActionInitializers.tsx
View File

@ -126,13 +126,29 @@ export const TableRecordActionInitializers = (props: any) => {
properties: {
actions: {
type: 'void',
'x-initializer': 'PopupFormActionInitializers',
'x-decorator': 'DndContext',
'x-component': 'ActionBar',
'x-component-props': {
layout: 'one-column',
},
properties: {},
properties: {
cancel: {
title: '{{ t("Cancel") }}',
'x-action': 'cancel',
'x-component': 'Action',
'x-component-props': {
useAction: '{{ cm.useCancelAction }}',
},
},
submit: {
title: '{{ t("Submit") }}',
'x-action': 'submit',
'x-component': 'Action',
'x-component-props': {
type: 'primary',
useAction: '{{ cm.useUpdateAction }}',
},
},
},
},
},
},
@ -166,4 +182,4 @@ export const TableRecordActionInitializers = (props: any) => {
<MenuOutlined />
</SchemaInitializer.Button>
);
};
};

4
packages/client/src/schema-initializer/Initializers/index.tsx
View File

@ -8,8 +8,8 @@ import { PopupFormActionInitializers } from './PopupFormActionInitializers';
import { RecordBlockInitializers } from './RecordBlockInitializers';
import { TableActionInitializers } from './TableActionInitializers';
import { TableColumnInitializers } from './TableColumnInitializers';
import { TableFieldRecordActionInitializers } from './TableFieldRecordActionInitializers';
import { TableRecordActionInitializers } from './TableRecordActionInitializers';
export const items = { ...Items };
export const initializes = {
@ -33,4 +33,6 @@ export const initializes = {
TableColumnInitializers,
// 表格当前行记录的「操作配置」
TableRecordActionInitializers,
// 表格字段（子表格）场景的当前行记录的「操作配置」
TableFieldRecordActionInitializers,
};