Skip to content

Commit 891b699

Browse files
author
Philipp Eichhorn
committed
Merge branch 'fixes'
2 parents 8c6400f + f35e018 commit 891b699

18 files changed

+18
-18
lines changed

dist/formio.contrib.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.contrib.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.embed.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.embed.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.form.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.form.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.full.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formio.full.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/components/datagrid/DataGrid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ function (_NestedComponent) {
498498
}
499499

500500
this.component.components.forEach(function (col) {
501-
var showColumn = false;
501+
var showColumn = !_this8.rows.length;
502502

503503
_this8.rows.forEach(function (comps) {
504504
if (comps && comps[col.key] && typeof comps[col.key].checkConditions === 'function') {

lib/dist/formio.contrib.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.contrib.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.embed.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.embed.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.form.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.form.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.full.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/dist/formio.full.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/datagrid/DataGrid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ export default class DataGridComponent extends NestedComponent {
384384
this.visibleColumns = {};
385385
}
386386
this.component.components.forEach((col) => {
387-
let showColumn = false;
387+
let showColumn = !this.rows.length;
388388
this.rows.forEach((comps) => {
389389
if (comps && comps[col.key] && typeof comps[col.key].checkConditions === 'function') {
390390
showColumn |= comps[col.key].checkConditions(data);

0 commit comments

Comments
 (0)