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

feat: improve code

Browse Source
This commit is contained in:
chenos 2021-08-08 12:06:33 +08:00
parent 1ab7d544b3
commit 85c052ba59
6 changed files with 219 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/resource.ts
View File

@ -63,7 +63,9 @@ export class Resource {
if (!resourceKey) {
return Promise.resolve({ data: {} });
}
return request(`${resourceName}:get/${resourceKey}`);
return request(`${resourceName}:get/${resourceKey}`, {
params: options,
});
}
create(values: any) {

8
packages/client/src/schemas/action/index.tsx
View File

@ -109,14 +109,14 @@ Action.Modal = observer((props: any) => {
const { run: runCancel } = useCancelAction();
const isFormDecorator = schema['x-decorator'] === 'Form';
const field = useField();
console.log('Action.Modal.field', field);
console.log('Action.Modal.field', schema['x-read-pretty']);
return (
<Modal
title={schema.title}
destroyOnClose
maskClosable
footer={
isFormDecorator
isFormDecorator && !schema['x-read-pretty']
? [
<Button
onClick={async () => {
@ -171,6 +171,7 @@ Action.Drawer = observer((props: any) => {
const { run: runOk } = useOkAction();
const { run: runCancel } = useCancelAction();
const isFormDecorator = schema['x-decorator'] === 'Form';
console.log('Action.Modal.field', schema['x-read-pretty']);
return (
<Drawer
width={'50%'}
@ -178,7 +179,8 @@ Action.Drawer = observer((props: any) => {
maskClosable
destroyOnClose
footer={
isFormDecorator && (
isFormDecorator &&
!schema['x-read-pretty'] && (
<Space style={{ float: 'right' }}>
<Button
onClick={async (e) => {

95
packages/client/src/schemas/add-new/index.tsx
View File

@ -389,6 +389,7 @@ function generateCardItemSchema(component) {
name: 'table',
'x-decorator': 'CardItem',
'x-component': 'Table',
'x-designable-bar': 'Table.SimpleDesignableBar',
default: [],
'x-component-props': {
useResource: '{{ Table.useActionLogsResource }}',
@ -452,32 +453,86 @@ function generateCardItemSchema(component) {
[uid()]: {
type: 'void',
title: '查看',
'x-read-pretty': true,
'x-decorator': 'Form',
'x-decorator-props': {
useResource: '{{ Table.useActionLogDetailsResource }}',
},
'x-component': 'Action.Drawer',
'x-component-props': {
bodyStyle: {
background: '#f0f2f5',
// paddingTop: 0,
},
// bodyStyle: {
// background: '#f0f2f5',
// // paddingTop: 0,
// },
},
properties: {
[uid()]: {
type: 'void',
'x-component': 'Tabs',
created_at: {
type: 'string',
title: '创建时间',
'x-decorator': 'FormItem',
'x-component': 'DatePicker',
'x-read-pretty': true,
'x-component-props': {
singleton: true,
format: 'YYYY-MM-DD HH:mm:ss',
},
properties: {
[uid()]: {
type: 'void',
title: '详情',
'x-component': 'Tabs.TabPane',
'x-component-props': {},
properties: {
[uid()]: {
type: 'void',
'x-component': 'Grid',
'x-component-props': {
// addNewComponent: 'AddNew.PaneItem',
},
type: {
type: 'string',
title: '操作类型',
'x-decorator': 'FormItem',
'x-component': 'Select',
'x-read-pretty': true,
enum: [
{ label: '新增数据', value: 'create' },
{ label: '更新数据', value: 'update' },
{ label: '删除数据', value: 'destroy' },
],
},
changes: {
type: 'array',
title: '数据变动',
'x-decorator': 'FormItem',
'x-component': 'ArrayTable',
'x-component-props': {
pagination: false,
// scroll: { x: '100%' },
},
items: {
type: 'object',
properties: {
column1: {
type: 'void',
'x-component': 'ArrayTable.Column',
'x-component-props': { title: '字段名称' },
properties: {
'field.uiSchema.title': {
type: 'string',
'x-decorator': 'FormItem',
'x-component': 'Input',
},
},
},
column3: {
type: 'void',
'x-component': 'ArrayTable.Column',
'x-component-props': { title: '操作前' },
properties: {
before: {
type: 'string',
'x-decorator': 'FormItem',
'x-component': 'Values',
},
},
},
column4: {
type: 'void',
'x-component': 'ArrayTable.Column',
'x-component-props': { title: '操作后' },
properties: {
after: {
type: 'string',
'x-decorator': 'FormItem',
'x-component': 'Values',
},
},
},

8
packages/client/src/schemas/form/DesignableBar.tsx
View File

@ -59,15 +59,15 @@ export const DesignableBar = observer((props) => {
}}
overlay={
<Menu>
<Menu.Item
{/* <Menu.Item
key={'update'}
onClick={() => {
field.readPretty = true;
}}
>
编辑表单配置
</Menu.Item>
<Menu.Divider />
</Menu.Item> */}
{/* <Menu.Divider /> */}
<Menu.Item
key={'delete'}
onClick={async () => {
@ -79,7 +79,7 @@ export const DesignableBar = observer((props) => {
}
}}
>
删除当前表单
移除
</Menu.Item>
</Menu>
}

93
packages/client/src/schemas/table/SimpleDesignableBar.tsx Normal file
View File

@ -0,0 +1,93 @@
import React, { useContext, useMemo, useRef, useState } from 'react';
import { createForm } from '@formily/core';
import {
SchemaOptionsContext,
Schema,
useFieldSchema,
observer,
SchemaExpressionScopeContext,
FormProvider,
ISchema,
useField,
useForm,
RecursionField,
} from '@formily/react';
import {
useSchemaPath,
SchemaField,
useDesignable,
removeSchema,
} from '../';
import get from 'lodash/get';
import { Button, Dropdown, Menu, Space } from 'antd';
import { MenuOutlined, DragOutlined } from '@ant-design/icons';
import cls from 'classnames';
import { FormLayout } from '@formily/antd';
import './style.less';
import AddNew from '../add-new';
import { DraggableBlockContext } from '../../components/drag-and-drop';
import { isGridRowOrCol } from '../grid';
import constate from 'constate';
import { useEffect } from 'react';
import { uid } from '@formily/shared';
import { getSchemaPath } from '../../components/schema-renderer';
export const SimpleDesignableBar = observer((props) => {
const field = useField();
const { designable, schema, refresh, deepRemove } = useDesignable();
const [visible, setVisible] = useState(false);
const { dragRef } = useContext(DraggableBlockContext);
if (!designable) {
return null;
}
return (
<div className={cls('designable-bar', { active: visible })}>
<span
onClick={(e) => {
e.stopPropagation();
}}
className={cls('designable-bar-actions', { active: visible })}
>
<Space size={'small'}>
<AddNew.CardItem defaultAction={'insertAfter'} ghost />
{dragRef && <DragOutlined ref={dragRef} />}
<Dropdown
trigger={['click']}
visible={visible}
onVisibleChange={(visible) => {
setVisible(visible);
}}
overlay={
<Menu>
{/* <Menu.Item
key={'update'}
onClick={() => {
field.readPretty = true;
}}
>
编辑表单配置
</Menu.Item> */}
{/* <Menu.Divider /> */}
<Menu.Item
key={'delete'}
onClick={async () => {
const removed = deepRemove();
// console.log({ removed })
const last = removed.pop();
if (isGridRowOrCol(last)) {
await removeSchema(last);
}
}}
>
移除
</Menu.Item>
</Menu>
}
>
<MenuOutlined />
</Dropdown>
</Space>
</span>
</div>
);
});

43
packages/client/src/schemas/table/index.tsx
View File

@ -72,6 +72,7 @@ import flatten from 'flat';
import IconPicker from '../../components/icon-picker';
import { DescriptionsContext } from '../form';
import { VisibleContext } from '../../context';
import { SimpleDesignableBar } from './SimpleDesignableBar';
export interface ITableContext {
props: any;
@ -361,7 +362,7 @@ const useTableColumns = () => {
}),
);
if (designable && schema['x-designable-bar']) {
if (designable && schema['x-designable-bar'] !== 'Table.SimpleDesignableBar') {
columns.push({
title: <AddColumn />,
dataIndex: 'addnew',
@ -1386,7 +1387,6 @@ Table.Filter.DesignableBar = () => {
Table.Operation = observer((props: any) => {
const { designable, schema } = useDesignable();
const [visible, setVisible] = useState(false);
return (
<div className={'nb-table-column'}>
操作
@ -1410,6 +1410,9 @@ Table.Operation.Cell = observer((props: any) => {
Table.Operation.DesignableBar = (props) => {
const { schema, remove, refresh, appendChild } = useDesignable(props.path);
const [visible, setVisible] = useState(false);
if (!schema['x-designable-bar']) {
return null;
}
const map = new Map();
schema.mapProperties((s) => {
if (!s['x-action-type']) {
@ -2015,25 +2018,56 @@ Table.DesignableBar = observer((props) => {
);
});
Table.useResource = ({ onSuccess }) => {
Table.useResource = ({ onSuccess, manual = true }) => {
const { props } = useTable();
const { collection } = useCollectionContext();
const ctx = useContext(TableRowContext);
const resource = Resource.make({
resourceName: collection.name,
resourceName: collection?.name || props.collectionName,
resourceKey: ctx.record[props.rowKey],
});
console.log('collection?.name || props.collectionName', collection?.name || props.collectionName)
const service = useRequest(
(params?: any) => {
console.log('Table.useResource', params);
return resource.get(params);
},
{
formatResult: (result) => result?.data,
onSuccess,
manual,
},
);
return { resource, service, initialValues: service.data, ...service };
};
Table.useActionLogDetailsResource = ({ onSuccess }) => {
const { props } = useTable();
const { collection } = useCollectionContext();
const ctx = useContext(TableRowContext);
const resource = Resource.make({
resourceName: 'action_logs',
resourceKey: ctx.record[props.rowKey],
});
const service = useRequest(
(params?: any) => {
console.log('Table.useResource', params);
return resource.get({...params, 'fields[appends]': 'changes'});
},
{
formatResult: (result) => result?.data,
onSuccess,
manual: true,
},
);
const [visible] = useContext(VisibleContext);
useEffect(() => {
if (visible) {
service.run({});
}
}, [visible]);
return { resource, service, initialValues: service.data, ...service };
};
@ -2051,3 +2085,4 @@ Table.useTableUpdateAction = useTableUpdateAction;
Table.useTableDestroyAction = useTableDestroyAction;
Table.useTableIndex = useTableIndex;
Table.useTableRowRecord = useTableRowRecord;
Table.SimpleDesignableBar = SimpleDesignableBar;