twh_eastasia/vue-pure-admin
1
0
Fork 0
mirror of https://github.com/pure-admin/vue-pure-admin.git synced 2025-06-30 09:24:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into gitee

Browse Source
This commit is contained in:
xiaoxian521 2024-03-16 23:27:38 +08:00
commit 56ec3eda80
17 changed files with 813 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
mock/system.ts
View File

@ -140,6 +140,234 @@ export default defineFakeRoute([
};
}
},
// 角色管理-权限-菜单权限
{
url: "/role-menu",
method: "post",
response: () => {
return {
success: true,
data: [
// 外部页面
{
parentId: 0,
id: 100,
menuType: 0, // 菜单类型（0代表菜单、1代表iframe、2代表外链、3代表按钮）
title: "menus.hsExternalPage"
},
{
parentId: 100,
id: 101,
menuType: 0,
title: "menus.hsExternalDoc"
},
{
parentId: 101,
id: 102,
menuType: 2,
title: "menus.externalLink"
},
{
parentId: 101,
id: 103,
menuType: 2,
title: "menus.pureutilsLink"
},
{
parentId: 100,
id: 104,
menuType: 1,
title: "menus.hsEmbeddedDoc"
},
{
parentId: 104,
id: 105,
menuType: 1,
title: "menus.hsEpDocument"
},
{
parentId: 104,
id: 106,
menuType: 1,
title: "menus.hsTailwindcssDocument"
},
{
parentId: 104,
id: 107,
menuType: 1,
title: "menus.hsVueDocument"
},
{
parentId: 104,
id: 108,
menuType: 1,
title: "menus.hsViteDocument"
},
{
parentId: 104,
id: 109,
menuType: 1,
title: "menus.hsPiniaDocument"
},
{
parentId: 104,
id: 110,
menuType: 1,
title: "menus.hsRouterDocument"
},
// 权限管理
{
parentId: 0,
id: 200,
menuType: 0,
title: "menus.permission"
},
{
parentId: 200,
id: 201,
menuType: 0,
title: "menus.permissionPage"
},
{
parentId: 200,
id: 202,
menuType: 0,
title: "menus.permissionButton"
},
{
parentId: 202,
id: 203,
menuType: 3,
title: "添加"
},
{
parentId: 202,
id: 204,
menuType: 3,
title: "修改"
},
{
parentId: 202,
id: 205,
menuType: 3,
title: "删除"
},
// 系统管理
{
parentId: 0,
id: 300,
menuType: 0,
title: "menus.hssysManagement"
},
{
parentId: 300,
id: 301,
menuType: 0,
title: "menus.hsUser"
},
{
parentId: 300,
id: 302,
menuType: 0,
title: "menus.hsRole"
},
{
parentId: 300,
id: 303,
menuType: 0,
title: "menus.hsSystemMenu"
},
{
parentId: 300,
id: 304,
menuType: 0,
title: "menus.hsDept"
},
// 系统监控
{
parentId: 0,
id: 400,
menuType: 0,
title: "menus.hssysMonitor"
},
{
parentId: 400,
id: 401,
menuType: 0,
title: "menus.hsOnlineUser"
},
{
parentId: 400,
id: 402,
menuType: 0,
title: "menus.hsLoginLog"
},
{
parentId: 400,
id: 403,
menuType: 0,
title: "menus.hsOperationLog"
},
{
parentId: 400,
id: 404,
menuType: 0,
title: "menus.hsSystemLog"
},
// 标签页操作
{
parentId: 0,
id: 500,
menuType: 0,
title: "menus.hstabs"
},
{
parentId: 500,
id: 501,
menuType: 0,
title: "menus.hstabs"
},
{
parentId: 500,
id: 502,
menuType: 0,
title: "query传参模式"
},
{
parentId: 500,
id: 503,
menuType: 0,
title: "params传参模式"
}
]
};
}
},
// 角色管理-权限-菜单权限-根据角色 id 查对应菜单
{
url: "/role-menu-ids",
method: "post",
response: ({ body }) => {
if (body.id == 1) {
return {
success: true,
data: [
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201,
202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403,
404, 500, 501, 502, 503
]
};
} else if (body.id == 2) {
return {
success: true,
data: [
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500,
501, 502, 503
]
};
}
}
},
// 菜单管理
{
url: "/menu",

22
package.json
View File

@ -54,7 +54,7 @@
"@logicflow/extension": "^1.2.22",
"@pureadmin/descriptions": "^1.2.1",
"@pureadmin/table": "^3.1.2",
"@pureadmin/utils": "^2.4.5",
"@pureadmin/utils": "^2.4.6",
"@vueuse/core": "^10.9.0",
"@vueuse/motion": "^2.1.0",
"@wangeditor/editor": "^5.1.23",
@ -80,7 +80,7 @@
"pinyin-pro": "^3.19.6",
"plus-pro-components": "^0.0.2",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
"qs": "^6.12.0",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.2",
"swiper": "^11.0.7",
@ -99,8 +99,8 @@
"vue-waterfall-plugin-next": "^2.4.3",
"vue3-danmaku": "^1.6.0",
"vuedraggable": "^4.1.0",
"wavesurfer.js": "^7.7.3",
"xgplayer": "^3.0.13",
"wavesurfer.js": "^7.7.5",
"xgplayer": "^3.0.14",
"xlsx": "^0.18.5"
},
"devDependencies": {
@ -117,13 +117,13 @@
"@types/gradient-string": "^1.1.5",
"@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20.11.26",
"@types/node": "^20.11.27",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.12",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"autoprefixer": "^10.4.18",
@ -134,7 +134,7 @@
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-vue": "^9.22.0",
"eslint-plugin-vue": "^9.23.0",
"gradient-string": "^2.0.2",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
@ -145,7 +145,7 @@
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.71.1",
"sass": "^1.72.0",
"stylelint": "^16.2.1",
"stylelint-config-recess-order": "^5.0.0",
"stylelint-config-recommended-vue": "^1.5.0",
@ -153,8 +153,8 @@
"stylelint-prettier": "^5.0.0",
"svgo": "^3.2.0",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3",
"vite": "^5.1.5",
"typescript": "^5.4.2",
"vite": "^5.1.6",
"vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-fake-server": "^2.1.1",

470
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

10
src/api/system.ts
View File

@ -73,3 +73,13 @@ export const getSystemLogsList = (data?: object) => {
export const getSystemLogsDetail = (data?: object) => {
return http.request<Result>("post", "/system-logs-detail", { data });
};
/** 获取角色管理-权限-菜单权限 */
export const getRoleMenu = (data?: object) => {
return http.request<Result>("post", "/role-menu", { data });
};
/** 获取角色管理-权限-菜单权限-根据角色 id 查对应菜单 */
export const getRoleMenuIds = (data?: object) => {
return http.request<Result>("post", "/role-menu-ids", { data });
};

2
src/views/monitor/logs/login/index.vue
View File

@ -39,7 +39,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="用户名" prop="username">
<el-input

2
src/views/monitor/logs/operation/index.vue
View File

@ -39,7 +39,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="所属模块" prop="module">
<el-input

2
src/views/monitor/logs/system/index.vue
View File

@ -42,7 +42,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="所属模块" prop="module">
<el-input

2
src/views/monitor/online/index.vue
View File

@ -33,7 +33,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="用户名" prop="username">
<el-input

2
src/views/system/dept/index.vue
View File

@ -34,7 +34,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="部门名称：" prop="name">
<el-input

3
src/views/system/dept/utils/hook.tsx
View File

@ -7,7 +7,7 @@ import { usePublicHooks } from "../../hooks";
import { addDialog } from "@/components/ReDialog";
import { reactive, ref, onMounted, h } from "vue";
import type { FormItemProps } from "../utils/types";
import { cloneDeep, isAllEmpty } from "@pureadmin/utils";
import { cloneDeep, isAllEmpty, deviceDetection } from "@pureadmin/utils";
export function useDept() {
const form = reactive({
@ -120,6 +120,7 @@ export function useDept() {
},
width: "40%",
draggable: true,
fullscreen: deviceDetection(),
fullscreenIcon: true,
closeOnClickModal: false,
contentRenderer: () => h(editForm, { ref: formRef }),

2
src/views/system/menu/index.vue
View File

@ -35,7 +35,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="菜单名称：" prop="title">
<el-input

3
src/views/system/menu/utils/hook.tsx
View File

@ -6,8 +6,8 @@ import { transformI18n } from "@/plugins/i18n";
import { addDialog } from "@/components/ReDialog";
import { reactive, ref, onMounted, h } from "vue";
import type { FormItemProps } from "../utils/types";
import { cloneDeep, isAllEmpty } from "@pureadmin/utils";
import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import { cloneDeep, isAllEmpty, deviceDetection } from "@pureadmin/utils";
export function useMenu() {
const form = reactive({
@ -161,6 +161,7 @@ export function useMenu() {
},
width: "45%",
draggable: true,
fullscreen: deviceDetection(),
fullscreenIcon: true,
closeOnClickModal: false,
contentRenderer: () => h(editForm, { ref: formRef }),

282
src/views/system/role/index.vue
View File

@ -1,8 +1,14 @@
<script setup lang="ts">
import { ref } from "vue";
import { useRole } from "./utils/hook";
import { ref, computed, nextTick, onMounted } from "vue";
import { PureTableBar } from "@/components/RePureTableBar";
import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import {
delay,
subBefore,
deviceDetection,
useResizeObserver
} from "@pureadmin/utils";
// import Database from "@iconify-icons/ri/database-2-line";
// import More from "@iconify-icons/ep/more-filled";
@ -11,29 +17,77 @@ import EditPen from "@iconify-icons/ep/edit-pen";
import Refresh from "@iconify-icons/ep/refresh";
import Menu from "@iconify-icons/ep/menu";
import AddFill from "@iconify-icons/ri/add-circle-line";
import Close from "@iconify-icons/ep/close";
import Check from "@iconify-icons/ep/check";
defineOptions({
name: "SystemRole"
});
const iconClass = computed(() => {
return [
"w-[22px]",
"h-[22px]",
"flex",
"justify-center",
"items-center",
"outline-none",
"rounded-[4px]",
"cursor-pointer",
"transition-colors",
"hover:bg-[#0000000f]",
"dark:hover:bg-[#ffffff1f]",
"dark:hover:text-[#ffffffd9]"
];
});
const treeRef = ref();
const formRef = ref();
const tableRef = ref();
const contentRef = ref();
const treeHeight = ref();
const {
form,
isShow,
curRow,
loading,
columns,
rowStyle,
dataList,
treeData,
treeProps,
isLinkage,
pagination,
isExpandAll,
isSelectAll,
treeSearchValue,
// buttonClass,
onSearch,
resetForm,
openDialog,
handleMenu,
handleSave,
handleDelete,
filterMethod,
transformI18n,
onQueryChanged,
// handleDatabase,
handleSizeChange,
handleCurrentChange,
handleSelectionChange
} = useRole();
} = useRole(treeRef);
onMounted(() => {
useResizeObserver(contentRef, async () => {
await nextTick();
delay(60).then(() => {
treeHeight.value = parseFloat(
subBefore(tableRef.value.getTableDoms().tableWrapper.style.height, "px")
);
});
});
});
</script>
<template>
@ -42,7 +96,7 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="角色名称：" prop="name">
<el-input
@ -86,79 +140,87 @@ const {
</el-form-item>
</el-form>
<PureTableBar
title="角色管理（仅演示，操作后不生效）"
:columns="columns"
@refresh="onSearch"
<div
ref="contentRef"
:class="['flex', deviceDetection() ? 'flex-wrap' : '']"
>
<template #buttons>
<el-button
type="primary"
:icon="useRenderIcon(AddFill)"
@click="openDialog()"
>
新增角色
</el-button>
</template>
<template v-slot="{ size, dynamicColumns }">
<pure-table
align-whole="center"
showOverflowTooltip
table-layout="auto"
:loading="loading"
:size="size"
adaptive
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'
}"
@selection-change="handleSelectionChange"
@page-size-change="handleSizeChange"
@page-current-change="handleCurrentChange"
>
<template #operation="{ row }">
<el-button
class="reset-margin"
link
type="primary"
:size="size"
:icon="useRenderIcon(EditPen)"
@click="openDialog('修改', row)"
>
修改
</el-button>
<el-button
class="reset-margin"
link
type="primary"
:size="size"
:icon="useRenderIcon(Menu)"
@click="handleMenu"
>
菜单权限
</el-button>
<el-popconfirm
:title="`是否确认删除角色名称为${row.name}的这条数据`"
@confirm="handleDelete(row)"
>
<template #reference>
<el-button
class="reset-margin"
link
type="primary"
:size="size"
:icon="useRenderIcon(Delete)"
>
删除
</el-button>
</template>
</el-popconfirm>
<!-- <el-dropdown>
<PureTableBar
:class="[isShow && !deviceDetection() ? '!w-[60vw]' : 'w-full']"
style="transition: width 220ms cubic-bezier(0.4, 0, 0.2, 1)"
title="角色管理（仅演示，操作后不生效）"
:columns="columns"
@refresh="onSearch"
>
<template #buttons>
<el-button
type="primary"
:icon="useRenderIcon(AddFill)"
@click="openDialog()"
>
新增角色
</el-button>
</template>
<template v-slot="{ size, dynamicColumns }">
<pure-table
ref="tableRef"
align-whole="center"
showOverflowTooltip
table-layout="auto"
:loading="loading"
:size="size"
adaptive
:row-style="rowStyle"
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'
}"
@selection-change="handleSelectionChange"
@page-size-change="handleSizeChange"
@page-current-change="handleCurrentChange"
>
<template #operation="{ row }">
<el-button
class="reset-margin"
link
type="primary"
:size="size"
:icon="useRenderIcon(EditPen)"
@click="openDialog('修改', row)"
>
修改
</el-button>
<el-popconfirm
:title="`是否确认删除角色名称为${row.name}的这条数据`"
@confirm="handleDelete(row)"
>
<template #reference>
<el-button
class="reset-margin"
link
type="primary"
:size="size"
:icon="useRenderIcon(Delete)"
>
删除
</el-button>
</template>
</el-popconfirm>
<el-button
class="reset-margin"
link
type="primary"
:size="size"
:icon="useRenderIcon(Menu)"
@click="handleMenu(row)"
>
权限
</el-button>
<!-- <el-dropdown>
<el-button
class="ml-3 mt-[2px]"
link
@ -195,10 +257,74 @@ const {
</el-dropdown-menu>
</template>
</el-dropdown> -->
</template>
</pure-table>
</template>
</PureTableBar>
<div
v-if="isShow"
class="!min-w-[calc(100vw-60vw-268px)] mt-2 px-2 pb-2 bg-bg_color ml-2 overflow-auto"
>
<div class="flex justify-between w-full px-3 pt-5 pb-4">
<div class="flex">
<span :class="iconClass">
<IconifyIconOffline
v-tippy="{
content: '关闭'
}"
class="dark:text-white"
width="18px"
height="18px"
:icon="Close"
@click="handleMenu"
/>
</span>
<span :class="[iconClass, 'ml-2']">
<IconifyIconOffline
v-tippy="{
content: '保存菜单权限'
}"
class="dark:text-white"
width="18px"
height="18px"
:icon="Check"
@click="handleSave"
/>
</span>
</div>
<p class="font-bold truncate">
菜单权限
{{ `${curRow?.name ? `（${curRow.name}）` : ""}` }}
</p>
</div>
<el-input
v-model="treeSearchValue"
placeholder="请输入菜单进行搜索"
class="mb-1"
clearable
@input="onQueryChanged"
/>
<div class="flex flex-wrap">
<el-checkbox v-model="isExpandAll" label="展开/折叠" />
<el-checkbox v-model="isSelectAll" label="全选/全不选" />
<el-checkbox v-model="isLinkage" label="父子联动" />
</div>
<el-tree-v2
ref="treeRef"
show-checkbox
:data="treeData"
:props="treeProps"
:height="treeHeight"
:check-strictly="!isLinkage"
:filter-method="filterMethod"
>
<template #default="{ node }">
<span>{{ transformI18n(node.label) }}</span>
</template>
</pure-table>
</template>
</PureTableBar>
</el-tree-v2>
</div>
</div>
</div>
</template>

111
src/views/system/role/utils/hook.tsx
View File

@ -1,25 +1,41 @@
import dayjs from "dayjs";
import editForm from "../form.vue";
import { handleTree } from "@/utils/tree";
import { message } from "@/utils/message";
import { getRoleList } from "@/api/system";
import { ElMessageBox } from "element-plus";
import { usePublicHooks } from "../../hooks";
import { transformI18n } from "@/plugins/i18n";
import { addDialog } from "@/components/ReDialog";
import type { FormItemProps } from "../utils/types";
import type { PaginationProps } from "@pureadmin/table";
import { reactive, ref, onMounted, h, toRaw } from "vue";
import { getKeyList, deviceDetection } from "@pureadmin/utils";
import { getRoleList, getRoleMenu, getRoleMenuIds } from "@/api/system";
import { type Ref, reactive, ref, onMounted, h, toRaw, watch } from "vue";
export function useRole() {
export function useRole(treeRef: Ref) {
const form = reactive({
name: "",
code: "",
status: ""
});
const curRow = ref();
const formRef = ref();
const dataList = ref([]);
const treeIds = ref([]);
const treeData = ref([]);
const isShow = ref(false);
const loading = ref(true);
const isLinkage = ref(false);
const treeSearchValue = ref();
const switchLoadMap = ref({});
const isExpandAll = ref(false);
const isSelectAll = ref(false);
const { switchStyle } = usePublicHooks();
const treeProps = {
value: "id",
label: "title",
children: "children"
};
const pagination = reactive<PaginationProps>({
total: 0,
pageSize: 10,
@ -29,22 +45,18 @@ export function useRole() {
const columns: TableColumnList = [
{
label: "角色编号",
prop: "id",
minWidth: 100
prop: "id"
},
{
label: "角色名称",
prop: "name",
minWidth: 120
prop: "name"
},
{
label: "角色标识",
prop: "code",
minWidth: 150
prop: "code"
},
{
label: "状态",
minWidth: 130,
cellRenderer: scope => (
<el-switch
size={scope.props.size === "small" ? "small" : "default"}
@ -58,24 +70,25 @@ export function useRole() {
style={switchStyle.value}
onChange={() => onChange(scope as any)}
/>
)
),
minWidth: 90
},
{
label: "备注",
prop: "remark",
minWidth: 150
minWidth: 160
},
{
label: "创建时间",
minWidth: 180,
prop: "createTime",
minWidth: 160,
formatter: ({ createTime }) =>
dayjs(createTime).format("YYYY-MM-DD HH:mm:ss")
},
{
label: "操作",
fixed: "right",
width: 240,
width: 210,
slot: "operation"
}
];
@ -179,6 +192,7 @@ export function useRole() {
},
width: "40%",
draggable: true,
fullscreen: deviceDetection(),
fullscreenIcon: true,
closeOnClickModal: false,
contentRenderer: () => h(editForm, { ref: formRef }),
@ -210,29 +224,92 @@ export function useRole() {
}
/** 菜单权限 */
function handleMenu() {
message("等菜单管理页面开发后完善");
async function handleMenu(row?: any) {
const { id } = row;
if (id) {
curRow.value = row;
isShow.value = true;
const { data } = await getRoleMenuIds({ id });
treeRef.value.setCheckedKeys(data);
} else {
curRow.value = null;
isShow.value = false;
}
}
/** 高亮当前权限选中行 */
function rowStyle({ row: { id } }) {
return {
cursor: "pointer",
background: id === curRow.value?.id ? "var(--el-fill-color-light)" : ""
};
}
/** 菜单权限-保存 */
function handleSave() {
const { id, name } = curRow.value;
// 根据用户 id 调用实际项目中菜单权限修改接口
console.log(id, treeRef.value.getCheckedKeys());
message(`角色名称为${name}的菜单权限修改成功`, {
type: "success"
});
}
/** 数据权限 可自行开发 */
// function handleDatabase() {}
onMounted(() => {
const onQueryChanged = (query: string) => {
treeRef.value!.filter(query);
};
const filterMethod = (query: string, node) => {
return transformI18n(node.title)!.includes(query);
};
onMounted(async () => {
onSearch();
const { data } = await getRoleMenu();
treeIds.value = getKeyList(data, "id");
treeData.value = handleTree(data);
});
watch(isExpandAll, val => {
val
? treeRef.value.setExpandedKeys(treeIds.value)
: treeRef.value.setExpandedKeys([]);
});
watch(isSelectAll, val => {
val
? treeRef.value.setCheckedKeys(treeIds.value)
: treeRef.value.setCheckedKeys([]);
});
return {
form,
isShow,
curRow,
loading,
columns,
rowStyle,
dataList,
treeData,
treeProps,
isLinkage,
pagination,
isExpandAll,
isSelectAll,
treeSearchValue,
// buttonClass,
onSearch,
resetForm,
openDialog,
handleMenu,
handleSave,
handleDelete,
filterMethod,
transformI18n,
onQueryChanged,
// handleDatabase,
handleSizeChange,
handleCurrentChange,

11
src/views/system/user/index.vue
View File

@ -32,6 +32,7 @@ const {
selectedNum,
pagination,
buttonClass,
deviceDetection,
onSearch,
resetForm,
onbatchDel,
@ -50,20 +51,22 @@ const {
</script>
<template>
<div class="flex justify-between">
<div :class="['flex', 'justify-between', deviceDetection() && 'flex-wrap']">
<tree
ref="treeRef"
class="min-w-[200px] mr-2"
:class="['mr-2', deviceDetection() ? 'w-full' : 'min-w-[200px]']"
:treeData="treeData"
:treeLoading="treeLoading"
@tree-select="onTreeSelect"
/>
<div class="w-[calc(100%-200px)]">
<div
:class="[deviceDetection() ? ['w-full', 'mt-2'] : 'w-[calc(100%-200px)]']"
>
<el-form
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
>
<el-form-item label="用户名称：" prop="username">
<el-input

5
src/views/system/user/tree.vue
View File

@ -36,8 +36,9 @@ const defaultProps = {
const buttonClass = computed(() => {
return [
"!h-[20px]",
"!text-sm",
"reset-margin",
"!text-gray-500",
"!text-[var(--el-text-color-regular)]",
"dark:!text-white",
"dark:hover:!text-primary"
];
@ -96,7 +97,7 @@ defineExpose({ onTreeReset });
<div
v-loading="props.treeLoading"
class="h-full bg-bg_color overflow-auto"
:style="{ minHeight: `calc(100vh - 145px)` }"
:style="{ minHeight: `calc(100vh - 141px)` }"
>
<div class="flex items-center h-[34px]">
<el-input

12
src/views/system/user/utils/hook.tsx
View File

@ -10,7 +10,12 @@ import { usePublicHooks } from "../../hooks";
import { addDialog } from "@/components/ReDialog";
import type { PaginationProps } from "@pureadmin/table";
import type { FormItemProps, RoleFormItemProps } from "../utils/types";
import { hideTextAtIndex, getKeyList, isAllEmpty } from "@pureadmin/utils";
import {
getKeyList,
isAllEmpty,
hideTextAtIndex,
deviceDetection
} from "@pureadmin/utils";
import {
getRoleIds,
getDeptList,
@ -322,6 +327,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
},
width: "46%",
draggable: true,
fullscreen: deviceDetection(),
fullscreenIcon: true,
closeOnClickModal: false,
contentRenderer: () => h(editForm, { ref: formRef }),
@ -360,6 +366,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
width: "40%",
draggable: true,
closeOnClickModal: false,
fullscreen: deviceDetection(),
contentRenderer: () =>
h(croppingUpload, {
ref: cropRef,
@ -389,6 +396,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
width: "30%",
draggable: true,
closeOnClickModal: false,
fullscreen: deviceDetection(),
contentRenderer: () => (
<>
<ElForm ref={ruleFormRef} model={pwdForm}>
@ -471,6 +479,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
},
width: "400px",
draggable: true,
fullscreen: deviceDetection(),
fullscreenIcon: true,
closeOnClickModal: false,
contentRenderer: () => h(roleForm),
@ -507,6 +516,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
selectedNum,
pagination,
buttonClass,
deviceDetection,
onSearch,
resetForm,
onbatchDel,