refactor:the default value of the built-in field should not be required (#2115)
* fix: the default value of the built-in field in users collection should not be required * refactor: code improve * fix: the default value of the built-in field in users collection should not be required * refactor: code improve
This commit is contained in:
		
							parent
							
								
									1ea1e903ed
								
							
						
					
					
						commit
						cd3c93a11d
					
				@ -9,11 +9,11 @@ import { useTranslation } from 'react-i18next';
 | 
				
			|||||||
import { useRequest } from '../../api-client';
 | 
					import { useRequest } from '../../api-client';
 | 
				
			||||||
import { RecordProvider, useRecord } from '../../record-provider';
 | 
					import { RecordProvider, useRecord } from '../../record-provider';
 | 
				
			||||||
import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
 | 
					import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
 | 
				
			||||||
import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 | 
					 | 
				
			||||||
import { useCancelAction } from '../action-hooks';
 | 
					import { useCancelAction } from '../action-hooks';
 | 
				
			||||||
import { useCollectionManager } from '../hooks';
 | 
					import { useCollectionManager } from '../hooks';
 | 
				
			||||||
import useDialect from '../hooks/useDialect';
 | 
					import useDialect from '../hooks/useDialect';
 | 
				
			||||||
import { IField } from '../interfaces/types';
 | 
					import { IField } from '../interfaces/types';
 | 
				
			||||||
 | 
					import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 | 
				
			||||||
import * as components from './components';
 | 
					import * as components from './components';
 | 
				
			||||||
import { getOptions } from './interfaces';
 | 
					import { getOptions } from './interfaces';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -26,6 +26,7 @@ const getSchema = (schema: IField, record: any, compile) => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  if (schema.hasDefaultValue === true) {
 | 
					  if (schema.hasDefaultValue === true) {
 | 
				
			||||||
    properties['defaultValue'] = cloneDeep(schema?.default?.uiSchema);
 | 
					    properties['defaultValue'] = cloneDeep(schema?.default?.uiSchema);
 | 
				
			||||||
 | 
					    properties.defaultValue.required = false;
 | 
				
			||||||
    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
 | 
					    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
 | 
				
			||||||
    properties['defaultValue']['x-decorator'] = 'FormItem';
 | 
					    properties['defaultValue']['x-decorator'] = 'FormItem';
 | 
				
			||||||
    properties['defaultValue']['x-reactions'] = {
 | 
					    properties['defaultValue']['x-reactions'] = {
 | 
				
			||||||
 | 
				
			|||||||
@ -8,11 +8,11 @@ import { useTranslation } from 'react-i18next';
 | 
				
			|||||||
import { useAPIClient, useRequest } from '../../api-client';
 | 
					import { useAPIClient, useRequest } from '../../api-client';
 | 
				
			||||||
import { RecordProvider, useRecord } from '../../record-provider';
 | 
					import { RecordProvider, useRecord } from '../../record-provider';
 | 
				
			||||||
import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
 | 
					import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
 | 
				
			||||||
import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 | 
					 | 
				
			||||||
import { useCancelAction, useUpdateAction } from '../action-hooks';
 | 
					import { useCancelAction, useUpdateAction } from '../action-hooks';
 | 
				
			||||||
import { useCollectionManager } from '../hooks';
 | 
					import { useCollectionManager } from '../hooks';
 | 
				
			||||||
import useDialect from '../hooks/useDialect';
 | 
					import useDialect from '../hooks/useDialect';
 | 
				
			||||||
import { IField } from '../interfaces/types';
 | 
					import { IField } from '../interfaces/types';
 | 
				
			||||||
 | 
					import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 | 
				
			||||||
import * as components from './components';
 | 
					import * as components from './components';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const getSchema = (schema: IField, record: any, compile, getContainer): ISchema => {
 | 
					const getSchema = (schema: IField, record: any, compile, getContainer): ISchema => {
 | 
				
			||||||
@ -26,6 +26,7 @@ const getSchema = (schema: IField, record: any, compile, getContainer): ISchema
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  if (schema.hasDefaultValue === true) {
 | 
					  if (schema.hasDefaultValue === true) {
 | 
				
			||||||
    properties['defaultValue'] = cloneDeep(schema.default.uiSchema) || {};
 | 
					    properties['defaultValue'] = cloneDeep(schema.default.uiSchema) || {};
 | 
				
			||||||
 | 
					    properties.defaultValue.required = false;
 | 
				
			||||||
    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
 | 
					    properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
 | 
				
			||||||
    properties['defaultValue']['x-decorator'] = 'FormItem';
 | 
					    properties['defaultValue']['x-decorator'] = 'FormItem';
 | 
				
			||||||
    properties['defaultValue']['x-reactions'] = {
 | 
					    properties['defaultValue']['x-reactions'] = {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user