Merge branch 'develop' into feat/gui-v2-form-view

This commit is contained in:
Wing-Kam Wong
2022-08-10 15:50:42 +08:00
46 changed files with 276 additions and 259 deletions

View File

@@ -1334,7 +1334,7 @@
"type": "object",
"properties": {
"order": {
"type": "string"
"type": "number"
}
}
}
@@ -1506,7 +1506,7 @@
"type": "object",
"properties": {
"order": {
"type": "string"
"type": "number"
},
"title": {
"type": "string"
@@ -6011,7 +6011,8 @@
"type": "string"
},
"title": {
"type": "string"
"type": "string",
"required": true
},
"deleted": {
"type": "boolean"
@@ -6233,6 +6234,9 @@
"order": {
"type": "number"
},
"mm": {
"type": "boolean"
},
"columns": {
"type": "array",
"items": {
@@ -6579,6 +6583,13 @@
"order": {
"type": "number"
},
"system": {
"type": [
"number",
"boolean"
]
},
"meta": {},
"colOptions": {
"oneOf": [
{