Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/sails-ng-common/src/config/component/tab.model.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
FieldComponentConfigKind, FieldComponentDefinitionKind, FieldLayoutConfigKind, FieldLayoutDefinitionKind,
FormComponentDefinitionKind
FormComponentDefinitionKind, KeyValueStringProperty
} from "../shared.outline";
import {
ButtonSectionAriaOrientationOptionsType,
Expand Down Expand Up @@ -44,9 +44,10 @@ export class TabFieldComponentDefinition extends FieldComponentDefinition implem


export class TabFieldLayoutConfig extends FieldLayoutConfig implements TabFieldLayoutConfigOutline {
buttonSectionCssClass?: string;
tabPaneCssClass?: string;
tabPaneActiveCssClass?: string;
hostCssClasses?: KeyValueStringProperty = 'd-flex align-items-start';
buttonSectionCssClass?: string = 'nav flex-column nav-pills me-5';
tabPaneCssClass?: string = 'tab-pane fade';
tabPaneActiveCssClass?: string = 'active show';
buttonSectionAriaOrientation?: ButtonSectionAriaOrientationOptionsType = 'vertical';

constructor() {
Expand Down
8 changes: 7 additions & 1 deletion packages/sails-ng-common/src/config/visitor/base.model.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {get as _get} from "lodash";
import {FormConfigFrame, FormConfigOutline} from "../form-config.outline";
import {FormConfigOutline} from "../form-config.outline";
import {CanVisit, FormConfigVisitorOutline} from "./base.outline";
import {
SimpleInputFieldComponentDefinitionOutline,
Expand Down Expand Up @@ -430,6 +430,12 @@ export class PopulateProperties {
}

const propValue = [target, ...sources].findLast(val => val?.[name] !== undefined)?.[name];

// for debugging:
// if (name === 'options') {
// console.log(`Get property ${JSON.stringify(name)} from sources ${JSON.stringify(sources)} for target ${JSON.stringify(target)} propValue ${JSON.stringify(propValue)}.`);
// }

if (propValue !== undefined) {
target[name] = propValue;
}
Expand Down
Loading