diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx index 5285a99dc7a..f90421b0fe8 100644 --- a/packages/core/client/src/block-provider/TableBlockProvider.tsx +++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx @@ -63,7 +63,7 @@ interface Props { expandFlag?: boolean; dragSortBy?: string; association?: string; - enableIndexÏColumn?: boolean; + enableIndexColumn?: boolean; } const InternalTableBlockProvider = (props: Props) => { @@ -77,7 +77,7 @@ const InternalTableBlockProvider = (props: Props) => { fieldNames, collection, association, - enableIndexÏColumn, + enableIndexColumn, } = props; const field: any = useField(); const { resource, service } = useBlockRequestContext(); @@ -136,7 +136,7 @@ const InternalTableBlockProvider = (props: Props) => { setExpandFlag: setExpandFlagValue, heightProps, association, - enableIndexÏColumn, + enableIndexColumn, }), [ allIncludesChildren, @@ -153,7 +153,7 @@ const InternalTableBlockProvider = (props: Props) => { setExpandFlagValue, showIndex, association, - enableIndexÏColumn, + enableIndexColumn, ], ); diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts index 69b79e9bc6c..90f2618a52a 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts @@ -52,6 +52,7 @@ test.describe('where table block can be added', () => { await page.getByLabel('schema-initializer-Grid-popup').hover(); await page.getByRole('menuitem', { name: 'Associated records right' }).waitFor({ state: 'detached' }); await page.getByRole('menuitem', { name: 'Table right' }).hover(); + await page.waitForTimeout(300); await page.getByRole('menuitem', { name: 'Associated records right' }).hover(); await page.getByRole('menuitem', { name: 'parentAssociationField' }).click(); await page.getByLabel('schema-initializer-TableV2-table:configureColumns-parentTargetCollection').hover(); diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts index 853936e2cb8..26ef8e5f32e 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts @@ -751,6 +751,7 @@ test.describe('actions schema settings', () => { await page .getByRole('button', { name: 'designer-schema-settings-Action.Link-actionSettings:popup-general' }) .hover(); + await page.waitForTimeout(300); }; test('supported options', async ({ page, mockPage, mockRecord }) => { diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx index e99f8a4a118..95c73b53662 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx @@ -39,11 +39,11 @@ const enabledIndexColumn: SchemaSettingsItemType = { const { dn } = useDesignable(); return { title: t('Enable index column'), - checked: field.decoratorProps.enableIndexÏColumn !== false, - onChange: async (enableIndexÏColumn) => { + checked: field.decoratorProps.enableIndexColumn !== false, + onChange: async (enableIndexColumn) => { field.decoratorProps = field.decoratorProps || {}; - field.decoratorProps.enableIndexÏColumn = enableIndexÏColumn; - fieldSchema['x-decorator-props'].enableIndexÏColumn = enableIndexÏColumn; + field.decoratorProps.enableIndexColumn = enableIndexColumn; + fieldSchema['x-decorator-props'].enableIndexColumn = enableIndexColumn; dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], diff --git a/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx index 96da338b3fa..eff79d660f5 100644 --- a/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx @@ -41,11 +41,11 @@ const enabledIndexColumn: SchemaSettingsItemType = { const { dn } = useDesignable(); return { title: t('Enable index column'), - checked: field.componentProps.enableIndexÏColumn !== false, - onChange: async (enableIndexÏColumn) => { + checked: field.componentProps.enableIndexColumn !== false, + onChange: async (enableIndexColumn) => { field.componentProps = field.componentProps || {}; - field.componentProps.enableIndexÏColumn = enableIndexÏColumn; - fieldSchema['x-component-props'].enableIndexÏColumn = enableIndexÏColumn; + field.componentProps.enableIndexColumn = enableIndexColumn; + fieldSchema['x-component-props'].enableIndexColumn = enableIndexColumn; dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx index 80a29d853b5..74ce3bdc0bf 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx @@ -11,7 +11,7 @@ import { observer, useField, useFieldSchema } from '@formily/react'; import { transformMultiColumnToSingleColumn } from '@nocobase/utils/client'; import { Select, Space } from 'antd'; import { differenceBy, unionBy } from 'lodash'; -import React, { useContext, useMemo, useState } from 'react'; +import React, { useContext, useEffect, useMemo, useState } from 'react'; import { FormProvider, PopupSettingsProvider, @@ -135,6 +135,11 @@ export const InternalPicker = observer( const filter = list.length ? { $and: [{ [`${targetKey}.$ne`]: list }] } : {}; return filter; }; + useEffect(() => { + if (!value) { + setSelectedRows([]); + } + }, [value]); const usePickActionProps = () => { const { setVisible } = useActionContext(); const { multiple, selectedRows, onChange, options, collectionField } = useContext(RecordPickerContext); diff --git a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx index 28b881c92b1..b1ea7350f40 100644 --- a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx @@ -107,7 +107,7 @@ export const SubTable: any = observer( const labelUiSchema = useLabelUiSchema(collectionField, fieldNames?.label || 'label'); const recordV2 = useCollectionRecord(); const collection = useCollection(); - const { allowSelectExistingRecord, allowAddnew, allowDisassociation, enableIndexÏColumn } = field.componentProps; + const { allowSelectExistingRecord, allowAddnew, allowDisassociation, enableIndexColumn } = field.componentProps; useSubTableSpecialCase({ rootField: field, rootSchema: schema }); @@ -263,7 +263,7 @@ export const SubTable: any = observer( locale={{ emptyText: {field.editable ? t('Please add or select record') : t('No data')}, }} - enableIndexÏColumn={enableIndexÏColumn !== false} + enableIndexColumn={enableIndexColumn !== false} footer={() => (
{field.editable && ( diff --git a/packages/core/client/src/schema-component/antd/association-field/Table.tsx b/packages/core/client/src/schema-component/antd/association-field/Table.tsx index 867ad6a9e4f..0ec30f919a1 100644 --- a/packages/core/client/src/schema-component/antd/association-field/Table.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/Table.tsx @@ -673,7 +673,7 @@ export const Table: any = withDynamicSchemaProps( onExpand, loading, onClickRow, - enableIndexÏColumn, + enableIndexColumn, ...others } = { ...others1, ...others2 } as any; const field = useArrayField(others); @@ -826,7 +826,7 @@ export const Table: any = withDynamicSchemaProps( const restProps = useMemo( () => ({ - rowSelection: enableIndexÏColumn + rowSelection: enableIndexColumn ? memoizedRowSelection ? { type: 'checkbox', @@ -900,7 +900,7 @@ export const Table: any = withDynamicSchemaProps( isRowSelect, memoizedRowSelection, paginationProps, - enableIndexÏColumn, + enableIndexColumn, ], ); diff --git a/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx index 770c530b7b2..479d07a25d2 100644 --- a/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx @@ -59,13 +59,19 @@ ReadPretty.Input = (props: InputReadPrettyProps) => { return (
- {props.addonBefore} - {props.prefix} + {compile(props.addonBefore)} + {compile(props.prefix)} {props.ellipsis ? {content} : content} - {props.suffix} - {props.addonAfter} + {compile(props.suffix)} + {compile(props.addonAfter)}
); }; diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx index c0c6ccac98f..3943a2398b1 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx @@ -857,7 +857,7 @@ export const Table: any = withDynamicSchemaProps( const collection = useCollection(); const isTableSelector = schema?.parent?.['x-decorator'] === 'TableSelectorProvider'; const ctx = isTableSelector ? useTableSelectorContext() : useTableBlockContext(); - const { expandFlag, allIncludesChildren, enableIndexÏColumn } = ctx; + const { expandFlag, allIncludesChildren, enableIndexColumn } = ctx; const onRowDragEnd = useMemoizedFn(others.onRowDragEnd || (() => {})); const paginationProps = usePaginationProps(pagination1, pagination2, props); const columns = useTableColumns(others, paginationProps); @@ -1023,7 +1023,7 @@ export const Table: any = withDynamicSchemaProps( const restProps = useMemo( () => ({ rowSelection: - enableIndexÏColumn !== false + enableIndexColumn !== false ? memoizedRowSelection ? { type: 'checkbox', @@ -1105,7 +1105,7 @@ export const Table: any = withDynamicSchemaProps( memoizedRowSelection, paginationProps, tableBlockContextBasicValue, - enableIndexÏColumn, + enableIndexColumn, ], ); diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx index 9f35006f79c..3681f9ea06c 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx @@ -182,10 +182,10 @@ export const TableBlockDesigner = () => { { + onChange={async (enableIndexColumn) => { field.decoratorProps = field.decoratorProps || {}; - field.decoratorProps.enableIndexÏColumn = enableIndexÏColumn; - fieldSchema['x-decorator-props'].enableIndexÏColumn = enableIndexÏColumn; + field.decoratorProps.enableIndexColumn = enableIndexColumn; + fieldSchema['x-decorator-props'].enableIndexColumn = enableIndexColumn; dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], diff --git a/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx b/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx index aa3d2ba89cd..3babc507901 100644 --- a/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx +++ b/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx @@ -144,7 +144,7 @@ export const DateFilterDynamicComponent = (props) => {