diff --git a/mock/login.ts b/mock/login.ts index a9c71b1..686c34c 100644 --- a/mock/login.ts +++ b/mock/login.ts @@ -10,7 +10,7 @@ export default defineFakeRoute([ return { success: true, data: { - avatar: "https://avatars.githubusercontent.com/u/44761321", + avatar: "https://pic3.zhimg.com/80/v2-0888fd6c14153bb36fb630230f73a802_720w.webp", username: "admin", nickname: "小铭", // 一个用户可能有多个角色 @@ -24,7 +24,7 @@ export default defineFakeRoute([ return { success: true, data: { - avatar: "https://avatars.githubusercontent.com/u/52823142", + avatar: "https://pic2.zhimg.com/v2-9ee815c09ec2e1f3a007e8d77ec06375_r.jpg", username: "common", nickname: "小林", roles: ["common"], diff --git a/src/components/TableBar/src/bar.tsx b/src/components/TableBar/src/bar.tsx index 2d8ed36..918a1fa 100644 --- a/src/components/TableBar/src/bar.tsx +++ b/src/components/TableBar/src/bar.tsx @@ -3,7 +3,6 @@ import { transformI18n } from "@/plugins/i18n"; import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { computed, defineComponent, getCurrentInstance, nextTick, type PropType, ref, unref } from "vue"; import { cloneDeep, delay, getKeyList, isBoolean, isFunction } from "@pureadmin/utils"; - import DragIcon from "@/assets/table-bar/drag.svg?component"; import ExpandIcon from "@/assets/table-bar/expand.svg?component"; import RefreshIcon from "@/assets/table-bar/refresh.svg?component"; @@ -32,6 +31,34 @@ const props = { tableKey: { type: [String, Number] as PropType, default: "0" + }, + dataList: { + type: Array, + default: [] + }, + loading: { + type: Boolean, + default: false + }, + pagination: { + type: Object, + default: {} + }, + size: { + type: String as PropType, + default: "default" + }, + handleSelectionChange: { + type: String as PropType, + default: () => {} + }, + handleSizeChange: { + type: String as PropType, + default: () => {} + }, + handleCurrentChange: { + type: String as PropType, + default: () => {} } }; @@ -52,7 +79,7 @@ export default defineComponent({ const dynamicColumns = ref(cloneDeep(props?.columns)); const getDropdownItemStyle = computed(() => { - return s => { + return (s: string) => { return { background: s === size.value ? useEpThemeStoreHook().epThemeColor : "", color: s === size.value ? "#fff" : "var(--el-text-color-primary)" @@ -161,7 +188,7 @@ export default defineComponent({ }; const isFixedColumn = (label: string) => { - return dynamicColumns.value.filter(item => transformI18n(item.label) === transformI18n(label))[0].fixed ? true : false; + return !!dynamicColumns.value.filter(item => transformI18n(item.label) === transformI18n(label))[0].fixed; }; const rendTippyProps = (content: string) => { @@ -181,7 +208,7 @@ export default defineComponent({ return () => ( <> -
+
{slots?.title ? slots.title() :

{props.title}

}
@@ -244,6 +271,24 @@ export default defineComponent({ size: size.value, dynamicColumns: dynamicColumns.value })} + {/**/}
); diff --git a/src/views/monitor/logs/login/index.vue b/src/views/monitor/logs/login/index.vue index b29507b..ab6e339 100644 --- a/src/views/monitor/logs/login/index.vue +++ b/src/views/monitor/logs/login/index.vue @@ -4,9 +4,9 @@ import { useRole } from "@/hooks/monitor/useRole"; import { getPickerShortcuts } from "../../utils"; import { PureTableBar } from "@/components/TableBar"; import { useRenderIcon } from "@/components/ReIcon/src/hooks"; -import PureTable from "@pureadmin/table"; import Delete from "@iconify-icons/ep/delete"; import Refresh from "@iconify-icons/ep/refresh"; +import PureTable from "@pureadmin/table"; defineOptions({ name: "LoginLog" @@ -49,7 +49,7 @@ const { form, loading, columns, dataList, pagination, selectedNum, onSearch, cle