Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 01:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes: updating general styles of a component

Browse source
This commit is contained in:
arpitnath 2023-09-29 18:08:05 +05:30
parent 75de12ccd5
commit f678131136
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/_helpers/appUtils.js
View file

@ -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,

5
server/migrations/1691006952074-CreateComponentTable.ts
View file

@ -42,6 +42,11 @@ export class CreateComponentTable1691006952074 implements MigrationInterface {
type: 'json',
isNullable: true,
},
{
name: 'general_styles',
type: 'json',
isNullable: true,
},
{
name: 'validations',
type: 'json',

3
server/src/entities/component.entity.ts
View file

@ -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;

3
server/src/services/components.service.ts
View file

@ -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,