Skip to content

Commit

Permalink
Merge pull request #1749 from comindware/2.1/propertyTypes
Browse files Browse the repository at this point in the history 
Change property types
  • Loading branch information
@stasguryev
stasguryev committed Jul 6, 2022
2 parents 87b6f32 + df2fb60 commit 15d0fb0
Show file tree
Hide file tree
Showing 25 changed files with 261 additions and 1,406 deletions.
16 changes: 8 additions & 8 deletions demo/app/cases/editors/ContextEditor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function() {
'oa.1': [
{
instanceTypeId: 'cmw.instanceProperty',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'ID',
displayAttribute: false,
Expand All @@ -21,7 +21,7 @@ export default function() {
alias: 'id_alias'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Last Modifier',
displayAttribute: false,
Expand All @@ -46,7 +46,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand All @@ -59,7 +59,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'refToCol',
displayAttribute: false,
Expand Down Expand Up @@ -95,7 +95,7 @@ export default function() {
alias: 'isDisabled_alias'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Creator',
displayAttribute: false,
Expand All @@ -120,7 +120,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'sdfsf',
displayAttribute: false,
Expand All @@ -133,7 +133,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand Down Expand Up @@ -169,7 +169,7 @@ export default function() {
alias: 'id_alias'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Process Initiator',
displayAttribute: false,
Expand Down
16 changes: 8 additions & 8 deletions demo/app/cases/editors/MultiEditorEditor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function() {
'oa.1': [
{
instanceTypeId: 'cmw.instanceProperty',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'ID',
displayAttribute: false,
Expand All @@ -31,7 +31,7 @@ export default function() {
id: 'id'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Last Modifier',
displayAttribute: false,
Expand All @@ -54,7 +54,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand All @@ -66,7 +66,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'refToCol',
displayAttribute: false,
Expand Down Expand Up @@ -99,7 +99,7 @@ export default function() {
id: 'isDisabled'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Creator',
displayAttribute: false,
Expand All @@ -122,7 +122,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'sdfsf',
displayAttribute: false,
Expand All @@ -134,7 +134,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand Down Expand Up @@ -167,7 +167,7 @@ export default function() {
id: 'id'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Process Initiator',
displayAttribute: false,
Expand Down
20 changes: 10 additions & 10 deletions demo/app/cases/list/compactGrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function() {
{
key: 'textCell',
type: 'Datalist',
dataType: 'Instance',
dataType: Core.meta.objectPropertyTypes.INSTANCE,
title: 'TextCell',
sorting: 'asc',
editable: true,
Expand Down Expand Up @@ -79,7 +79,7 @@ export default function() {
},
{
key: 'documentCell',
type: 'Document',
type: Core.meta.objectPropertyTypes.DOCUMENT,
title: 'Document Cell',
editable: true,
width: 100
Expand Down Expand Up @@ -109,7 +109,7 @@ export default function() {
'oa.1': [
{
instanceTypeId: 'cmw.instanceProperty',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'ID',
displayAttribute: false,
Expand All @@ -120,7 +120,7 @@ export default function() {
id: 'id'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Last Modifier',
displayAttribute: false,
Expand All @@ -143,7 +143,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand All @@ -155,7 +155,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'refToCol',
displayAttribute: false,
Expand Down Expand Up @@ -188,7 +188,7 @@ export default function() {
id: 'isDisabled'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Creator',
displayAttribute: false,
Expand All @@ -211,7 +211,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'sdfsf',
displayAttribute: false,
Expand All @@ -223,7 +223,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand Down Expand Up @@ -256,7 +256,7 @@ export default function() {
id: 'id'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Process Initiator',
displayAttribute: false,
Expand Down
22 changes: 11 additions & 11 deletions demo/app/cases/list/complexGrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function() {
case 5:
return 'Reference';
case 6:
return 'Document';
return Core.meta.objectPropertyTypes.DOCUMENT;
case 7:
return 'Boolean';
case 0:
Expand Down Expand Up @@ -197,12 +197,12 @@ export default function() {
title: 'Reference Cell',
helpText: 'Reference Cell',
editable: true,
dataType: 'Instance',
dataType: Core.meta.objectPropertyTypes.INSTANCE,
width: 100
},
{
key: 'documentCell',
type: 'Document',
type: Core.meta.objectPropertyTypes.DOCUMENT,
title: 'Document Cell',
helpText: 'Document Cell',
editable: true,
Expand Down Expand Up @@ -254,7 +254,7 @@ export default function() {
'oa.1': [
{
instanceTypeId: 'cmw.instanceProperty',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'ID',
displayAttribute: false,
Expand All @@ -265,7 +265,7 @@ export default function() {
id: 'id'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Last Modifier',
displayAttribute: false,
Expand All @@ -288,7 +288,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand All @@ -300,7 +300,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'refToCol',
displayAttribute: false,
Expand Down Expand Up @@ -333,7 +333,7 @@ export default function() {
id: 'isDisabled'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Creator',
displayAttribute: false,
Expand All @@ -356,7 +356,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'sdfsf',
displayAttribute: false,
Expand All @@ -368,7 +368,7 @@ export default function() {
},
{
instanceTypeId: 'oa.1',
type: 'Instance',
type: Core.meta.objectPropertyTypes.INSTANCE,
format: 'Undefined',
name: 'coll',
displayAttribute: false,
Expand Down Expand Up @@ -401,7 +401,7 @@ export default function() {
id: 'id'
},
{
type: 'Account',
type: Core.meta.objectPropertyTypes.ACCOUNT,
format: 'Undefined',
name: 'Process Initiator',
displayAttribute: false,
Expand Down
8 changes: 4 additions & 4 deletions demo/app/cases/list/editableGrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,16 @@ export default () => {
{
key: 'documentCell',
type: 'Datalist',
dataType: 'Document',
dataType: Core.meta.objectPropertyTypes.DOCUMENT,
format: 'document',
title: 'Document',
title: Core.meta.objectPropertyTypes.DOCUMENT,
editable: true,
autocommit: true
},
{
key: 'referenceCell',
type: 'Datalist',
dataType: 'Instance',
dataType: Core.meta.objectPropertyTypes.INSTANCE,
title: 'Reference Cell',
required: true,
controller: new Core.form.editors.reference.controllers.DemoReferenceEditorController({
Expand All @@ -165,7 +165,7 @@ export default () => {
{
key: 'userCell',
type: 'Datalist',
dataType: 'Account',
dataType: Core.meta.objectPropertyTypes.ACCOUNT,
title: 'User Cell',
required: true,
controller: new Core.form.editors.reference.controllers.DemoReferenceEditorController({
Expand Down
Loading

0 comments on commit 15d0fb0

Please sign in to comment.