Skip to content

Commit d94b776

Browse files
xuliangzhanxuliangzhan
committed
releases 3.17.34
1 parent 1984ecf commit d94b776

File tree

4 files changed

+43
-60
lines changed

4 files changed

+43
-60
lines changed

‎examples/views/grid/GridTest5.vue‎

Lines changed: 29 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,40 @@
44
</div>
55
</template>
66

7-
<script setup>
7+
<script lang="ts" setup>
88
import { reactive } from 'vue'
9-
const gridOptions = reactive({
10-
height: 400,
11-
floatingFilterConfig: {
12-
enabled: true,
13-
floatingFilters: true
9+
import type { VxeGridProps } from '../../../types'
10+
11+
interface RowVO {
12+
id: number
13+
name: string
14+
role: string
15+
sex: string
16+
age: number
17+
address: string
18+
}
19+
20+
const gridOptions = reactive<VxeGridProps<RowVO>>({
21+
customConfig: {
22+
mode: 'modal',
23+
checkMethod ({ column }) {
24+
return !['seq', 'name'].includes(column.field)
25+
}
26+
},
27+
toolbarConfig: {
28+
custom: true
1429
},
1530
columns: [
16-
{ field: 'name', title: 'Name', filterRender: { name: 'VxeInput' } },
17-
{ field: 'sex', title: 'Sex', filterRender: { name: 'VxeInput' } },
18-
{
19-
title: '分组',
20-
children: [
21-
{ field: 'age', title: 'Age', filterRender: { name: 'VxeInput' } }
22-
]
23-
}
31+
{ field: 'seq', type: 'seq', width: 70 },
32+
{ field: 'name', title: 'Name' },
33+
{ field: 'sex', title: 'Sex' },
34+
{ field: 'age', title: 'Age' }
2435
],
2536
data: [
26-
{
27-
id: 10001,
28-
name: 'Test1',
29-
role: 'Develop',
30-
sex: 'Man',
31-
age: 28,
32-
address: 'test abc'
33-
},
34-
{
35-
id: 10002,
36-
name: 'Test2',
37-
role: 'Test',
38-
sex: 'Women',
39-
age: 22,
40-
address: 'Guangzhou'
41-
},
42-
{
43-
id: 10003,
44-
name: 'Test3',
45-
role: 'PM',
46-
sex: 'Man',
47-
age: 32,
48-
address: 'Shanghai'
49-
},
50-
{
51-
id: 10004,
52-
name: 'Test4',
53-
role: 'Designer',
54-
sex: 'Women',
55-
age: 24,
56-
address: 'Shanghai'
57-
}
37+
{ id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, address: 'test abc' },
38+
{ id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, address: 'Guangzhou' },
39+
{ id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, address: 'Shanghai' },
40+
{ id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 24, address: 'Shanghai' }
5841
]
5942
})
6043
</script>
61-
62-
<style scoped></style>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vxe-table",
3-
"version": "4.17.33",
3+
"version": "4.17.34",
44
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
55
"scripts": {
66
"update": "npm install --legacy-peer-deps",

‎packages/table/module/custom/panel.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,10 @@ export default defineVxeComponent({
693693
}, [
694694
h('span', {
695695
class: ['vxe-table-custom--sort-btn', {
696-
'is--disabled': isDisabled || isHidden
696+
'is--disabled': isHidden
697697
}],
698698
title: getI18n('vxe.custom.setting.sortHelpTip'),
699-
...(isDisabled || isHidden
699+
...(isHidden
700700
? {}
701701
: {
702702
onMousedown: sortMousedownEvent,
@@ -729,7 +729,7 @@ export default defineVxeComponent({
729729
mode: 'text',
730730
icon: column.renderFixed === 'left' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
731731
status: column.renderFixed === 'left' ? 'primary' : '',
732-
disabled: isDisabled || isHidden || (isMaxFixedColumn && !column.renderFixed),
732+
disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
733733
title: getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
734734
onClick: ({ $event }) => {
735735
changeFixedOption(column, 'left', $event)
@@ -741,7 +741,7 @@ export default defineVxeComponent({
741741
mode: 'text',
742742
icon: column.renderFixed === 'right' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
743743
status: column.renderFixed === 'right' ? 'primary' : '',
744-
disabled: isDisabled || isHidden || (isMaxFixedColumn && !column.renderFixed),
744+
disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
745745
title: getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
746746
onClick: ({ $event }) => {
747747
changeFixedOption(column, 'right', $event)
@@ -1000,10 +1000,10 @@ export default defineVxeComponent({
10001000
? ((isCrossDrag ? immediate : false) || column.level === 1
10011001
? h('div', {
10021002
class: ['vxe-table-custom-popup--column-sort-btn', {
1003-
'is--disabled': isDisabled || isHidden
1003+
'is--disabled': isHidden
10041004
}],
10051005
title: getI18n('vxe.custom.setting.sortHelpTip'),
1006-
...(isDisabled || isHidden
1006+
...(isHidden
10071007
? {}
10081008
: {
10091009
onMousedown: sortMousedownEvent,
@@ -1045,7 +1045,7 @@ export default defineVxeComponent({
10451045
? h(VxeUINumberInputComponent, {
10461046
type: 'integer',
10471047
immediate: false,
1048-
disabled: isDisabled || isHidden,
1048+
disabled: isHidden,
10491049
modelValue: column.renderResizeWidth,
10501050
min: customMinWidth || undefined,
10511051
max: customMaxWidth || undefined,
@@ -1073,11 +1073,11 @@ export default defineVxeComponent({
10731073
modelValue: column.renderFixed || '',
10741074
type: 'button',
10751075
size: 'mini',
1076-
disabled: isDisabled || isHidden,
1076+
disabled: isHidden,
10771077
options: [
1078-
{ label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isDisabled || isHidden || isMaxFixedColumn },
1079-
{ label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isDisabled || isHidden },
1080-
{ label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isDisabled || isHidden || isMaxFixedColumn }
1078+
{ label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isHidden || isMaxFixedColumn },
1079+
{ label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isHidden },
1080+
{ label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isHidden || isMaxFixedColumn }
10811081
],
10821082
onChange ({ label, $event }) {
10831083
changeFixedOption(column, label, $event)

‎packages/table/render/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ renderer.mixin({
871871
tableAutoFocus: 'input',
872872
renderTableEdit: nativeEditRender,
873873
renderTableDefault: nativeEditRender,
874+
createTableFilterOptions: defaultFilterOptions,
874875
renderTableFilter: nativeFilterRender,
875876
tableFilterDefaultMethod: handleInputFilterMethod
876877
},
@@ -884,6 +885,7 @@ renderer.mixin({
884885
renderTableCell (renderOpts, params) {
885886
return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params))
886887
},
888+
createTableFilterOptions: defaultFilterOptions,
887889
renderTableFilter (renderOpts, params) {
888890
const { column } = params
889891
return column.filters.map((option, oIndex) => {

0 commit comments

Comments
 (0)