Skip to content

Commit 03f5ff1

Browse files
huangshuweihuangshuwei
committed
v2.21.8
1 parent 9028a15 commit 03f5ff1

File tree

6 files changed

+69
-5
lines changed

6 files changed

+69
-5
lines changed

‎CHANGE-LOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@ Vx.x.x(TPL)
77
- Style changes
88
- Dependencies Changes
99

10+
V2.21.8
11+
12+
### Breaking Changes
13+
14+
- Change contextmenu type name of the header: CANCLE_LEFT_FIXED_COLUMN_TO -> CANCEL_LEFT_FIXED_COLUMN_TO
15+
16+
### Bug Fixes
17+
18+
- Fix the bug that the column width restoring when cancel or fix the column through the right-click menu after dragging the column width
19+
20+
### Breaking Changes
21+
22+
- 修改表头右键菜单类型名称： CANCLE_LEFT_FIXED_COLUMN_TO -> CANCEL_LEFT_FIXED_COLUMN_TO
23+
24+
### Bug Fixes
25+
26+
- 修复列宽拖动后，通过右键菜单取消或者固定列时，列宽还原的问题
27+
1028
V2.21.7
1129

1230
### Bug Fixes

‎examples/public/versions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"value":"/vue-easytable","label":"2.21.6"},{"value":"/vue-easytable/2.20.2","label":"2.20.2"},{"value":"/vue-easytable/2.19.1","label":"2.19.1"},{"value":"/vue-easytable/2.18.3","label":"2.18.3"},{"value":"/vue-easytable/2.17.3","label":"2.17.3"},{"value":"/vue-easytable/2.16.3/","label":"2.16.3"},{"value":"/vue-easytable/2.15.0/","label":"2.15.0"},{"value":"/vue-easytable/2.14.4/","label":"2.14.4"},{"value":"/vue-easytable/2.13.1/","label":"2.13.1"},{"value":"/vue-easytable/2.12.3/","label":"2.12.3"},{"value":"/vue-easytable/2.11.0/","label":"2.11.0"},{"value":"/vue-easytable/1.7.2/app.html","label":"1.x","isVersion1":true}]
1+
[{"value":"/vue-easytable","label":"2.21.8"},{"value":"/vue-easytable/2.20.2","label":"2.20.2"},{"value":"/vue-easytable/2.19.1","label":"2.19.1"},{"value":"/vue-easytable/2.18.3","label":"2.18.3"},{"value":"/vue-easytable/2.17.3","label":"2.17.3"},{"value":"/vue-easytable/2.16.3/","label":"2.16.3"},{"value":"/vue-easytable/2.15.0/","label":"2.15.0"},{"value":"/vue-easytable/2.14.4/","label":"2.14.4"},{"value":"/vue-easytable/2.13.1/","label":"2.13.1"},{"value":"/vue-easytable/2.12.3/","label":"2.12.3"},{"value":"/vue-easytable/2.11.0/","label":"2.11.0"},{"value":"/vue-easytable/1.7.2/app.html","label":"1.x","isVersion1":true}]

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-easytable",
3-
"version": "2.21.7",
3+
"version": "2.21.8",
44
"main": "libs/main.js",
55
"description": "Vue table component",
66
"keywords": [
@@ -136,7 +136,7 @@
136136
"docVersions": [
137137
{
138138
"value": "/vue-easytable",
139-
"label": "2.21.7"
139+
"label": "2.21.8"
140140
},
141141
{
142142
"value": "/vue-easytable/2.20.2",

‎packages/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import VeSelect from './ve-select';
1313
import VeTable from './ve-table';
1414

1515

16-
const version = '2.21.7';
16+
const version = '2.21.8';
1717
const components = [
1818
VeCheckbox,
1919
VeCheckboxGroup,

‎packages/ve-table/src/index.jsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,8 @@ export default {
799799
cloneColumns: {
800800
handler() {
801801
this.initGroupColumns();
802+
// 右键（取消）固定列会操作 cloneColumns
803+
this.initColumnWidthByColumnResize();
802804

803805
this.columnsOptionResetTime++;
804806
// 需要等待 initColumns 和 initGroupColumns 先执行
@@ -2821,6 +2823,7 @@ export default {
28212823
cellSelectionRangeData,
28222824
allRowKeys,
28232825
colgroups,
2826+
enableColumnResize,
28242827
} = this;
28252828

28262829
const { rowKey, colKey } = cellSelectionData.currentCell;
@@ -2869,6 +2872,8 @@ export default {
28692872
cloneColumns: this.cloneColumns,
28702873
cellSelectionRangeData,
28712874
fixedType: COLUMN_FIXED_TYPE.LEFT,
2875+
colgroups,
2876+
enableColumnResize,
28722877
});
28732878
}
28742879
// cancel left fixed column to
@@ -2879,6 +2884,7 @@ export default {
28792884
cloneColumns: this.cloneColumns,
28802885
colgroups,
28812886
fixedType: COLUMN_FIXED_TYPE.LEFT,
2887+
enableColumnResize,
28822888
});
28832889
}
28842890
// right fixed column to
@@ -2889,6 +2895,8 @@ export default {
28892895
cloneColumns: this.cloneColumns,
28902896
cellSelectionRangeData,
28912897
fixedType: COLUMN_FIXED_TYPE.RIGHT,
2898+
colgroups,
2899+
enableColumnResize,
28922900
});
28932901
}
28942902
// cancel right fixed column to
@@ -2899,6 +2907,7 @@ export default {
28992907
cloneColumns: this.cloneColumns,
29002908
colgroups,
29012909
fixedType: COLUMN_FIXED_TYPE.RIGHT,
2910+
enableColumnResize,
29022911
});
29032912
}
29042913
}

