From f089cacf1d0686f69b080e102beb96c8a327a18c Mon Sep 17 00:00:00 2001 From: semmy Date: Fri, 3 Dec 2021 10:05:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTable.Column.Designabl?= =?UTF-8?q?eBar=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/schema-renderer/index.tsx | 89 ++++--------------- packages/client/src/schemas/table/Table.tsx | 2 + 2 files changed, 19 insertions(+), 72 deletions(-) diff --git a/packages/client/src/components/schema-renderer/index.tsx b/packages/client/src/components/schema-renderer/index.tsx index e9f000609..8d3cd42c8 100644 --- a/packages/client/src/components/schema-renderer/index.tsx +++ b/packages/client/src/components/schema-renderer/index.tsx @@ -19,12 +19,7 @@ import { useMemo } from 'react'; import { CodeOutlined } from '@ant-design/icons'; import Editor from '@monaco-editor/react'; -import { - ArrayItems, - ArrayCollapse, - FormLayout, - FormItem as FormilyFormItem, -} from '@formily/antd'; +import { ArrayItems, ArrayCollapse, FormLayout, FormItem as FormilyFormItem } from '@formily/antd'; import { Space, Card, Modal, Spin } from 'antd'; import { ArrayTable } from '../../schemas/array-table'; @@ -34,10 +29,7 @@ import { Calendar } from '../../schemas/calendar'; import { Cascader } from '../../schemas/cascader'; import { Checkbox } from '../../schemas/checkbox'; import { ColorSelect } from '../../schemas/color-select'; -import { - DatabaseField, - DatabaseCollection, -} from '../../schemas/database-field'; +import { DatabaseField, DatabaseCollection } from '../../schemas/database-field'; import { DatePicker } from '../../schemas/date-picker'; import { Filter } from '../../schemas/filter'; import { Form } from '../../schemas/form'; @@ -70,11 +62,7 @@ import { ISchema, FormilyISchema } from '../../schemas'; import { Resource } from '../../resource'; import { useRequest } from 'ahooks'; import { CascaderOptionType } from 'antd/lib/cascader'; -import { - useClient, - useCollectionContext, - useResourceRequest, -} from '../../constate'; +import { useClient, useCollectionContext, useResourceRequest } from '../../constate'; import { i18n } from '../../i18n'; export const BlockContext = createContext({ dragRef: null }); @@ -165,12 +153,7 @@ const useAssociationResource = (options) => { const { collection } = useCollectionContext(); const ctx = useContext(TableRowContext); const associatedKey = ctx?.record?.id; - console.log( - 'useAssociationResource', - collection, - collectionField, - schema['x-component-props'], - ); + console.log('useAssociationResource', collection, collectionField, schema['x-component-props']); const { associatedName, resourceName } = schema['x-component-props'] || {}; const resource = useResourceRequest({ associatedName, @@ -292,10 +275,7 @@ export function findPropertyByPath(schema: Schema, path?: any): Schema { return property; } -export function addPropertyBefore( - target: Schema, - data: ISchema | FormilyISchema, -) { +export function addPropertyBefore(target: Schema, data: ISchema | FormilyISchema) { Object.keys(target.parent.properties).forEach((name) => { if (name === target.name) { target.parent.addProperty(data.name, data); @@ -306,10 +286,7 @@ export function addPropertyBefore( }); } -export function addPropertyAfter( - target: Schema, - data: ISchema | FormilyISchema, -) { +export function addPropertyAfter(target: Schema, data: ISchema | FormilyISchema) { Object.keys(target.parent.properties).forEach((name) => { const property = target.parent.properties[name]; property.parent.removeProperty(property.name); @@ -346,8 +323,7 @@ export function useDesignable(path?: any) { const schemaPath = path || useSchemaPath(); const fieldSchema = useFieldSchema(); let current; - let currentSchema = (current = - findPropertyByPath(schema, schemaPath) || ({} as Schema)); + let currentSchema = (current = findPropertyByPath(schema, schemaPath) || ({} as Schema)); if (!currentSchema) { currentSchema = fieldSchema; } @@ -356,10 +332,8 @@ export function useDesignable(path?: any) { } // console.log('useDesignable', { schema, schemaPath, currentSchema }); const options = useContext(SchemaOptionsContext); - let DesignableBar = get( - options.components, - currentSchema['x-designable-bar'], - ); + let DesignableBar = get(options.components, currentSchema['x-designable-bar']); + debugger; if (!designable) { DesignableBar = () => null; } @@ -405,10 +379,7 @@ export function useDesignable(path?: any) { refresh(); return target.properties[property.name]; }, - appendChild: ( - property: ISchema | FormilyISchema, - targetPath?: any, - ): Schema => { + appendChild: (property: ISchema | FormilyISchema, targetPath?: any): Schema => { let target = currentSchema; if (targetPath) { target = findPropertyByPath(schema, targetPath); @@ -435,10 +406,7 @@ export function useDesignable(path?: any) { refresh(); return target.properties[property.name]; }, - insertAfter: ( - property: ISchema | FormilyISchema, - targetPath?: any, - ): Schema => { + insertAfter: (property: ISchema | FormilyISchema, targetPath?: any): Schema => { let target = currentSchema; if (targetPath) { target = findPropertyByPath(schema, targetPath); @@ -626,17 +594,8 @@ const FormValues = () => { return ( <> setVisible(true)} /> - setVisible(false)} - onCancel={() => setVisible(false)} - visible={visible} - > - + setVisible(false)} onCancel={() => setVisible(false)} visible={visible}> + {/* 
{JSON.stringify(schema.toJSON(), null, 2)}
*/} @@ -647,21 +606,9 @@ const CodePreview = ({ schema }) => { const [visible, setVisible] = useState(false); return ( <> - setVisible(true)} - /> - setVisible(false)} - onCancel={() => setVisible(false)} - visible={visible} - > - + setVisible(true)} /> + setVisible(false)} onCancel={() => setVisible(false)} visible={visible}> + {/* 
{JSON.stringify(schema.toJSON(), null, 2)}
*/} @@ -789,9 +736,7 @@ export const SchemaRenderer = (props: SchemaRendererProps) => { }, }} > - - {props.render || defaultRender} - + {props.render || defaultRender} ); }; diff --git a/packages/client/src/schemas/table/Table.tsx b/packages/client/src/schemas/table/Table.tsx index 32b4b64e3..be217db7d 100644 --- a/packages/client/src/schemas/table/Table.tsx +++ b/packages/client/src/schemas/table/Table.tsx @@ -27,6 +27,7 @@ import { TableActionDesignableBar } from './TableActionDesignableBar'; import { TableOperationDesignableBar } from './TableOperationDesignableBar'; import { TableProvider } from './TableProvider'; import { TableIndex } from './TableIndex'; +import { TableColumnDesignableBar } from './TableColumnDesignableBar'; export const Table: any = observer((props: any) => { const [visible, setVisible] = useState(false); @@ -51,6 +52,7 @@ Table.Action = () => null; Table.Action.DesignableBar = TableActionDesignableBar; Table.Cell = TableCell; Table.Column = TableColumn; +Table.Column.DesignableBar = TableColumnDesignableBar; Table.SortHandle = TableSortHandle; Table.DesignableBar = TableDesignableBar; Table.SimpleDesignableBar = SimpleDesignableBar;