mirror of
https://github.com/nocobase/nocobase
synced 2024-11-16 03:35:10 +00:00
Merge branch 'T-2771' into T-2327-and-2771
This commit is contained in:
commit
c80b67380b
@ -17,7 +17,7 @@ export const checkbox: IField = {
|
||||
'x-component': 'Checkbox',
|
||||
},
|
||||
},
|
||||
availableTypes: ['boolean'],
|
||||
availableTypes: ['boolean', 'integer', 'bigInt'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -21,7 +21,7 @@ export const datetime: IField = {
|
||||
},
|
||||
},
|
||||
},
|
||||
availableTypes: ['date'],
|
||||
availableTypes: ['date', 'dateOnly'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -42,7 +42,7 @@ export const json: IField = {
|
||||
default: null,
|
||||
},
|
||||
},
|
||||
availableTypes: ['json', 'array', 'jsonb'],
|
||||
availableTypes: ['json', 'array', 'jsonb', 'text', 'circle', 'lineString', 'point', 'polygon'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -18,7 +18,7 @@ export const markdown: IField = {
|
||||
'x-component': 'Markdown',
|
||||
},
|
||||
},
|
||||
availableTypes: ['text'],
|
||||
availableTypes: ['text', 'json'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -23,7 +23,7 @@ export const number: IField = {
|
||||
},
|
||||
},
|
||||
},
|
||||
availableTypes: ['double', 'float'],
|
||||
availableTypes: ['double', 'float', 'decimal'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -189,6 +189,7 @@ export const oho: IField = {
|
||||
title: '{{t("One to one (has one)")}}',
|
||||
description: '{{t("One to one description")}}',
|
||||
isAssociation: true,
|
||||
availableTypes: ['hasOne'],
|
||||
default: {
|
||||
type: 'hasOne',
|
||||
// name,
|
||||
@ -392,6 +393,7 @@ export const obo: IField = {
|
||||
},
|
||||
},
|
||||
},
|
||||
availableTypes: ['belongsTo'],
|
||||
schemaInitialize(schema: ISchema, { field, block, readPretty, action, targetCollection }) {
|
||||
// schema['type'] = 'object';
|
||||
if (['Table', 'Kanban'].includes(block)) {
|
||||
|
@ -76,7 +76,7 @@ export const percent: IField = {
|
||||
width: '100%',
|
||||
};
|
||||
},
|
||||
availableTypes: ['float'],
|
||||
availableTypes: ['float', 'double', 'decimal'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -18,7 +18,7 @@ export const radioGroup: IField = {
|
||||
'x-component': 'Radio.Group',
|
||||
},
|
||||
},
|
||||
availableTypes: ['string'],
|
||||
availableTypes: ['string', 'integer', 'boolean', 'integer'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -19,7 +19,7 @@ export const richText: IField = {
|
||||
'x-component': 'RichText',
|
||||
},
|
||||
},
|
||||
availableTypes: ['text'],
|
||||
availableTypes: ['text', 'json'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -20,7 +20,7 @@ export const select: IField = {
|
||||
enum: [],
|
||||
},
|
||||
},
|
||||
availableTypes: ['string'],
|
||||
availableTypes: ['string', 'bigInt', 'boolean'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
@ -19,7 +19,7 @@ export const textarea: IField = {
|
||||
'x-component': 'Input.TextArea',
|
||||
},
|
||||
},
|
||||
availableTypes: ['text'],
|
||||
availableTypes: ['text', 'json'],
|
||||
hasDefaultValue: true,
|
||||
properties: {
|
||||
...defaultProps,
|
||||
|
Loading…
Reference in New Issue
Block a user