From 38e9b2c96c048bfe76109c8072f8814023b98ddb Mon Sep 17 00:00:00 2001 From: chenos Date: Fri, 26 Mar 2021 12:14:16 +0800 Subject: [PATCH] fix: subTable --- .../form.fields/drawer-select/index.tsx | 4 ++- .../form.fields/sub-table/Table.tsx | 8 +++--- .../pages/AdminLoader/View/Form.tsx | 4 +-- .../pages/AdminLoader/View/SubTable.tsx | 27 +++++++++++++++++-- .../app/src/components/views/Field/index.tsx | 21 ++++++++++----- 5 files changed, 49 insertions(+), 15 deletions(-) diff --git a/packages/app/src/components/form.fields/drawer-select/index.tsx b/packages/app/src/components/form.fields/drawer-select/index.tsx index b11ec0eda..c09c90b70 100644 --- a/packages/app/src/components/form.fields/drawer-select/index.tsx +++ b/packages/app/src/components/form.fields/drawer-select/index.tsx @@ -30,12 +30,14 @@ function transform({value, multiple, labelField, valueField = 'id'}) { } export function DrawerSelectComponent(props) { - const { __parent, size, schema = {}, disabled, viewName, target, multiple, filter, resourceName, associatedKey, labelField, valueField = 'id', value, onChange } = props; + const { __parent, size, schema = {}, disabled, viewName, target, multiple, filter, resourceName, associatedKey, valueField = 'id', value, onChange } = props; + const labelField = props.labelField || schema.labelField; const [selectedKeys, selectedValue] = transform({value, multiple, labelField, valueField }); const [selectedRowKeys, setSelectedRowKeys] = useState(multiple ? selectedKeys : [selectedKeys]); const [selectedRows, setSelectedRows] = useState(selectedValue); const [options, setOptions] = useState(selectedValue); const { title = '' } = schema; + console.log({schema}) return ( <>