Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Table): 校验函数 validateRowData 和 validateTableData 返回值支持 Promise 对象 ; 修复退出浮层退出编辑的问题 #1275

Merged
merged 5 commits into from
Aug 12, 2022
Merged

feat(Table): 校验函数 validateRowData 和 validateTableData 返回值支持 Promise 对象 ; 修复退出浮层退出编辑的问题 #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86fbd79
feat(table): validateRowData and validateTableData support Promise
chaishi Aug 11, 2022
1a6bd43
fix(table): stopPropagation popup content click bubble to document
chaishi Aug 11, 2022
4be0ec1
feat(table): update api files
chaishi Aug 11, 2022
fbe1db9
fix: lint error
chaishi Aug 11, 2022
fce4b04
fix(lint error): fix
chaishi Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 44 additions & 25 deletions examples/table/demos/editable-row.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,50 +202,69 @@ export default {
const { id } = e.currentTarget.dataset;
this.currentSaveId = id;
// 触发内部校验，而后在 onRowValidate 中接收异步校验结果
this.$refs.tableRef.validateRowData(id);
this.$refs.tableRef.validateRowData(id).then((params) => {
console.log('Event Table Promise Validate:', params);
if (params.result.length) {
const r = params.result[0];
MessagePlugin.error(`${r.col.title} ${r.errorList[0].message}`);
return;
}
// 如果是 table 的父组件主动触发校验
if (params.trigger === 'parent' && !params.result.length) {
const current = this.editMap[this.currentSaveId];
if (current) {
this.data.splice(current.rowIndex, 1, current.editedRow);
MessagePlugin.success('保存成功');
}
this.updateEditState(this.currentSaveId);
}
});
},

// 行校验反馈事件，this.$refs.tableRef.validateRowData 执行结束后触发
onRowValidate(params) {
console.log('row-validate:', params);
if (params.result.length) {
const r = params.result[0];
MessagePlugin.error(`${r.col.title} ${r.errorList[0].message}`);
return;
}
// 如果是 table 的父组件主动触发校验
if (params.trigger === 'parent' && !params.result.length) {
const current = this.editMap[this.currentSaveId];
if (current) {
this.data.splice(current.rowIndex, 1, current.editedRow);
MessagePlugin.success('保存成功');
}
this.updateEditState(this.currentSaveId);
}
console.log('Event Table Row Validate:', params);
},

onValidateTableData() {
// 执行结束后触发事件 validate
this.$refs.tableRef.validateTableData();
this.$refs.tableRef.validateTableData().then((params) => {
console.log('Promise Table Data Validate:', params);
const cellKeys = Object.keys(params.result);
const firstError = params.result[cellKeys[0]];
if (firstError) {
MessagePlugin.warning(firstError[0].message);
}
});
},

// 表格全量数据校验反馈事件，this.$refs.tableRef.validateTableData() 执行结束后触发
onValidate(params) {
console.log('validate:', params);
const cellKeys = Object.keys(params.result);
const firstError = params.result[cellKeys[0]];
if (firstError) {
MessagePlugin.warning(firstError[0].message);
}
console.log('Event Table Data Validate:', params);
},

onRowEdit(params) {
const { row, col, value } = params;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const {
row,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
rowIndex,
col,
value,
} = params;
const oldRowData = this.editMap[row.key]?.editedRow || row;
const editedRow = { ...oldRowData, [col.colKey]: value };
this.editMap[row.key] = {
...params,
editedRow: { ...oldRowData, [col.colKey]: value },
editedRow,
};

// ⚠️ 重要：以下内容应用于全量数据校验（单独的行校验不需要）
// const newData = [...this.data];
// newData[rowIndex] = editedRow;
// this.data = newData;
// 或者
// this.$set(this.data, rowIndex, editedRow);
},
},
};
Expand Down
Loading