‎packages/ve-table/src/util/index.js‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1458,12 +1458,16 @@ export function cellAutofill({
14581458
* @param {array<object>} cloneColumns
14591459
* @param {object} cellSelectionRangeData
14601460
* @param {string} fixedType COLUMN_FIXED_TYPE
1461+
* @param {array<object>} colgroups
1462+
* @param {bool} enableColumnResize
14611463
* @return cloneColumns
14621464
*/
14631465
export function setColumnFixed({
14641466
cloneColumns,
14651467
cellSelectionRangeData,
14661468
fixedType,
1469+
colgroups,
1470+
enableColumnResize,
14671471
}) {
14681472
let result = cloneColumns;
14691473

@@ -1503,6 +1507,20 @@ export function setColumnFixed({
15031507
if (colItem.fixed === fixedType) {
15041508
colItem.fixed = "";
15051509
}
1510+
1511+
// 允许列自适应 && 不是多列表头
1512+
if (
1513+
enableColumnResize &&
1514+
!(Array.isArray(colItem.children) && colItem.children.length)
1515+
) {
1516+
const _colItem = colgroups.find(
1517+
(x) => x.key === colItem.key && !isEmptyValue(x.key),
1518+
);
1519+
if (_colItem) {
1520+
colItem.width = _colItem._columnResizeWidth;
1521+
}
1522+
}
1523+
15061524
if (COLUMN_FIXED_TYPE.LEFT === fixedType) {
15071525
// 不允许左冻结最后一列
15081526
if (index <= fixedColIndex && index < cloneColumns.length) {
@@ -1527,10 +1545,29 @@ export function setColumnFixed({
15271545
* @param {array<object>} cloneColumns
15281546
* @param {array<object>} colgroups
15291547
* @param {string} fixedType COLUMN_FIXED_TYPE
1548+
* @param {bool} enableColumnResize
15301549
* @return cloneColumns
15311550
*/
1532-
export function cancelColumnFixed({ cloneColumns, colgroups, fixedType }) {
1551+
export function cancelColumnFixed({
1552+
cloneColumns,
1553+
colgroups,
1554+
fixedType,
1555+
enableColumnResize,
1556+
}) {
15331557
return cloneColumns.map((colItem) => {
1558+
// 允许列自适应 && 不是多列表头
1559+
if (
1560+
enableColumnResize &&
1561+
!(Array.isArray(colItem.children) && colItem.children.length)
1562+
) {
1563+
const _colItem = colgroups.find(
1564+
(x) => x.key === colItem.key && !isEmptyValue(x.key),
1565+
);
1566+
if (_colItem) {
1567+
colItem.width = _colItem._columnResizeWidth;
1568+
}
1569+
}
1570+
15341571
if (COLUMN_FIXED_TYPE.LEFT === fixedType) {
15351572
if (
15361573
colItem.fixed === fixedType &&

0 commit comments

Comments
 (0)