yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recompute layout sizes

Browse Source
This commit is contained in:
Alexandre Bodin 2019-07-24 12:14:53 +02:00
parent 175fba4441
commit 9876c339ce
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/getstarted/api/article/models/Article.settings.json
View File

@ -15,7 +15,7 @@
"type": "string"
},
"content": {
"type": "text"
"type": "string"
},
"published": {
"type": "boolean"

69
packages/strapi-plugin-content-manager/services/utils/configuration/layouts.js
View File

@ -56,25 +56,7 @@ function createDefaultEditLayout(schema) {
hasEditableAttribute(schema, name)
);
let layout = [[]];
let currentRowIndex = 0;
for (let key of keys) {
const attribute = schema.attributes[key];
const attributeSize = typeToSize(attribute.type);
let currenRowSize = rowSize(layout[currentRowIndex]);
if (currenRowSize + attributeSize > MAX_ROW_SIZE) {
currentRowIndex += 1;
layout[currentRowIndex] = [];
}
layout[currentRowIndex].push({
name: key,
size: attributeSize,
});
}
return layout;
return appendToEditLayout([], keys, schema);
}
/** Synchronisation functions */
@ -91,16 +73,29 @@ function syncLayouts(configuration, schema) {
hasRelationAttribute(schema, attr)
);
const cleanEdit = edit.reduce((acc, row) => {
let newRow = row.filter(el => hasEditableAttribute(schema, el.name));
let elementsToReAppend = [];
let cleanEdit = [];
for (let row of edit) {
let newRow = [];
// TODO: recompute row sizes
for (let el of row) {
if (!hasEditableAttribute(schema, el.name)) continue;
// if size of the element has changes (type change)
if (typeToSize(schema.attributes[el.name].type) !== el.size) {
elementsToReAppend.push(el.name);
continue;
}
newRow.push(el);
}
if (newRow.length > 0) {
acc.push(newRow);
cleanEdit.push(newRow);
}
return acc;
}, []);
}
cleanEdit = appendToEditLayout(cleanEdit, elementsToReAppend, schema);
let layout = {
list: cleanList.length > 0 ? cleanList : createDefaultListLayout(schema),
@ -144,25 +139,37 @@ function syncLayouts(configuration, schema) {
key => hasEditableAttribute(schema, key) && isVisible(schema, key)
);
let currentRowIndex = Math.max(layout.edit.length - 1, 0);
for (let key of newEditAttributes) {
layout.edit = appendToEditLayout(layout.edit, newEditAttributes, schema);
return layout;
}
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
let currentRowIndex = Math.max(layout.length - 1, 0);
// init currentRow if necessary
if (!layout[currentRowIndex]) {
layout[currentRowIndex] = [];
}
for (let key of keysToAppend) {
const attribute = schema.attributes[key];
const attributeSize = typeToSize(attribute.type);
let currenRowSize = rowSize(layout.edit[currentRowIndex]);
let currenRowSize = rowSize(layout[currentRowIndex]);
if (currenRowSize + attributeSize > MAX_ROW_SIZE) {
currentRowIndex += 1;
layout.edit[currentRowIndex] = [];
layout[currentRowIndex] = [];
}
layout.edit[currentRowIndex].push({
layout[currentRowIndex].push({
name: key,
size: attributeSize,
});
}
return layout;
}
};
const hasRelationAttribute = (schema, name) => {
if (!_.has(schema.attributes, name)) {