diff --git a/magic-boot-ui/package.json b/magic-boot-ui/package.json index 1efcbd9..0d6be38 100644 --- a/magic-boot-ui/package.json +++ b/magic-boot-ui/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "axios": "^0.24.0", - "element-plus": "^2.1.8", + "element-plus": "^2.1.11", "nprogress": "0.2.0", "path-browserify": "^1.0.1", "vue": "^3.2.25", diff --git a/magic-boot-ui/src/components/magic/basic/mb-button.vue b/magic-boot-ui/src/components/magic/basic/mb-button.vue index 4105244..b8d51a7 100644 --- a/magic-boot-ui/src/components/magic/basic/mb-button.vue +++ b/magic-boot-ui/src/components/magic/basic/mb-button.vue @@ -1,9 +1,10 @@ @@ -14,10 +15,14 @@ import {ElNotification} from "element-plus"; export default { name: 'MbButton', props: { - el: { + props: { type: Object, default: () => {} }, + plain: { + type: Boolean, + default: false + }, btnType: { type: String, default: '' @@ -61,7 +66,7 @@ export default { }, data() { return { - el_: this.el || {}, + props_: this.props || {}, requestMethod_: this.requestMethod, beforeConfirm_: this.beforeConfirm, successTips_: this.successTips, @@ -72,9 +77,9 @@ export default { if (this.btnType) { if (this.btnType === 'delete') { this.requestMethod_ = 'delete' - this.el_.type = 'danger' - this.el_.text = '删除' - this.el_.icon = 'ElIconDelete' + this.props_.type = 'danger' + this.props_.text = '删除' + this.props_.icon = 'ElIconDelete' this.beforeConfirm_ = '此操作将永久删除该数据, 是否继续?' this.successTips_ = '删除成功!' this.failTips_ = '删除失败!' diff --git a/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue b/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue index 8332fed..7e0ef16 100644 --- a/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue +++ b/magic-boot-ui/src/components/magic/basic/mb-editor-table.vue @@ -17,6 +17,11 @@ /> + + + diff --git a/magic-boot-ui/src/components/magic/data/mb-search.vue b/magic-boot-ui/src/components/magic/data/mb-search.vue index adb0747..9c77c4b 100644 --- a/magic-boot-ui/src/components/magic/data/mb-search.vue +++ b/magic-boot-ui/src/components/magic/data/mb-search.vue @@ -4,7 +4,7 @@ - + - + @@ -36,7 +36,7 @@