yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 00:09:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

init component attribute first step

Browse Source
This commit is contained in:
ronronscelestes 2021-10-21 19:48:10 +02:00
parent 0368e09f42
commit a891d1f70f
2 changed files with 88 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/content-type-builder/admin/src/components/FormModal/index.js
View File

@ -1046,13 +1046,16 @@ const FormModal = () => {
categoryName={initialData.name}
isAttributeModal={modalType === 'attribute'}
isContentTypeModal={modalType === 'contentType'}
isComponentAttribute={attributeType === 'component'}
isComponentModal={modalType === 'component'}
isCreatingContentType={actionType === 'create'}
isCreatingComponent={actionType === 'create'}
isCreatingComponentAttribute={modifiedData.createComponent || false}
isEditingAttribute={actionType === 'edit'}
isEditingCategory={modalType === 'editCategory'}
onSubmitCreateContentType={handleSubmit}
onSubmitCreateComponent={handleSubmit}
onSubmitCreateComponentAttribute={handleSubmit}
onSubmitEditAttribute={handleSubmit}
onSubmitEditCategory={handleSubmit}
onSubmitEditContentType={handleSubmit}

135
packages/core/content-type-builder/admin/src/components/FormModalEndActions/index.js
View File

@ -20,75 +20,51 @@ const FormModalEndActions = ({
isEditingAttribute,
isContentTypeModal,
isCreatingContentType,
isComponentAttribute,
isCreatingComponent,
isCreatingComponentAttribute,
isComponentModal,
isEditingCategory,
onSubmitEditAttribute,
onSubmitCreateContentType,
onSubmitCreateComponent,
onSubmitCreateComponentAttribute,
onSubmitEditCategory,
onSubmitEditContentType,
onSubmitEditComponent,
}) => {
const { formatMessage } = useIntl();
// TO DO
// component attribute
// dz attribute
if (isComponentModal) {
console.log('is component modal');
if (isAttributeModal && isComponentAttribute) {
console.log('is component attribute');
return (
<>
{!isCreatingComponent && (
<>
<Button
type="button"
variant="danger"
onClick={e => {
e.preventDefault();
deleteComponent();
}}
>
{formatMessage({
id: getTrad('form.button.delete'),
defaultMessage: 'Delete',
})}
</Button>
<Button
type="submit"
variant="default"
onClick={e => {
e.preventDefault();
<Button
variant="secondary"
type="submit"
onClick={e => {
e.preventDefault();
onSubmitEditComponent(e, false);
}}
>
{formatMessage({
id: getTrad('form.button.finish'),
defaultMessage: 'Finish',
})}
</Button>
</>
)}
{isCreatingComponent && (
<Button
type="submit"
variant="secondary"
onClick={e => {
e.preventDefault();
onSubmitCreateComponent(e, true);
}}
>
{formatMessage({
id: getTrad('form.button.continue'),
defaultMessage: 'Continue',
onSubmitCreateComponentAttribute(e, true);
}}
>
{isCreatingComponentAttribute
? formatMessage({
id: getTrad('form.button.configure-component'),
defaultMessage: 'Configure the component',
})
: formatMessage({
id: getTrad('form.button.select-component'),
defaultMessage: 'Configure the component',
})}
</Button>
)}
</>
</Button>
);
}
if (isAttributeModal) {
if (isAttributeModal && !isComponentAttribute) {
console.log('is attribute modal');
return (
@ -182,6 +158,62 @@ const FormModalEndActions = ({
);
}
if (isComponentModal) {
console.log('is component modal');
return (
<>
{!isCreatingComponent && (
<>
<Button
type="button"
variant="danger"
onClick={e => {
e.preventDefault();
deleteComponent();
}}
>
{formatMessage({
id: getTrad('form.button.delete'),
defaultMessage: 'Delete',
})}
</Button>
<Button
type="submit"
variant="default"
onClick={e => {
e.preventDefault();
onSubmitEditComponent(e, false);
}}
>
{formatMessage({
id: getTrad('form.button.finish'),
defaultMessage: 'Finish',
})}
</Button>
</>
)}
{isCreatingComponent && (
<Button
type="submit"
variant="secondary"
onClick={e => {
e.preventDefault();
onSubmitCreateComponent(e, true);
}}
>
{formatMessage({
id: getTrad('form.button.continue'),
defaultMessage: 'Continue',
})}
</Button>
)}
</>
);
}
if (isEditingCategory) {
console.log('is editing category');
@ -241,12 +273,15 @@ FormModalEndActions.propTypes = {
isContentTypeModal: PropTypes.bool.isRequired,
isCreatingContentType: PropTypes.bool.isRequired,
isCreatingComponent: PropTypes.bool.isRequired,
isComponentAttribute: PropTypes.bool.isRequired,
isCreatingComponentAttribute: PropTypes.bool.isRequired,
isComponentModal: PropTypes.bool.isRequired,
isEditingAttribute: PropTypes.bool.isRequired,
isEditingCategory: PropTypes.bool.isRequired,
onSubmitEditAttribute: PropTypes.func.isRequired,
onSubmitCreateContentType: PropTypes.func.isRequired,
onSubmitCreateComponent: PropTypes.func.isRequired,
onSubmitCreateComponentAttribute: PropTypes.func.isRequired,
onSubmitEditCategory: PropTypes.func.isRequired,
onSubmitEditContentType: PropTypes.func.isRequired,
onSubmitEditComponent: PropTypes.func.isRequired,