fix: fixed the configuration field filter (#1742)
* fix: fixed the configuration field filter * fix: batch update filter automatic number field * refactor: optimize code --------- Co-authored-by: Rairn <958414905@qq.com>
This commit is contained in:
		
							parent
							
								
									00b3c8c257
								
							
						
					
					
						commit
						de5260bc2c
					
				@ -1,6 +1,6 @@
 | 
				
			|||||||
import { ISchema, Schema, useFieldSchema, useForm } from '@formily/react';
 | 
					import { ISchema, Schema, useFieldSchema, useForm } from '@formily/react';
 | 
				
			||||||
import { uid } from '@formily/shared';
 | 
					import { uid } from '@formily/shared';
 | 
				
			||||||
import React, { useContext, useState } from 'react';
 | 
					import React, { useContext, useMemo, useState } from 'react';
 | 
				
			||||||
import { useTranslation } from 'react-i18next';
 | 
					import { useTranslation } from 'react-i18next';
 | 
				
			||||||
import { BlockRequestContext, SchemaInitializerItemOptions } from '../';
 | 
					import { BlockRequestContext, SchemaInitializerItemOptions } from '../';
 | 
				
			||||||
import { FieldOptions, useCollection, useCollectionManager } from '../collection-manager';
 | 
					import { FieldOptions, useCollection, useCollectionManager } from '../collection-manager';
 | 
				
			||||||
@ -560,7 +560,12 @@ export const useCustomFormItemInitializerFields = (options?: any) => {
 | 
				
			|||||||
  const remove = useRemoveGridFormItem();
 | 
					  const remove = useRemoveGridFormItem();
 | 
				
			||||||
  return currentFields
 | 
					  return currentFields
 | 
				
			||||||
    ?.filter((field) => {
 | 
					    ?.filter((field) => {
 | 
				
			||||||
      return field?.interface && !field?.uiSchema?.['x-read-pretty'] && field.interface !== 'snapshot';
 | 
					      return (
 | 
				
			||||||
 | 
					        field?.interface &&
 | 
				
			||||||
 | 
					        !field?.uiSchema?.['x-read-pretty'] &&
 | 
				
			||||||
 | 
					        field.interface !== 'snapshot' &&
 | 
				
			||||||
 | 
					        field.type !== 'sequence'
 | 
				
			||||||
 | 
					      );
 | 
				
			||||||
    })
 | 
					    })
 | 
				
			||||||
    ?.map((field) => {
 | 
					    ?.map((field) => {
 | 
				
			||||||
      const interfaceConfig = getInterface(field.interface);
 | 
					      const interfaceConfig = getInterface(field.interface);
 | 
				
			||||||
@ -597,11 +602,18 @@ export const useCustomBulkEditFormItemInitializerFields = (options?: any) => {
 | 
				
			|||||||
  const form = useForm();
 | 
					  const form = useForm();
 | 
				
			||||||
  const { readPretty = form.readPretty, block = 'Form' } = options || {};
 | 
					  const { readPretty = form.readPretty, block = 'Form' } = options || {};
 | 
				
			||||||
  const remove = useRemoveGridFormItem();
 | 
					  const remove = useRemoveGridFormItem();
 | 
				
			||||||
  return fields
 | 
					  const filterFields = useMemo(
 | 
				
			||||||
 | 
					    () =>
 | 
				
			||||||
 | 
					      fields
 | 
				
			||||||
        ?.filter((field) => {
 | 
					        ?.filter((field) => {
 | 
				
			||||||
      return field?.interface && !field?.uiSchema?.['x-read-pretty'] && field.interface !== 'snapshot';
 | 
					          return (
 | 
				
			||||||
 | 
					            field?.interface &&
 | 
				
			||||||
 | 
					            !field?.uiSchema?.['x-read-pretty'] &&
 | 
				
			||||||
 | 
					            field.interface !== 'snapshot' &&
 | 
				
			||||||
 | 
					            field.type !== 'sequence'
 | 
				
			||||||
 | 
					          );
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
    ?.map((field) => {
 | 
					        .map((field) => {
 | 
				
			||||||
          const interfaceConfig = getInterface(field.interface);
 | 
					          const interfaceConfig = getInterface(field.interface);
 | 
				
			||||||
          const schema = {
 | 
					          const schema = {
 | 
				
			||||||
            type: 'string',
 | 
					            type: 'string',
 | 
				
			||||||
@ -627,7 +639,11 @@ export const useCustomBulkEditFormItemInitializerFields = (options?: any) => {
 | 
				
			|||||||
            },
 | 
					            },
 | 
				
			||||||
            schema,
 | 
					            schema,
 | 
				
			||||||
          } as SchemaInitializerItemOptions;
 | 
					          } as SchemaInitializerItemOptions;
 | 
				
			||||||
    });
 | 
					        }),
 | 
				
			||||||
 | 
					    [fields],
 | 
				
			||||||
 | 
					  );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  return filterFields;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const findSchema = (schema: Schema, key: string, action: string) => {
 | 
					const findSchema = (schema: Schema, key: string, action: string) => {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user