Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIO-9515 Fixed Edit grid conditional values not displayed in Edit sub… #5988

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 3 additions & 1 deletion src/components/_classes/component/Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,9 @@
const isConditionallyHidden = this.checkConditionallyHidden(data, row) || this._parentConditionallyHidden;
if (isConditionallyHidden !== this._conditionallyHidden) {
this._conditionallyHidden = isConditionallyHidden;
this.clearOnHide();
if (!this.root.pristine) {
this.clearOnHide();
}
}

// Check visibility
Expand Down Expand Up @@ -3039,7 +3041,7 @@

/**
* Returns if the value (e.g. array) should be divided between several inputs
* @returns {boolean}

Check warning on line 3044 in src/components/_classes/component/Component.js

View workflow job for this annotation

GitHub Actions / setup

Missing JSDoc @returns description
*/
isSingleInputValue() {
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/components/editgrid/EditGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ export default class EditGridComponent extends NestedArrayComponent {
}
};

if (_.isEmpty(rows)) {
if (!this.root.pristine && _.isEmpty(rows)) {
const rowComponents = this.createRowComponents({}, 0);
let checkComponent;

Expand Down
Loading