diff --git a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx index beb1dd0e7..a1701141b 100644 --- a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx @@ -1,6 +1,6 @@ import { PlusOutlined } from '@ant-design/icons'; import { ArrayTable } from '@formily/antd'; -import { useForm, useField } from '@formily/react'; +import { useField, useForm } from '@formily/react'; import { uid } from '@formily/shared'; import { Button, Dropdown, Menu } from 'antd'; import { cloneDeep } from 'lodash'; @@ -9,11 +9,11 @@ import { useTranslation } from 'react-i18next'; import { useRequest } from '../../api-client'; import { RecordProvider, useRecord } from '../../record-provider'; import { ActionContext, SchemaComponent, useActionContext, useCompile } from '../../schema-component'; +import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider'; import { useCancelAction } from '../action-hooks'; import { useCollectionManager } from '../hooks'; import { useOptions } from '../hooks/useOptions'; import { IField } from '../interfaces/types'; -import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider'; import * as components from './components'; import { getOptions } from './interfaces'; @@ -249,7 +249,7 @@ export const AddFieldAction = (props) => { option.children.length > 0 && ( {option.children - .filter((child) => !['o2o', 'subTable'].includes(child.name)) + .filter((child) => !['o2o', 'subTable', 'linkTo'].includes(child.name)) .map((child) => { return ( diff --git a/packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx index 705983f8c..1aea86da3 100644 --- a/packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx @@ -1,4 +1,4 @@ -import { Schema, useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@formily/react'; import { useCollection } from '../../'; // 表格操作配置 @@ -81,33 +81,33 @@ export const TableActionInitializers = { return (collection as any).template !== 'view'; }, }, - { - type: 'item', - title: "{{t('Association fields filter')}}", - component: 'ActionBarAssociationFilterAction', - schema: { - 'x-align': 'left', - }, - find: (schema: Schema) => { - const resultSchema = Object.entries(schema.parent.properties).find( - ([, value]) => value['x-component'] === 'AssociationFilter', - )?.[1]; - return resultSchema; - }, - visible: () => { - const collection = useCollection(); - const schema = useFieldSchema(); - return (collection as any).template !== 'view' && schema['x-initializer'] !== 'GanttActionInitializers'; - }, - }, - { - type: 'divider', - visible: () => { - const collection = useCollection(); - const schema = useFieldSchema(); - return (collection as any).template !== 'view' && schema['x-initializer'] !== 'GanttActionInitializers'; - }, - }, + // { + // type: 'item', + // title: "{{t('Association fields filter')}}", + // component: 'ActionBarAssociationFilterAction', + // schema: { + // 'x-align': 'left', + // }, + // find: (schema: Schema) => { + // const resultSchema = Object.entries(schema.parent.properties).find( + // ([, value]) => value['x-component'] === 'AssociationFilter', + // )?.[1]; + // return resultSchema; + // }, + // visible: () => { + // const collection = useCollection(); + // const schema = useFieldSchema(); + // return (collection as any).template !== 'view' && schema['x-initializer'] !== 'GanttActionInitializers'; + // }, + // }, + // { + // type: 'divider', + // visible: () => { + // const collection = useCollection(); + // const schema = useFieldSchema(); + // return (collection as any).template !== 'view' && schema['x-initializer'] !== 'GanttActionInitializers'; + // }, + // }, { type: 'subMenu', title: '{{t("Customize")}}', diff --git a/packages/plugins/audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx b/packages/plugins/audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx index cc3454cba..f613ffd0b 100644 --- a/packages/plugins/audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx +++ b/packages/plugins/audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx @@ -1,4 +1,3 @@ -import { Schema } from '@formily/react'; // 操作记录表格操作配置 export const AuditLogsTableActionInitializers = { @@ -30,22 +29,22 @@ export const AuditLogsTableActionInitializers = { }, ], }, - { - type: 'divider', - }, - { - type: 'item', - title: "{{t('Association fields filter')}}", - component: 'ActionBarAssociationFilterAction', - schema: { - 'x-align': 'left', - }, - find: (schema: Schema) => { - const resultSchema = Object.entries(schema.parent.properties).find( - ([, value]) => value['x-component'] === 'AssociationFilter', - )?.[1]; - return resultSchema; - }, - }, + // { + // type: 'divider', + // }, + // { + // type: 'item', + // title: "{{t('Association fields filter')}}", + // component: 'ActionBarAssociationFilterAction', + // schema: { + // 'x-align': 'left', + // }, + // find: (schema: Schema) => { + // const resultSchema = Object.entries(schema.parent.properties).find( + // ([, value]) => value['x-component'] === 'AssociationFilter', + // )?.[1]; + // return resultSchema; + // }, + // }, ], };