diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue index d40f6180c..c375ead5f 100644 --- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue +++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue @@ -486,12 +486,8 @@ export default { */ onEdit: { type: Function, - default(data) { - return this.$axios.put( - `${this.url}/${this.row[this.id]}`, - data, - this.axiosConfig - ) + default(row) { + console.log('On delete row') } }, /** @@ -1094,7 +1090,7 @@ export default { }, onDefaultEdit(row) { this.row = row - this.$refs.dialog.show(dialogModes.edit, row) + this.onEdit(row) }, async onConfirm(isNew, formValue, done) { const data = { diff --git a/src/components/DataTable/index.vue b/src/components/DataTable/index.vue index f340ba139..ec0931dac 100644 --- a/src/components/DataTable/index.vue +++ b/src/components/DataTable/index.vue @@ -17,6 +17,7 @@ export default { } }, data() { + const userTableActions = this.config.tableActions || {} return { defaultConfig: { axiosConfig: { @@ -30,8 +31,8 @@ export default { totalPath: 'count', saveQuery: false, // 关闭路径保存查询参数 persistSelection: true, // 切换页面 已勾选项不会丢失 - hasEdit: true, // 有编辑按钮 - hasDelete: true, + hasEdit: userTableActions.hasEdit !== false, // 有编辑按钮 + hasDelete: userTableActions.hasDelete !== false, hasNew: false, // editText: this.$t('action.update'), // 编辑按钮文案 operationAttrs: { @@ -43,6 +44,18 @@ export default { border: true, // 表格边框 fit: true // 宽度自适应 }, + extraButtons: userTableActions.extraButtons, + onEdit: (row) => { + const defaultOnEdit = (row) => { + const routeName = userTableActions.editRoute + this.$router.push({ name: routeName, params: { id: row.id }}) + } + let onEdit = userTableActions.onEdit + if (!onEdit) { + onEdit = defaultOnEdit + } + return onEdit(row) + }, pageCount: 5, paginationLayout: 'total, sizes, prev, pager, next', transformQuery: query => { diff --git a/src/components/ListTable/TableAction.vue b/src/components/ListTable/TableAction.vue index 05249bcd4..50bcf94a4 100644 --- a/src/components/ListTable/TableAction.vue +++ b/src/components/ListTable/TableAction.vue @@ -31,7 +31,7 @@ export default { hasUpdate: defaultTrue, hasLeftActions: defaultTrue, hasSearch: defaultTrue, - hasRightActions: defaultTrue, + hasRightActions: defaultTrue }, data() { return { diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue index a14857a8e..e2fe05a89 100644 --- a/src/components/ListTable/index.vue +++ b/src/components/ListTable/index.vue @@ -1,6 +1,6 @@