diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx index 586a550fc..46f3988da 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx @@ -161,7 +161,7 @@ FormItem.Designer = function Designer() { const fieldMode = field?.componentProps?.['mode'] || (isFileField ? 'FileManager' : 'Select'); const isSelectFieldMode = fieldMode === 'Select'; const sort = defaultSort?.map((item: string) => { - return item.startsWith('-') + return item?.startsWith('-') ? { field: item.substring(1), direction: 'desc', @@ -494,6 +494,7 @@ FormItem.Designer = function Designer() { field: { type: 'string', enum: sortFields, + required: true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': { diff --git a/packages/core/client/src/schema-component/antd/form-v2/Form.Designer.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.Designer.tsx index 8e1ccc12d..e0b8a3b54 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/Form.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/Form.Designer.tsx @@ -158,6 +158,7 @@ export const DetailsDesigner = () => { field: { type: 'string', enum: sortFields, + required: true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': { diff --git a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx index 7a0ff54a0..a224dd29e 100644 --- a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx @@ -155,6 +155,7 @@ export const GridCardDesigner = () => { field: { type: 'string', enum: sortFields, + required:true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': { 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 bfa4c24a0..d8478b8d4 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 @@ -29,7 +29,7 @@ export const TableBlockDesigner = () => { const defaultResource = fieldSchema?.['x-decorator-props']?.resource; const supportTemplate = !fieldSchema?.['x-decorator-props']?.disableTemplate; const sort = defaultSort?.map((item: string) => { - return item.startsWith('-') + return item?.startsWith('-') ? { field: item.substring(1), direction: 'desc', @@ -151,6 +151,7 @@ export const TableBlockDesigner = () => { field: { type: 'string', enum: sortFields, + required:true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': { diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx index bfa016363..8532c16e1 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx @@ -133,6 +133,7 @@ export const TableSelectorDesigner = () => { field: { type: 'string', enum: sortFields, + required:true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': { diff --git a/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx index 238cf2bbe..3663b87bf 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx @@ -107,6 +107,7 @@ export const TableVoidDesigner = () => { field: { type: 'string', enum: sortFields, + required:true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': { diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx index 75a695cb6..96f80c50c 100644 --- a/packages/core/client/src/schema-settings/SchemaSettings.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx @@ -897,6 +897,7 @@ SchemaSettings.DefaultSortingRules = function DefaultSortingRules(props) { field: { type: 'string', enum: sortFields, + required:true, 'x-decorator': 'FormItem', 'x-component': 'Select', 'x-component-props': {