Skip to content

Commit 503643b

Browse files
committed
releases 4.22.2
1 parent 86729ce commit 503643b

3 files changed

Lines changed: 21 additions & 61 deletions

File tree

‎examples/views/grid/GridTest1.vue‎

Lines changed: 16 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,30 @@
11
<template>
22
<div>
3-
<vxe-button @click="sortEvent('name', 'asc')">Name 升序</vxe-button>
4-
<vxe-button @click="sortEvent('name', 'desc')">Name 降序</vxe-button>
5-
<vxe-button @click="clearSortEvent">清除排序</vxe-button>
6-
7-
<vxe-grid ref="gridRef" v-bind="gridOptions"></vxe-grid>
3+
<vxe-grid v-bind="gridOptions"></vxe-grid>
84
</div>
95
</template>
106

11-
<script lang="ts" setup>
12-
import { ref, reactive } from 'vue'
13-
import { VxeGridInstance, VxeGridProps, VxeTablePropTypes, VxeColumnPropTypes } from '../../../types'
14-
15-
interface RowVO {
16-
id: number
17-
name: string
18-
role: string
19-
sex: string
20-
age: number
21-
num: string
22-
num2: string
23-
num3: string
24-
address: string
25-
}
26-
27-
const gridRef = ref<VxeGridInstance<RowVO>>()
28-
29-
const gridOptions = reactive<VxeGridProps<RowVO>>({
7+
<script setup>
8+
import { reactive } from 'vue'
9+
const gridOptions = reactive({
3010
border: true,
31-
height: 300,
32-
rowConfig: {
33-
isHover: true
11+
round: true,
12+
editConfig: {
13+
autoClear: false,
14+
trigger: 'dblclick',
15+
mode: 'row'
3416
},
3517
columns: [
3618
{ type: 'seq', width: 70 },
37-
{ field: 'name', title: 'Name', sortable: true },
38-
{ field: 'role', title: 'Role', sortable: true },
39-
{ field: 'age', title: 'Age', sortable: true },
40-
{ field: 'num', title: '字符串', sortable: true, sortType: 'string' },
41-
{ field: 'num2', title: '数值', sortable: true, sortType: 'number' },
42-
{ field: 'num3', title: '百分比', sortable: true, sortType: 'number' },
43-
{ field: 'address', title: 'Address', sortable: true }
19+
{ field: 'name', title: 'Name', editRender: { name: 'input' } },
20+
{ field: 'sex', title: 'Sex', editRender: { name: 'input' } },
21+
{ field: 'age', title: 'Age' }
4422
],
4523
data: [
46-
{ id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, num: '3.8', num2: '3.8', num3: '9%', address: 'test abc' },
47-
{ id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, num: '511', num2: '511', num3: '98.66%', address: 'Guangzhou' },
48-
{ id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, num: '12.8', num2: '12.8', num3: '25%', address: 'Shanghai' },
49-
{ id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 23, num: '103', num2: '103', num3: '98%', address: 'test abc' },
50-
{ id: 10005, name: 'Test5', role: 'Develop', sex: 'Women', age: 30, num: '56', num2: '56', num3: '99.71%', address: 'Shanghai' },
51-
{ id: 10006, name: 'Test6', role: 'Designer', sex: 'Women', age: 21, num: '49', num2: '49', num3: '30.1%', address: 'test abc' },
52-
{ id: 10007, name: 'Test7', role: 'Test', sex: 'Man', age: 29, num: '400.9', num2: '400.9', num3: '30.5%', address: 'test abc' },
53-
{ id: 10008, name: 'Test8', role: 'Develop', sex: 'Man', age: 35, num: '5000', num2: '5000', num3: '100%', address: 'test abc' }
24+
{ id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, address: 'test abc' },
25+
{ id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, address: 'Guangzhou' },
26+
{ id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, address: 'Shanghai' },
27+
{ id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 24, address: 'Shanghai' }
5428
]
5529
})
56-
57-
const sortEvent = (field: VxeColumnPropTypes.Field, order: VxeTablePropTypes.SortOrder) => {
58-
const $grid = gridRef.value
59-
if ($grid) {
60-
$grid.sort({ field, order })
61-
}
62-
}
63-
64-
const clearSortEvent = () => {
65-
const $grid = gridRef.value
66-
if ($grid) {
67-
$grid.clearSort()
68-
}
69-
}
7030
</script>

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vxe-table",
3-
"version": "4.22.1",
3+
"version": "4.22.2",
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",
@@ -61,12 +61,12 @@
6161
"gulp-uglify": "^3.0.2",
6262
"postcss": "^8.4.38",
6363
"rollup": "^4.53.3",
64-
"sass": "^1.80.4",
64+
"sass": "~1.101.7",
6565
"sass-loader": "^14.2.0",
6666
"typescript": "~5.9.3",
6767
"vue": "3.4.27",
6868
"vue-router": "~4.5.1",
69-
"vxe-pc-ui": "4.18.17"
69+
"vxe-pc-ui": "4.18.18"
7070
},
7171
"vetur": {
7272
"tags": "helper/vetur/tags.json",

‎packages/table/src/table.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11030,8 +11030,8 @@ export default defineVxeComponent({
1103011030
}
1103111031
}
1103211032
}
11033-
// 如果是双击编辑模式
11034-
if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
11033+
// 如果是双击编辑模式,当autoClear=false时
11034+
if (isEnableConf(editConfig) && editOpts.autoClear !== false && editOpts.trigger === 'dblclick') {
1103511035
if (actived.row && actived.column) {
1103611036
if (editOpts.mode === 'row') {
1103711037
if (!$xeTable.eqRow(actived.row, row)) {

0 commit comments

Comments
 (0)