diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js index c2164ef039..c285cf3259 100644 --- a/frontend/src/_helpers/appUtils.js +++ b/frontend/src/_helpers/appUtils.js @@ -1671,6 +1671,10 @@ export const buildComponentMetaDefinition = (components = {}) => { ...componentMeta.definition.styles, ...currentComponentData?.component.definition.styles, }, + generalStyles: { + ...componentMeta.definition.generalStyles, + ...currentComponentData?.component.definition.generalStyles, + }, validations: { ...componentMeta.definition.validations, ...currentComponentData?.component.definition.validations, diff --git a/server/migrations/1691006952074-CreateComponentTable.ts b/server/migrations/1691006952074-CreateComponentTable.ts index 9cbb1e9148..22024ccdda 100644 --- a/server/migrations/1691006952074-CreateComponentTable.ts +++ b/server/migrations/1691006952074-CreateComponentTable.ts @@ -42,6 +42,11 @@ export class CreateComponentTable1691006952074 implements MigrationInterface { type: 'json', isNullable: true, }, + { + name: 'general_styles', + type: 'json', + isNullable: true, + }, { name: 'validations', type: 'json', diff --git a/server/src/entities/component.entity.ts b/server/src/entities/component.entity.ts index aa87cc3ae9..46010cb545 100644 --- a/server/src/entities/component.entity.ts +++ b/server/src/entities/component.entity.ts @@ -36,6 +36,9 @@ export class Component { @Column('simple-json') styles: any; + @Column('simple-json', { name: 'general_styles', nullable: true }) + generalStyles: any; + @Column('simple-json') validations: any; diff --git a/server/src/services/components.service.ts b/server/src/services/components.service.ts index 035bade102..7cbd335357 100644 --- a/server/src/services/components.service.ts +++ b/server/src/services/components.service.ts @@ -203,7 +203,7 @@ export class ComponentsService { } createComponentWithLayout(componentData, layoutData) { - const { id, name, properties, styles, validations, parent } = componentData; + const { id, name, properties, styles, generalStyles, validations, parent } = componentData; const { type, top, left, width, height } = layoutData; const componentWithLayout = { @@ -214,6 +214,7 @@ export class ComponentsService { definition: { properties, styles, + generalStyles, validations, }, parent,