Skip to content

Commit d50cab3

Browse files
author
黄书伟
committed
编译打包
1 parent 59a1f01 commit d50cab3

File tree

3 files changed

+40
-23
lines changed

3 files changed

+40
-23
lines changed

‎libs/v-table/src/cell-edit-mixin.js‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,39 @@ exports.default = {
2424
editInputLen = void 0,
2525
_actionFun = void 0,
2626
textAlign = void 0,
27-
formatterVal = '';
27+
childTarget = void 0;
2828

2929
while (target.className && target.className.indexOf('v-table-body-cell') === -1 || !target.className) {
3030
target = target.parentNode;
3131
}
3232

33+
childTarget = target.children[0];
34+
35+
childTarget.style.display = 'none';
36+
3337
if ((0, _dom.hasClass)(target, 'cell-editing')) {
3438
return false;
3539
}
3640

3741
(0, _dom.addClass)(target, 'cell-editing');
3842

39-
oldVal = target.innerText;
43+
oldVal = childTarget.innerText.trim();
4044

4145
if (target.style.textAlign) {
4246

4347
textAlign = target.style.textAlign;
4448
}
4549

46-
target.innerHTML = '<input type=\'text\' value="' + oldVal + '" class=\'cell-edit-input\' style=\'width:100%;height: 100%;text-align: ' + textAlign + ';\'>';
50+
editInput = document.createElement('input');
51+
editInput.value = oldVal;
52+
editInput.className = 'cell-edit-input';
53+
editInput.style.textAlign = textAlign;
54+
editInput.style.width = '100%';
55+
editInput.style.height = '100%';
56+
57+
58+
target.appendChild(editInput);
4759

48-
editInput = target.querySelector('.cell-edit-input');
4960
editInput.focus();
5061

5162
editInputLen = editInput.value.length;
@@ -69,29 +80,28 @@ exports.default = {
6980
return false;
7081
}
7182

72-
formatterVal = self.cellEditFormatter && self.cellEditFormatter(editInput.value, oldVal, rowIndex, rowData, field);
73-
74-
target.innerHTML = formatterVal && formatterVal.length > 0 ? formatterVal : editInput.value;
83+
childTarget.style.display = '';
7584

7685
callback(editInput.value, oldVal);
7786

7887
_utils2.default.unbind(editInput, 'blur', _actionFun);
7988
_utils2.default.unbind(editInput, 'keydown', _actionFun);
89+
90+
target.removeChild(editInput);
8091
}
8192
};
8293

8394
_utils2.default.bind(editInput, 'blur', _actionFun);
8495
_utils2.default.bind(editInput, 'keydown', _actionFun);
8596
},
8697
cellEditClick: function cellEditClick(e, isEdit, rowData, field, rowIndex) {
87-
8898
if (isEdit) {
8999

90100
var self = this;
91101

92102
var onCellEditCallBack = function onCellEditCallBack(newValue, oldVal) {
93103

94-
self.cellEditDone(newValue, oldVal, rowIndex, rowData, field);
104+
self.cellEditDone && self.cellEditDone(newValue, oldVal, rowIndex, rowData, field);
95105
};
96106

97107
this.cellEdit(e, onCellEditCallBack, rowIndex, rowData, field);

‎libs/v-table/src/drag-width-mixin.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ var _utils = require('../../src/utils/utils.js');
88

99
var _utils2 = _interopRequireDefault(_utils);
1010

11+
var _dom = require('../../src/utils/dom.js');
12+
1113
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1214

1315
exports.default = {
@@ -47,7 +49,7 @@ exports.default = {
4749

4850
target = event.target;
4951

50-
while (target && (target.className && target.className.indexOf('v-table-title-cell') === -1 || !target.className)) {
52+
while (target && (target.className && !(0, _dom.hasClass)(target, 'v-table-title-cell') || !target.className)) {
5153
target = target.parentNode;
5254
}
5355

@@ -149,14 +151,16 @@ exports.default = {
149151
if (this.totalColumnsWidth < this.internalWidth) {
150152

151153
rightViewBody.style.overflowX = 'hidden';
154+
155+
(0, _dom.removeClass)(rightViewBody, 'v-table-rightview-special-border');
152156
rightViewBody.classList.remove('v-table-rightview-special-border');
153157
} else {
154158

155159
rightViewBody.style.overflowX = 'scroll';
156160

157161
if (!this.hasFrozenColumn) {
158162

159-
rightViewBody.classList.add('v-table-rightview-special-border');
163+
(0, _dom.addClass)(rightViewBody, 'v-table-rightview-special-border');
160164
}
161165
}
162166

‎libs/v-table/src/table.vue‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,6 @@
455455
rowMouseLeave: Function,
456456
// 单元格编辑完成回调
457457
cellEditDone: Function,
458-
// 单元格编辑格式化
459-
cellEditFormatter: Function,
460458
// 单元格合并
461459
cellMerge: Function,
462460
// select all
@@ -809,24 +807,29 @@
809807
this.initColumns();
810808
},
811809
812-
'tableData': function (newVal) {
810+
// deep watch
811+
'tableData': {
813812
814-
this.internalTableData = this.initInternalTableData(newVal);
813+
handler:function (newVal) {
815814
816-
this.updateCheckboxGroupModel();
815+
this.internalTableData = this.initInternalTableData(newVal);
817816
818-
this.tableEmpty();
817+
this.updateCheckboxGroupModel();
819818
820-
if (Array.isArray(newVal) && newVal.length > 0) {
819+
this.tableEmpty();
821820
822-
this.initView();
821+
if (Array.isArray(newVal) && newVal.length > 0) {
823822
824-
if (!this.hasBindScrollEvent) {
825-
this.scrollControl();
823+
this.initView();
824+
825+
if (!this.hasBindScrollEvent) {
826+
this.scrollControl();
827+
}
826828
}
827-
}
828829
829-
this.resize();
830+
this.resize();
831+
},
832+
deep: true
830833
}
831834
}
832835
}

0 commit comments

Comments
 (0)