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 9413f12..4105244 100644 --- a/magic-boot-ui/src/components/magic/basic/mb-button.vue +++ b/magic-boot-ui/src/components/magic/basic/mb-button.vue @@ -74,7 +74,7 @@ export default { this.requestMethod_ = 'delete' this.el_.type = 'danger' this.el_.text = '删除' - this.el_.icon = 'ElDelete' + this.el_.icon = 'ElIconDelete' this.beforeConfirm_ = '此操作将永久删除该数据, 是否继续?' this.successTips_ = '删除成功!' this.failTips_ = '删除失败!' 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 3be6090..adb0747 100644 --- a/magic-boot-ui/src/components/magic/data/mb-search.vue +++ b/magic-boot-ui/src/components/magic/data/mb-search.vue @@ -22,10 +22,10 @@ - + 搜索 - + 清空 diff --git a/magic-boot-ui/src/components/magic/data/mb-tree.vue b/magic-boot-ui/src/components/magic/data/mb-tree.vue index b6caf37..4e35724 100644 --- a/magic-boot-ui/src/components/magic/data/mb-tree.vue +++ b/magic-boot-ui/src/components/magic/data/mb-tree.vue @@ -1,8 +1,8 @@ diff --git a/magic-boot-ui/src/components/magic/form/mb-upload-image.vue b/magic-boot-ui/src/components/magic/form/mb-upload-image.vue index 4426625..e97ce02 100644 --- a/magic-boot-ui/src/components/magic/form/mb-upload-image.vue +++ b/magic-boot-ui/src/components/magic/form/mb-upload-image.vue @@ -19,12 +19,12 @@
- +
- +
@@ -47,7 +47,7 @@ :on-exceed="onExceed" > - + 正在上传...
- + {{ it.label || '添加' }} diff --git a/magic-boot-ui/src/scripts/globalProperties.js b/magic-boot-ui/src/scripts/globalProperties.js index 13646ad..611cf1e 100644 --- a/magic-boot-ui/src/scripts/globalProperties.js +++ b/magic-boot-ui/src/scripts/globalProperties.js @@ -23,7 +23,7 @@ const install = (app) => { app.config.globalProperties.$common = common app.config.globalProperties.$treeTable = treeTable for(var key in PlusIcons) { - app.component(`El${key}`, PlusIcons[key]) + app.component(`ElIcon${key}`, PlusIcons[key]) } } export default install diff --git a/magic-boot-ui/src/views/examples/test-mb-list.vue b/magic-boot-ui/src/views/examples/test-mb-list.vue index 3e5c405..dbd80e0 100644 --- a/magic-boot-ui/src/views/examples/test-mb-list.vue +++ b/magic-boot-ui/src/views/examples/test-mb-list.vue @@ -92,7 +92,7 @@ const listOptions = reactive({ permission: 'user:save', label: '修改', type: 'text', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { // magicForm.value.getDetail(row.id) formOptions.form.rows[0].cols[1].rules = [] @@ -103,7 +103,7 @@ const listOptions = reactive({ permission: 'user:delete', label: '删除', type: 'text', - icon: 'ElDelete', + icon: 'ElIconDelete', click: (row) => { proxy.$common.handleDelete({ url: '/system/user/delete', diff --git a/magic-boot-ui/src/views/login.vue b/magic-boot-ui/src/views/login.vue index f56e9eb..a5bd672 100644 --- a/magic-boot-ui/src/views/login.vue +++ b/magic-boot-ui/src/views/login.vue @@ -59,14 +59,6 @@ showClose: true }) return - }else if(!loginForm.code){ - proxy.$message({ - message: '请输入验证码', - type: 'error', - duration: 2000, - showClose: true - }) - return }else{ loading.value = true login(loginForm).then((res) => { diff --git a/magic-boot-ui/src/views/lowcode/code-gen-form.vue b/magic-boot-ui/src/views/lowcode/code-gen-form.vue index e66e2fd..84e3178 100644 --- a/magic-boot-ui/src/views/lowcode/code-gen-form.vue +++ b/magic-boot-ui/src/views/lowcode/code-gen-form.vue @@ -30,7 +30,7 @@ @@ -41,7 +41,7 @@ @@ -52,7 +52,7 @@ @@ -63,7 +63,7 @@ @@ -79,7 +79,7 @@ 代码生成 diff --git a/magic-boot-ui/src/views/lowcode/code-gen-list.vue b/magic-boot-ui/src/views/lowcode/code-gen-list.vue index bf443bb..6d39d07 100644 --- a/magic-boot-ui/src/views/lowcode/code-gen-list.vue +++ b/magic-boot-ui/src/views/lowcode/code-gen-list.vue @@ -60,7 +60,7 @@ permission: 'code:gen:save', label: '修改', type: 'text', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { formDialog.value.show() nextTick(() => magicForm.value.getDetail(row.id)) @@ -69,7 +69,7 @@ permission: 'code:gen:delete', label: '删除', type: 'text', - icon: 'ElDelete', + icon: 'ElIconDelete', click: (row) => { proxy.$common.handleDelete({ url: '/system/code/gen/delete', diff --git a/magic-boot-ui/src/views/system/dict/dict-items.vue b/magic-boot-ui/src/views/system/dict/dict-items.vue index a971cba..e6cade1 100644 --- a/magic-boot-ui/src/views/system/dict/dict-items.vue +++ b/magic-boot-ui/src/views/system/dict/dict-items.vue @@ -4,7 +4,7 @@ - + 添加 @@ -95,7 +95,7 @@ const tableOptions = reactive({ { label: '上移', type: 'text', - icon: 'ElSortUp', + icon: 'ElIconSortUp', click: (row) => { proxy.$get('/system/dict/items/sort/up',{ id: row.id, @@ -109,7 +109,7 @@ const tableOptions = reactive({ { label: '下移', type: 'text', - icon: 'ElSortDown', + icon: 'ElIconSortDown', click: (row) => { proxy.$get('/system/dict/items/sort/down',{ id: row.id, @@ -136,7 +136,7 @@ const tableOptions = reactive({ permission: 'dict:items:save', label: '修改', type: 'text', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { handleUpdate(row) } @@ -145,7 +145,7 @@ const tableOptions = reactive({ permission: 'dict:items:delete', label: '删除', type: 'text', - icon: 'ElDelete', + icon: 'ElIconDelete', click: (row) => { proxy.$common.handleDelete({ url: '/system/dict/items/delete', diff --git a/magic-boot-ui/src/views/system/dict/dict-list.vue b/magic-boot-ui/src/views/system/dict/dict-list.vue index e6c4cf8..c521c3d 100644 --- a/magic-boot-ui/src/views/system/dict/dict-list.vue +++ b/magic-boot-ui/src/views/system/dict/dict-list.vue @@ -4,7 +4,7 @@ - + 添加 @@ -111,7 +111,7 @@ const tableOptions = reactive({ permission: 'dict:save', label: '修改', type: 'text', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { handleUpdate(row) } @@ -120,7 +120,7 @@ const tableOptions = reactive({ permission: 'dict:delete', label: '删除', type: 'text', - icon: 'ElDelete', + icon: 'ElIconDelete', click: (row) => { proxy.$common.handleDelete({ url: '/system/dict/delete', @@ -136,7 +136,7 @@ const tableOptions = reactive({ permission: 'dict:items:view', label: '字典项', type: 'text', - icon: 'ElList', + icon: 'ElIconList', click: (row) => { dictItemsDialog.value.show() dictId.value = row.id diff --git a/magic-boot-ui/src/views/system/menu/menu-list.vue b/magic-boot-ui/src/views/system/menu/menu-list.vue index a979dd5..6d290c1 100644 --- a/magic-boot-ui/src/views/system/menu/menu-list.vue +++ b/magic-boot-ui/src/views/system/menu/menu-list.vue @@ -7,10 +7,10 @@ - + 搜索 - + 清空 @@ -18,10 +18,10 @@
- + 添加菜单 - 展开/折叠 + 展开/折叠 @@ -95,7 +95,7 @@ const tableOptions = reactive({ { label: '上移', type: 'text', - icon: 'ElSortUp', + icon: 'ElIconSortUp', click: (row) => { proxy.$get('/system/menu/sort/up',{ id: row.id, @@ -109,7 +109,7 @@ const tableOptions = reactive({ { label: '下移', type: 'text', - icon: 'ElSortDown', + icon: 'ElIconSortDown', click: (row) => { proxy.$get('/system/menu/sort/down',{ id: row.id, @@ -157,7 +157,7 @@ const tableOptions = reactive({ label: '添加下级菜单', type: 'text', permission: 'menu:save', - icon: 'ElPlus', + icon: 'ElIconPlus', click: (row) => { addSubMenu(row.id) } @@ -166,7 +166,7 @@ const tableOptions = reactive({ label: '修改', type: 'text', permission: 'menu:save', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { handleUpdate(row) } @@ -175,7 +175,7 @@ const tableOptions = reactive({ label: '删除', type: 'text', permission: 'menu:delete', - icon: 'ElDelete', + icon: 'ElIconDelete', click: (row) => { proxy.$common.handleDelete({ url: '/system/menu/delete', @@ -189,7 +189,7 @@ const tableOptions = reactive({ ] }) const dialogTitle = ref('') -var searchTimeout = reactive() +var searchTimeout = null const menuFormDialog = ref() const menuFormRef = ref() diff --git a/magic-boot-ui/src/views/system/monitor/online-user.vue b/magic-boot-ui/src/views/system/monitor/online-user.vue index e3ab6bb..f10dcf1 100644 --- a/magic-boot-ui/src/views/system/monitor/online-user.vue +++ b/magic-boot-ui/src/views/system/monitor/online-user.vue @@ -86,7 +86,7 @@ permission: 'online:logout', label: '踢人', type: 'text', - icon: 'ElBicycle', + icon: 'ElIconBicycle', click: (row) => { // currRow.value = row // magicDialog.value.show() diff --git a/magic-boot-ui/src/views/system/monitor/oper-log.vue b/magic-boot-ui/src/views/system/monitor/oper-log.vue index 8819377..9cf4164 100644 --- a/magic-boot-ui/src/views/system/monitor/oper-log.vue +++ b/magic-boot-ui/src/views/system/monitor/oper-log.vue @@ -2,7 +2,7 @@
diff --git a/magic-boot-ui/src/views/system/office/office-list.vue b/magic-boot-ui/src/views/system/office/office-list.vue index 76a7c95..f4f0bbe 100644 --- a/magic-boot-ui/src/views/system/office/office-list.vue +++ b/magic-boot-ui/src/views/system/office/office-list.vue @@ -13,10 +13,10 @@ - + 搜索 - + 清空 @@ -24,10 +24,10 @@
- + 添加机构 - 展开/折叠 + 展开/折叠 @@ -123,7 +123,7 @@ const tableOptions = reactive({ { label: '上移', type: 'text', - icon: 'ElSortUp', + icon: 'ElIconSortUp', click: (row) => { proxy.$get('/system/office/sort/up',{ id: row.id, @@ -137,7 +137,7 @@ const tableOptions = reactive({ { label: '下移', type: 'text', - icon: 'ElSortDown', + icon: 'ElIconSortDown', click: (row) => { proxy.$get('/system/office/sort/down',{ id: row.id, @@ -161,7 +161,7 @@ const tableOptions = reactive({ label: '添加下级机构', type: 'text', permission: 'office:save', - icon: 'ElPlus', + icon: 'ElIconPlus', click: (row) => { addSubOffice(row.id) } @@ -170,7 +170,7 @@ const tableOptions = reactive({ label: '修改', type: 'text', permission: 'office:save', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { handleUpdate(row) } @@ -179,7 +179,7 @@ const tableOptions = reactive({ label: '删除', type: 'text', permission: 'office:delete', - icon: 'ElDelete', + icon: 'ElIconDelete', if: (row) => { return row.pid != '0'; }, @@ -195,7 +195,7 @@ const tableOptions = reactive({ permission: 'office:user:list', label: '用户列表', type: 'text', - icon: 'ElUserFilled', + icon: 'ElIconUserFilled', click: (row) => { proxy.$router.push({ path: '/system/user/user-list', diff --git a/magic-boot-ui/src/views/system/role/role-list.vue b/magic-boot-ui/src/views/system/role/role-list.vue index 37c24c9..17efa2a 100644 --- a/magic-boot-ui/src/views/system/role/role-list.vue +++ b/magic-boot-ui/src/views/system/role/role-list.vue @@ -4,7 +4,7 @@ - + 添加 @@ -41,7 +41,7 @@ - + @@ -127,7 +127,7 @@ const tableOptions = reactive({ permission: 'role:save', label: '修改', type: 'text', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { handleUpdate(row) } @@ -136,7 +136,7 @@ const tableOptions = reactive({ permission: 'role:delete', label: '删除', type: 'text', - icon: 'ElDelete', + icon: 'ElIconDelete', click: (row) => { proxy.$common.handleDelete({ url: '/system/role/delete', @@ -149,7 +149,7 @@ const tableOptions = reactive({ permission: 'role:permission', label: '权限', type: 'text', - icon: 'ElPlus', + icon: 'ElIconPlus', click: (row) => { temp.value.id = row.id assignPermissionsDialog.value.show() @@ -159,7 +159,7 @@ const tableOptions = reactive({ permission: 'role:user:list', label: '用户列表', type: 'text', - icon: 'ElUserFilled', + icon: 'ElIconUserFilled', click: (row) => { proxy.$router.push({ path: '/system/user/user-list', diff --git a/magic-boot-ui/src/views/system/test/test-list.vue b/magic-boot-ui/src/views/system/test/test-list.vue index aaf1d41..9299a8f 100644 --- a/magic-boot-ui/src/views/system/test/test-list.vue +++ b/magic-boot-ui/src/views/system/test/test-list.vue @@ -3,7 +3,7 @@
- + 添加 diff --git a/magic-boot-ui/src/views/system/user/user-list.vue b/magic-boot-ui/src/views/system/user/user-list.vue index 08899c0..de19bb0 100644 --- a/magic-boot-ui/src/views/system/user/user-list.vue +++ b/magic-boot-ui/src/views/system/user/user-list.vue @@ -28,14 +28,14 @@ - + 添加 @@ -192,7 +192,7 @@ const tableOptions = reactive({ permission: 'user:save', label: '修改', type: 'text', - icon: 'ElEdit', + icon: 'ElIconEdit', click: (row) => { handleUpdate(row) } @@ -201,7 +201,7 @@ const tableOptions = reactive({ permission: 'user:delete', label: '删除', type: 'text', - icon: 'ElDelete', + icon: 'ElIconDelete', if: (row) => { return row.id != '1' },