Compare commits

..

No commits in common. "4fbb434103565a1272437d2ff277576fcef86779" and "9e65f6d46df33abfc6c52cc3b4a989ffd9eb1252" have entirely different histories.

4 changed files with 24 additions and 30 deletions

View File

@ -121,9 +121,7 @@ const DocumentSizeInfo = () => {
}} }}
editLoading={objectFormState.editLoading} editLoading={objectFormState.editLoading}
formValid={objectFormState.formValid} formValid={objectFormState.formValid}
disabled={ disabled={objectFormState.beingEditedByOther || objectFormState.loading}
objectFormState.beingEditedByOther || objectFormState.loading
}
loading={objectFormState.editLoading} loading={objectFormState.editLoading}
/> />
</Space> </Space>
@ -156,7 +154,6 @@ const DocumentSizeInfo = () => {
loading={loading} loading={loading}
indicator={<LoadingOutlined />} indicator={<LoadingOutlined />}
isEditing={isEditing} isEditing={isEditing}
labelWidth={160}
type='documentSize' type='documentSize'
objectData={objectData} objectData={objectData}
/> />

View File

@ -126,9 +126,7 @@ const DocumentTemplateInfo = () => {
}} }}
editLoading={objectFormState.editLoading} editLoading={objectFormState.editLoading}
formValid={objectFormState.formValid} formValid={objectFormState.formValid}
disabled={ disabled={objectFormState.beingEditedByOther || objectFormState.loading}
objectFormState.beingEditedByOther || objectFormState.loading
}
loading={objectFormState.editLoading} loading={objectFormState.editLoading}
/> />
</Space> </Space>
@ -169,7 +167,7 @@ const DocumentTemplateInfo = () => {
content: false, content: false,
testObject: false testObject: false
}} }}
labelWidth='190px' labelWidth='175px'
/> />
) )
}} }}

View File

@ -84,13 +84,6 @@ export const DocumentJob = {
readOnly: true, readOnly: true,
columnWidth: 180 columnWidth: 180
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: 'name', name: 'name',
label: 'Name', label: 'Name',
@ -104,7 +97,13 @@ export const DocumentJob = {
} }
} }
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: 'state', name: 'state',
label: 'Status', label: 'Status',

View File

@ -98,13 +98,6 @@ export const DocumentSize = {
readOnly: true, readOnly: true,
columnWidth: 180 columnWidth: 180
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: 'name', name: 'name',
label: 'Name', label: 'Name',
@ -114,11 +107,11 @@ export const DocumentSize = {
columnFixed: 'left' columnFixed: 'left'
}, },
{ {
name: 'infiniteHeight', name: 'updatedAt',
label: 'Infinite Height', label: 'Updated At',
required: true, type: 'dateTime',
columnWidth: 150, readOnly: true,
type: 'bool' columnWidth: 175
}, },
{ {
name: 'width', name: 'width',
@ -135,9 +128,16 @@ export const DocumentSize = {
columnWidth: 150, columnWidth: 150,
type: 'number', type: 'number',
suffix: 'mm', suffix: 'mm',
visible: (objectData) => { disabled: (objectData) => {
return !objectData.infiniteHeight return objectData.infiniteHeight
} }
},
{
name: 'infiniteHeight',
label: 'Infinite Height',
required: true,
columnWidth: 150,
type: 'bool'
} }
] ]
} }