Refactor #5612
parent
b2ec54e364
commit
c40b3203fd
|
@ -14,9 +14,9 @@ import { ComponentHooks } from '../basecomponent';
|
||||||
import { ButtonPassThroughOptions } from '../button';
|
import { ButtonPassThroughOptions } from '../button';
|
||||||
import { CheckboxPassThroughOptionType } from '../checkbox';
|
import { CheckboxPassThroughOptionType } from '../checkbox';
|
||||||
import { DataTablePassThroughOptions } from '../datatable';
|
import { DataTablePassThroughOptions } from '../datatable';
|
||||||
import { DropdownPassThroughOptionType } from '../dropdown';
|
|
||||||
import { PassThroughOptions } from '../passthrough';
|
import { PassThroughOptions } from '../passthrough';
|
||||||
import { RadioButtonPassThroughOptionType } from '../radiobutton';
|
import { RadioButtonPassThroughOptionType } from '../radiobutton';
|
||||||
|
import { SelectPassThroughOptionType } from '../select';
|
||||||
import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
|
import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
|
||||||
import { VirtualScrollerLoaderOptions } from '../virtualscroller';
|
import { VirtualScrollerLoaderOptions } from '../virtualscroller';
|
||||||
|
|
||||||
|
@ -207,10 +207,10 @@ export interface ColumnPassThroughOptions {
|
||||||
*/
|
*/
|
||||||
filterOperator?: ColumnPassThroughOptionType;
|
filterOperator?: ColumnPassThroughOptionType;
|
||||||
/**
|
/**
|
||||||
* Used to pass attributes to the Dropdown component.
|
* Used to pass attributes to the Select component.
|
||||||
* @see {@link DropdownPassThroughOptionType}
|
* @see {@link SelectPassThroughOptionType}
|
||||||
*/
|
*/
|
||||||
filterOperatorDropdown?: DropdownPassThroughOptionType<ColumnSharedPassThroughMethodOptions>;
|
filterOperatorDropdown?: SelectPassThroughOptionType<ColumnSharedPassThroughMethodOptions>;
|
||||||
/**
|
/**
|
||||||
* Used to pass attributes to the filter constraints' DOM element.
|
* Used to pass attributes to the filter constraints' DOM element.
|
||||||
*/
|
*/
|
||||||
|
@ -220,10 +220,10 @@ export interface ColumnPassThroughOptions {
|
||||||
*/
|
*/
|
||||||
filterConstraint?: ColumnPassThroughOptionType;
|
filterConstraint?: ColumnPassThroughOptionType;
|
||||||
/**
|
/**
|
||||||
* Used to pass attributes to the Dropdown component.
|
* Used to pass attributes to the Select component.
|
||||||
* @see {@link DropdownPassThroughOptionType}
|
* @see {@link SelectPassThroughOptionType}
|
||||||
*/
|
*/
|
||||||
filterMatchModeDropdown?: DropdownPassThroughOptionType<ColumnSharedPassThroughMethodOptions>;
|
filterMatchModeDropdown?: SelectPassThroughOptionType<ColumnSharedPassThroughMethodOptions>;
|
||||||
/**
|
/**
|
||||||
* Used to pass attributes to the filter remove button container's DOM element.
|
* Used to pass attributes to the filter remove button container's DOM element.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="isShowOperator" :class="cx('filterOperator')" v-bind="getColumnPT('filterOperator')">
|
<div v-if="isShowOperator" :class="cx('filterOperator')" v-bind="getColumnPT('filterOperator')">
|
||||||
<CFDropdown
|
<CFSelect
|
||||||
:options="operatorOptions"
|
:options="operatorOptions"
|
||||||
:modelValue="operator"
|
:modelValue="operator"
|
||||||
:aria-label="filterOperatorAriaLabel"
|
:aria-label="filterOperatorAriaLabel"
|
||||||
|
@ -69,11 +69,11 @@
|
||||||
@update:modelValue="onOperatorChange($event)"
|
@update:modelValue="onOperatorChange($event)"
|
||||||
:unstyled="unstyled"
|
:unstyled="unstyled"
|
||||||
:pt="getColumnPT('filterOperatorDropdown')"
|
:pt="getColumnPT('filterOperatorDropdown')"
|
||||||
></CFDropdown>
|
></CFSelect>
|
||||||
</div>
|
</div>
|
||||||
<div :class="cx('filterConstraints')" v-bind="getColumnPT('filterConstraints')">
|
<div :class="cx('filterConstraints')" v-bind="getColumnPT('filterConstraints')">
|
||||||
<div v-for="(fieldConstraint, i) of fieldConstraints" :key="i" :class="cx('filterConstraint')" v-bind="getColumnPT('filterConstraint')">
|
<div v-for="(fieldConstraint, i) of fieldConstraints" :key="i" :class="cx('filterConstraint')" v-bind="getColumnPT('filterConstraint')">
|
||||||
<CFDropdown
|
<CFSelect
|
||||||
v-if="isShowMatchModes"
|
v-if="isShowMatchModes"
|
||||||
:options="matchModes"
|
:options="matchModes"
|
||||||
:modelValue="fieldConstraint.matchMode"
|
:modelValue="fieldConstraint.matchMode"
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
@update:modelValue="onMenuMatchModeChange($event, i)"
|
@update:modelValue="onMenuMatchModeChange($event, i)"
|
||||||
:unstyled="unstyled"
|
:unstyled="unstyled"
|
||||||
:pt="getColumnPT('filterMatchModeDropdown')"
|
:pt="getColumnPT('filterMatchModeDropdown')"
|
||||||
></CFDropdown>
|
></CFSelect>
|
||||||
<component v-if="display === 'menu'" :is="filterElement" :field="field" :filterModel="fieldConstraint" :filterCallback="filterCallback" :applyFilter="applyFilter" />
|
<component v-if="display === 'menu'" :is="filterElement" :field="field" :filterModel="fieldConstraint" :filterCallback="filterCallback" :applyFilter="applyFilter" />
|
||||||
<div v-bind="getColumnPT('filterRemove')">
|
<div v-bind="getColumnPT('filterRemove')">
|
||||||
<CFButton
|
<CFButton
|
||||||
|
@ -158,7 +158,6 @@
|
||||||
import { FilterOperator } from 'primevue/api';
|
import { FilterOperator } from 'primevue/api';
|
||||||
import BaseComponent from 'primevue/basecomponent';
|
import BaseComponent from 'primevue/basecomponent';
|
||||||
import Button from 'primevue/button';
|
import Button from 'primevue/button';
|
||||||
import Dropdown from 'primevue/dropdown';
|
|
||||||
import FocusTrap from 'primevue/focustrap';
|
import FocusTrap from 'primevue/focustrap';
|
||||||
import FilterIcon from 'primevue/icons/filter';
|
import FilterIcon from 'primevue/icons/filter';
|
||||||
import FilterSlashIcon from 'primevue/icons/filterslash';
|
import FilterSlashIcon from 'primevue/icons/filterslash';
|
||||||
|
@ -166,6 +165,7 @@ import PlusIcon from 'primevue/icons/plus';
|
||||||
import TrashIcon from 'primevue/icons/trash';
|
import TrashIcon from 'primevue/icons/trash';
|
||||||
import OverlayEventBus from 'primevue/overlayeventbus';
|
import OverlayEventBus from 'primevue/overlayeventbus';
|
||||||
import Portal from 'primevue/portal';
|
import Portal from 'primevue/portal';
|
||||||
|
import Select from 'primevue/select';
|
||||||
import { ConnectedOverlayScrollHandler, DomHandler, UniqueComponentId, ZIndexUtils } from 'primevue/utils';
|
import { ConnectedOverlayScrollHandler, DomHandler, UniqueComponentId, ZIndexUtils } from 'primevue/utils';
|
||||||
import { mergeProps } from 'vue';
|
import { mergeProps } from 'vue';
|
||||||
|
|
||||||
|
@ -711,7 +711,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
CFDropdown: Dropdown,
|
CFSelect: Select,
|
||||||
CFButton: Button,
|
CFButton: Button,
|
||||||
Portal: Portal,
|
Portal: Portal,
|
||||||
FilterSlashIcon: FilterSlashIcon,
|
FilterSlashIcon: FilterSlashIcon,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<JTPDropdown
|
<JTPSelect
|
||||||
:modelValue="page"
|
:modelValue="page"
|
||||||
:options="pageOptions"
|
:options="pageOptions"
|
||||||
optionLabel="label"
|
optionLabel="label"
|
||||||
|
@ -14,12 +14,12 @@
|
||||||
<template v-if="templates['jumptopagedropdownicon']" #dropdownicon="slotProps">
|
<template v-if="templates['jumptopagedropdownicon']" #dropdownicon="slotProps">
|
||||||
<component :is="templates['jumptopagedropdownicon']" :class="slotProps.class" />
|
<component :is="templates['jumptopagedropdownicon']" :class="slotProps.class" />
|
||||||
</template>
|
</template>
|
||||||
</JTPDropdown>
|
</JTPSelect>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import BaseComponent from 'primevue/basecomponent';
|
import BaseComponent from 'primevue/basecomponent';
|
||||||
import Dropdown from 'primevue/dropdown';
|
import Select from 'primevue/select';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'JumpToPageDropdown',
|
name: 'JumpToPageDropdown',
|
||||||
|
@ -49,7 +49,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
JTPDropdown: Dropdown
|
JTPSelect: Select
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<RPPDropdown
|
<RPPSelect
|
||||||
:modelValue="rows"
|
:modelValue="rows"
|
||||||
:options="rowsOptions"
|
:options="rowsOptions"
|
||||||
optionLabel="label"
|
optionLabel="label"
|
||||||
|
@ -14,12 +14,12 @@
|
||||||
<template v-if="templates['rowsperpagedropdownicon']" #dropdownicon="slotProps">
|
<template v-if="templates['rowsperpagedropdownicon']" #dropdownicon="slotProps">
|
||||||
<component :is="templates['rowsperpagedropdownicon']" :class="slotProps.class" />
|
<component :is="templates['rowsperpagedropdownicon']" :class="slotProps.class" />
|
||||||
</template>
|
</template>
|
||||||
</RPPDropdown>
|
</RPPSelect>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import BaseComponent from 'primevue/basecomponent';
|
import BaseComponent from 'primevue/basecomponent';
|
||||||
import Dropdown from 'primevue/dropdown';
|
import Select from 'primevue/select';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'RowsPerPageDropdown',
|
name: 'RowsPerPageDropdown',
|
||||||
|
@ -51,7 +51,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
RPPDropdown: Dropdown
|
RPPSelect: Select
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -263,7 +263,6 @@ const CORE_DEPENDENCIES = {
|
||||||
'primevue/radiobutton': 'primevue.radiobutton',
|
'primevue/radiobutton': 'primevue.radiobutton',
|
||||||
'primevue/message': 'primevue.message',
|
'primevue/message': 'primevue.message',
|
||||||
'primevue/progressbar': 'primevue.progressbar',
|
'primevue/progressbar': 'primevue.progressbar',
|
||||||
'primevue/dropdown': 'primevue.dropdown',
|
|
||||||
'primevue/dialog': 'primevue.dialog',
|
'primevue/dialog': 'primevue.dialog',
|
||||||
'primevue/paginator': 'primevue.paginator',
|
'primevue/paginator': 'primevue.paginator',
|
||||||
'primevue/tree': 'primevue.tree',
|
'primevue/tree': 'primevue.tree',
|
||||||
|
|
Loading…
Reference in New Issue