|
|
@@ -1912,7 +1912,7 @@ var TableAjax = function() {
|
|
|
ReactDOM.render(
|
|
|
h(P5UI__TableAjaxSortableLabel, {
|
|
|
namespace: priv.options.namespace,
|
|
|
- isSortable: (props.type != 'special' && props.type != 'geom' && props.type != "simpleLink" && props.type != "ref"), // TODO: props.isSortable
|
|
|
+ isSortable: (props.sortable !== false && props.type != 'special' && props.type != 'geom' && props.type != "simpleLink" && props.type != "ref"), // TODO: props.sortable
|
|
|
fieldName: column,
|
|
|
fieldProps: props,
|
|
|
store: priv.options.filterStore,
|
|
|
@@ -2004,6 +2004,7 @@ var TableAjax = function() {
|
|
|
headCell.css({padding: '0'});
|
|
|
if (i == 1) headCell.addClass('stickyCol stickyCol3');
|
|
|
|
|
|
+ if (props.filterable === false) continue;
|
|
|
ReactDOM.render(
|
|
|
h(p5UI__FieldInputFilterSearch, {
|
|
|
disabled: (priv.options.forceFilterInit && undefined !== priv.options.forceFilterInit[column]),
|