diff --git a/data/magic-api/api/后台/在线用户/列表.ms b/data/magic-api/api/后台/在线用户/列表.ms index 799dc53..66556e5 100644 --- a/data/magic-api/api/后台/在线用户/列表.ms +++ b/data/magic-api/api/后台/在线用户/列表.ms @@ -5,7 +5,7 @@ "groupId" : "d95a58e77d314370862ffc4cdfdb8283", "name" : "列表", "createTime" : null, - "updateTime" : 1647396892675, + "updateTime" : 1647433235510, "lock" : null, "createBy" : null, "updateBy" : null, @@ -113,6 +113,7 @@ return db.page(""" select su.username, so.name office_name, + sll.address, sll.token, sll.ip, sll.browser, diff --git a/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/后台/安全/登录.ms index b247be8..d00ab57 100644 --- a/data/magic-api/api/后台/安全/登录.ms +++ b/data/magic-api/api/后台/安全/登录.ms @@ -5,7 +5,7 @@ "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "登录", "createTime" : null, - "updateTime" : 1647396539380, + "updateTime" : 1647561372842, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -178,6 +178,7 @@ } } ================================ +import org.ssssssss.magicboot.utils.AddressUtil import log import 'cn.dev33.satoken.secure.SaSecureUtil'; import 'cn.dev33.satoken.stp.StpUtil'; @@ -205,7 +206,8 @@ var loginLog = { type: '成功', ip: request.getClientIP(), browser: ua.getBrowser().toString(), - os: ua.getOs().toString() + os: ua.getOs().toString(), + address: AddressUtil.getAddress(request.getClientIP()) } if(!user){ diff --git a/magic-boot-ui/src/assets/css/common.css b/magic-boot-ui/src/assets/css/common.css index 39377ea..4c17e37 100644 --- a/magic-boot-ui/src/assets/css/common.css +++ b/magic-boot-ui/src/assets/css/common.css @@ -37,6 +37,9 @@ body{ --el-avatar-bg-color: var(--mb-main-color); border: 1px solid white; } +.el-dialog__body{ + padding: 5px 20px; +} .app-container hr { border: none; height: 1px; diff --git a/magic-boot-ui/src/components/magic/advanced/mb-form.vue b/magic-boot-ui/src/components/magic/advanced/mb-form.vue index 52fd2ee..5b98297 100644 --- a/magic-boot-ui/src/components/magic/advanced/mb-form.vue +++ b/magic-boot-ui/src/components/magic/advanced/mb-form.vue @@ -11,7 +11,7 @@ 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 a6c3380..c016c21 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 @@ -1,77 +1,85 @@ - diff --git a/magic-boot-ui/src/components/magic/basic/mb-table.vue b/magic-boot-ui/src/components/magic/basic/mb-table.vue index 5be3dec..4440b05 100644 --- a/magic-boot-ui/src/components/magic/basic/mb-table.vue +++ b/magic-boot-ui/src/components/magic/basic/mb-table.vue @@ -154,6 +154,9 @@ function reloadList() { listCurrent.value = 1 getList() } + if (props.data) { + handlerData() + } } function handlerData() { diff --git a/magic-boot-ui/src/components/magic/form/mb-checkbox.vue b/magic-boot-ui/src/components/magic/form/mb-checkbox-group.vue similarity index 98% rename from magic-boot-ui/src/components/magic/form/mb-checkbox.vue rename to magic-boot-ui/src/components/magic/form/mb-checkbox-group.vue index efda5d8..9872964 100644 --- a/magic-boot-ui/src/components/magic/form/mb-checkbox.vue +++ b/magic-boot-ui/src/components/magic/form/mb-checkbox-group.vue @@ -88,7 +88,6 @@ import {watch, ref, getCurrentInstance} from "vue"; } watch(() => props.modelValue, (value) => { - console.log(value) emit('update:modelValue', value) }) diff --git a/magic-boot-ui/src/components/magic/form/mb-input.vue b/magic-boot-ui/src/components/magic/form/mb-input.vue index 62aaa5e..e2121f7 100644 --- a/magic-boot-ui/src/components/magic/form/mb-input.vue +++ b/magic-boot-ui/src/components/magic/form/mb-input.vue @@ -1,5 +1,5 @@