diff --git a/api-generator/components/dataviewlayoutoptions.js b/api-generator/components/dataviewlayoutoptions.js deleted file mode 100644 index de107d347..000000000 --- a/api-generator/components/dataviewlayoutoptions.js +++ /dev/null @@ -1,35 +0,0 @@ -const DataViewLayoutOptionsProps = [ - { - name: 'modelValue', - type: 'string', - default: 'null', - description: 'Value of the component.' - }, - { - name: 'pt', - type: 'any', - default: 'null', - description: 'Used to pass attributes to DOM elements inside the component.' - } -]; - -const DataViewLayoutOptionsSlots = [ - { - name: 'listicon', - description: 'Custom list icon template.' - }, - { - name: 'gridicon', - description: 'Custom grid icon template.' - } -]; - -module.exports = { - dataviewlayoutoptions: { - name: 'DataViewLayoutOptions', - description: 'When both layout modes are enabled in DataView, a UI element would be necessary to let the user toggle between the view. DataViewLayoutOptions is a helper component to display a buttonset to choose the layout mode in DataView.', - 'doc-url': 'dataview', - props: DataViewLayoutOptionsProps, - slots: DataViewLayoutOptionsSlots - } -}; diff --git a/components/doc/codeeditor/templates.js b/components/doc/codeeditor/templates.js index bab0b1c44..c3a2d48b8 100644 --- a/components/doc/codeeditor/templates.js +++ b/components/doc/codeeditor/templates.js @@ -173,7 +173,6 @@ import ConfirmationService from 'primevue/confirmationservice'; import ContextMenu from 'primevue/contextmenu'; import DataTable from 'primevue/datatable'; import DataView from 'primevue/dataview'; -import DataViewLayoutOptions from 'primevue/dataviewlayoutoptions'; import DeferredContent from 'primevue/deferredcontent'; import Dialog from 'primevue/dialog'; import DialogService from 'primevue/dialogservice' @@ -294,7 +293,6 @@ app.component('ConfirmPopup', ConfirmPopup); app.component('ContextMenu', ContextMenu); app.component('DataTable', DataTable); app.component('DataView', DataView); -app.component('DataViewLayoutOptions', DataViewLayoutOptions); app.component('DeferredContent', DeferredContent); app.component('Dialog', Dialog); app.component('Divider', Divider); diff --git a/components/lib/config/PrimeVue.d.ts b/components/lib/config/PrimeVue.d.ts index 178295e11..e0d1ad714 100644 --- a/components/lib/config/PrimeVue.d.ts +++ b/components/lib/config/PrimeVue.d.ts @@ -26,7 +26,6 @@ import { ConfirmPopupPassThroughOptions } from '../confirmpopup'; import { ContextMenuPassThroughOptions } from '../contextmenu'; import { DataTablePassThroughOptions } from '../datatable'; import { DataViewPassThroughOptions } from '../dataview'; -import { DataViewLayoutOptionsPassThroughOptions } from '../dataviewlayoutoptions'; import { DeferredContentPassThroughOptions } from '../deferredcontent'; import { DialogPassThroughOptions } from '../dialog'; import { DividerPassThroughOptions } from '../divider'; @@ -148,7 +147,6 @@ export interface PrimeVuePTOptions { contextmenu?: DefaultPassThrough; datatable?: DefaultPassThrough; dataview?: DefaultPassThrough; - dataviewlayoutoptions?: DefaultPassThrough; deferredcontent?: DefaultPassThrough; divider?: DefaultPassThrough; dialog?: DefaultPassThrough; diff --git a/components/lib/datatable/BaseDataTable.vue b/components/lib/datatable/BaseDataTable.vue index 590947023..fbedabd19 100644 --- a/components/lib/datatable/BaseDataTable.vue +++ b/components/lib/datatable/BaseDataTable.vue @@ -273,6 +273,17 @@ export default { filterInputProps: { type: null, default: null + }, + filterButtonProps: { + type: Object, + default() { + return { + addRule: { severity: 'info', text: true, size: 'small' }, + removeRule: { severity: 'danger', text: true, size: 'small' }, + apply: { size: 'small' }, + clear: { outlined: true, size: 'small' } + }; + } } }, style: DataTableStyle, diff --git a/components/lib/datatable/ColumnFilter.vue b/components/lib/datatable/ColumnFilter.vue index 3dc30d850..d16f506a1 100644 --- a/components/lib/datatable/ColumnFilter.vue +++ b/components/lib/datatable/ColumnFilter.vue @@ -94,9 +94,7 @@ @click="removeConstraint(i)" :label="removeRuleButtonLabel" :unstyled="unstyled" - text - severity="danger" - size="small" + v-bind="filterButtonProps.removeRule" :pt="getColumnPT('filterRemoveButton')" >