diff --git a/src/components/action_button/index.vue b/src/components/action_button/index.vue index 2506dc1d832375e36148f3ee76c6fe242d392339..be2be56e6f7c1b75fc3523bd6f96b1cea326d3d6 100644 --- a/src/components/action_button/index.vue +++ b/src/components/action_button/index.vue @@ -3,9 +3,11 @@ {{ btn.label }} @@ -15,9 +17,17 @@ ... diff --git a/src/components/popconfirm_delete/index.vue b/src/components/popconfirm_delete/index.vue index 29c3a857c27dd494bc6502062c250b40a5f45315..89b6993b115a4fa6696125098cd24c90b8584205 100644 --- a/src/components/popconfirm_delete/index.vue +++ b/src/components/popconfirm_delete/index.vue @@ -1,6 +1,6 @@ @@ -19,10 +19,23 @@ export default { type: String, default: '确认是否删除', }, + onOk: { + type: Function, + default: EMPTY_FUN, + }, + label: { + type: String, + default: '删除', + }, }, methods: { - async onOk() { - await delReq(this.url); + async confirm() { + if (this.url) { + await delReq(this.url); + } + if (this.onOk) { + await this.onOk(); + } this?.cb(); }, }, diff --git a/src/components/table/index.vue b/src/components/table/index.vue index b59ace3f92ac0a601a27aa1ffcf7636bb09312c8..892ab920d6125ab5e04b1cfa00910c2477466eb8 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -46,11 +46,15 @@ - - - 取消 - 确认 - + @@ -94,6 +98,7 @@ export default { display: 'flex', flexDirection: 'column', }, + noFooter: false, }; }, watch: { @@ -144,7 +149,7 @@ export default { } this.submitLoading = false; }, - show({ type, title } = {}) { + show({ type, title, noFooter } = {}) { if (type === 0) { this.title = '新增'; } @@ -157,6 +162,7 @@ export default { if (title) { this.title = title; } + this.noFooter = noFooter; this.addVisible = true; }, }, diff --git a/src/pages/system/view/menu/MenuManagement.vue b/src/pages/system/view/menu/MenuManagement.vue index f7a269a082983c598a0c00e1402d2739cc5e07f5..867c1cde22157524350d184efa9eca4fbddc6bb8 100644 --- a/src/pages/system/view/menu/MenuManagement.vue +++ b/src/pages/system/view/menu/MenuManagement.vue @@ -7,7 +7,7 @@ noPage ref="table" > -