From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/system/role/index.vue | 252 +++++++++++++++++++++++++-------------------------
1 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index bb6fc2c..26c17de 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="mb-[10px]" v-show="showSearch">
+ <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
@@ -28,8 +28,8 @@
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="handleQuery" icon="Search">鎼滅储</el-button>
- <el-button @click="resetQuery" icon="Refresh">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
</el-card>
@@ -40,24 +40,24 @@
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
- <el-button type="primary" plain @click="handleAdd()" icon="Plus" v-hasPermi="['system:role:add']">鏂板</el-button>
+ <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain @click="handleUpdate()" :disabled="single" icon="Edit" v-hasPermi="['system:role:edit']">淇敼</el-button>
+ <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain :disabled="ids.length === 0" @click="handleDelete()" v-hasPermi="['system:role:delete']">鍒犻櫎</el-button>
+ <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
<el-table ref="roleTableRef" v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="120" v-if="false" />
+ <el-table-column v-if="false" label="瑙掕壊缂栧彿" prop="roleId" width="120" />
<el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="鏉冮檺瀛楃" prop="roleKey" :show-overflow-tooltip="true" width="200" />
<el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="100" />
@@ -74,17 +74,17 @@
<el-table-column fixed="right" label="鎿嶄綔" width="180">
<template #default="scope">
- <el-tooltip content="淇敼" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="淇敼" placement="top">
+ <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip content="鏁版嵁鏉冮檺" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="鏁版嵁鏉冮檺" placement="top">
+ <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip content="鍒嗛厤鐢ㄦ埛" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="鍒嗛厤鐢ㄦ埛" placement="top">
+ <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
@@ -99,7 +99,7 @@
/>
</el-card>
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
<el-form ref="roleFormRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
<el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" />
@@ -120,9 +120,7 @@
</el-form-item>
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
- dict.label
- }}</el-radio>
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鑿滃崟鏉冮檺">
@@ -130,10 +128,10 @@
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩</el-checkbox>
<el-tree
+ ref="menuRef"
class="tree-border"
:data="menuOptions"
show-checkbox
- ref="menuRef"
node-key="id"
:check-strictly="!form.menuCheckStrictly"
empty-text="鍔犺浇涓紝璇风◢鍊�"
@@ -153,8 +151,8 @@
</el-dialog>
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
- <el-dialog :title="dialog.title" v-model="openDataScope" width="500px" append-to-body>
- <el-form :model="form" label-width="80px" ref="dataScopeRef">
+ <el-dialog v-model="openDataScope" :title="dialog.title" width="500px" append-to-body>
+ <el-form ref="dataScopeRef" :model="form" label-width="80px">
<el-form-item label="瑙掕壊鍚嶇О">
<el-input v-model="form.roleName" :disabled="true" />
</el-form-item>
@@ -166,16 +164,16 @@
<el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏁版嵁鏉冮檺" v-show="form.dataScope === '2'">
+ <el-form-item v-show="form.dataScope === '2'" label="鏁版嵁鏉冮檺">
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">灞曞紑/鎶樺彔</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
<el-tree
+ ref="deptRef"
class="tree-border"
:data="deptOptions"
show-checkbox
default-expand-all
- ref="deptRef"
node-key="id"
:check-strictly="!form.deptCheckStrictly"
empty-text="鍔犺浇涓紝璇风◢鍊�"
@@ -194,7 +192,7 @@
</template>
<script setup name="Role" lang="ts">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from '@/api/system/role';
import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
@@ -204,29 +202,29 @@
const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
const roleList = ref<RoleVO[]>();
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref<Array<string | number>>([])
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
-const menuOptions = ref<MenuTreeOption[]>([])
-const menuExpand = ref(false)
-const menuNodeAll = ref(false)
-const deptExpand = ref(true)
-const deptNodeAll = ref(false)
-const deptOptions = ref<DeptTreeOption[]>([])
-const openDataScope = ref(false)
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const menuOptions = ref<MenuTreeOption[]>([]);
+const menuExpand = ref(false);
+const menuNodeAll = ref(false);
+const deptExpand = ref(true);
+const deptNodeAll = ref(false);
+const deptOptions = ref<DeptTreeOption[]>([]);
+const openDataScope = ref(false);
/** 鏁版嵁鑼冨洿閫夐」*/
const dataScopeOptions = ref([
- { value: "1", label: "鍏ㄩ儴鏁版嵁鏉冮檺" },
- { value: "2", label: "鑷畾鏁版嵁鏉冮檺" },
- { value: "3", label: "鏈儴闂ㄦ暟鎹潈闄�" },
- { value: "4", label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺" },
- { value: "5", label: "浠呮湰浜烘暟鎹潈闄�" }
-])
+ { value: '1', label: '鍏ㄩ儴鏁版嵁鏉冮檺' },
+ { value: '2', label: '鑷畾鏁版嵁鏉冮檺' },
+ { value: '3', label: '鏈儴闂ㄦ暟鎹潈闄�' },
+ { value: '4', label: '鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺' },
+ { value: '5', label: '浠呮湰浜烘暟鎹潈闄�' }
+]);
const queryFormRef = ref<ElFormInstance>();
const roleFormRef = ref<ElFormInstance>();
@@ -245,8 +243,8 @@
remark: '',
dataScope: '1',
menuIds: [],
- deptIds: [],
-}
+ deptIds: []
+};
const data = reactive<PageData<RoleForm, RoleQuery>>({
form: { ...initForm },
@@ -255,15 +253,15 @@
pageSize: 10,
roleName: '',
roleKey: '',
- status: '',
+ status: ''
},
rules: {
- roleName: [{ required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- roleKey: [{ required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" }],
- roleSort: [{ required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
+ roleName: [{ required: true, message: '瑙掕壊鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ roleKey: [{ required: true, message: '鏉冮檺瀛楃涓嶈兘涓虹┖', trigger: 'blur' }],
+ roleSort: [{ required: true, message: '瑙掕壊椤哄簭涓嶈兘涓虹┖', trigger: 'blur' }]
}
-})
-const { form, queryParams, rules } = toRefs(data)
+});
+const { form, queryParams, rules } = toRefs(data);
const dialog = reactive<DialogOption>({
visible: false,
@@ -274,13 +272,13 @@
* 鏌ヨ瑙掕壊鍒楄〃
*/
const getList = () => {
- loading.value = true
- listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
- roleList.value = res.rows
- total.value = res.total
- loading.value = false
- })
-}
+ loading.value = true;
+ listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
+ roleList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+ });
+};
/**
* 鎼滅储鎸夐挳鎿嶄綔
@@ -288,14 +286,14 @@
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆 */
const resetQuery = () => {
- dateRange.value = ['', '']
+ dateRange.value = ['', ''];
queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/**鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: RoleVO) => {
const roleids = row?.roleId || ids.value;
@@ -303,43 +301,47 @@
await delRole(roleids);
getList();
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
-}
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/role/export", {
- ...queryParams.value,
- }, `role_${new Date().getTime()}.xlsx`)
-}
+ proxy?.download(
+ 'system/role/export',
+ {
+ ...queryParams.value
+ },
+ `role_${new Date().getTime()}.xlsx`
+ );
+};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: RoleVO[]) => {
ids.value = selection.map((item: RoleVO) => item.roleId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 瑙掕壊鐘舵�佷慨鏀� */
const handleStatusChange = async (row: RoleVO) => {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ let text = row.status === '0' ? '鍚敤' : '鍋滅敤';
try {
await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚�?');
await changeRoleStatus(row.roleId, row.status);
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ proxy?.$modal.msgSuccess(text + '鎴愬姛');
} catch {
- row.status = row.status === "0" ? "1" : "0";
+ row.status = row.status === '0' ? '1' : '0';
}
-}
+};
/** 鍒嗛厤鐢ㄦ埛 */
const handleAuthUser = (row: RoleVO) => {
- router.push("/system/role-auth/user/" + row.roleId);
-}
+ router.push('/system/role-auth/user/' + row.roleId);
+};
/** 鏌ヨ鑿滃崟鏍戠粨鏋� */
const getMenuTreeselect = async () => {
const res = await menuTreeselect();
menuOptions.value = res.data;
-}
+};
/** 鎵�鏈夐儴闂ㄨ妭鐐规暟鎹� */
const getDeptAllCheckedKeys = (): any => {
// 鐩墠琚�変腑鐨勯儴闂ㄨ妭鐐�
@@ -349,67 +351,65 @@
if (halfCheckedKeys) {
checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
}
- return checkedKeys
-}
+ return checkedKeys;
+};
/** 閲嶇疆鏂板鐨勮〃鍗曚互鍙婂叾浠栨暟鎹� */
const reset = () => {
menuRef.value?.setCheckedKeys([]);
- menuExpand.value = false
- menuNodeAll.value = false
- deptExpand.value = true
- deptNodeAll.value = false
+ menuExpand.value = false;
+ menuNodeAll.value = false;
+ deptExpand.value = true;
+ deptNodeAll.value = false;
form.value = { ...initForm };
roleFormRef.value?.resetFields();
-
-}
+};
/** 娣诲姞瑙掕壊 */
const handleAdd = () => {
reset();
getMenuTreeselect();
dialog.visible = true;
- dialog.title = "娣诲姞瑙掕壊";
-}
+ dialog.title = '娣诲姞瑙掕壊';
+};
/** 淇敼瑙掕壊 */
const handleUpdate = async (row?: RoleVO) => {
reset();
- const roleId = row?.roleId || ids.value[0]
+ const roleId = row?.roleId || ids.value[0];
const { data } = await getRole(roleId);
Object.assign(form.value, data);
form.value.roleSort = Number(form.value.roleSort);
const res = await getRoleMenuTreeselect(roleId);
- dialog.title = "淇敼瑙掕壊";
+ dialog.title = '淇敼瑙掕壊';
dialog.visible = true;
res.checkedKeys.forEach((v) => {
nextTick(() => {
menuRef.value?.setChecked(v, true, false);
- })
- })
-
-}
+ });
+ });
+};
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
const getRoleMenuTreeselect = (roleId: string | number) => {
return roleMenuTreeselect(roleId).then((res): RoleMenuTree => {
menuOptions.value = res.data.menus;
return res.data;
- })
-}
+ });
+};
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
const getRoleDeptTreeSelect = async (roleId: string | number) => {
const res = await deptTreeSelect(roleId);
deptOptions.value = res.data.depts;
return res.data;
-}
+};
/** 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�*/
const handleCheckedTreeExpand = (value: boolean, type: string) => {
- if (type == "menu") {
+ if (type == 'menu') {
let treeList = menuOptions.value;
for (let i = 0; i < treeList.length; i++) {
if (menuRef.value) {
menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
}
}
- } else if (type == "dept") {
+ } else if (type == 'dept') {
let treeList = deptOptions.value;
for (let i = 0; i < treeList.length; i++) {
if (deptRef.value) {
@@ -417,23 +417,23 @@
}
}
}
-}
+};
/** 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級 */
const handleCheckedTreeNodeAll = (value: any, type: string) => {
- if (type == "menu") {
- menuRef.value?.setCheckedNodes(value ? menuOptions.value as any : []);
- } else if (type == "dept") {
- deptRef.value?.setCheckedNodes(value ? deptOptions.value as any : []);
+ if (type == 'menu') {
+ menuRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
+ } else if (type == 'dept') {
+ deptRef.value?.setCheckedNodes(value ? (deptOptions.value as any) : []);
}
-}
+};
/** 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛� */
const handleCheckedTreeConnect = (value: any, type: string) => {
- if (type == "menu") {
+ if (type == 'menu') {
form.value.menuCheckStrictly = value;
- } else if (type == "dept") {
+ } else if (type == 'dept') {
form.value.deptCheckStrictly = value;
}
-}
+};
/** 鎵�鏈夎彍鍗曡妭鐐规暟鎹� */
const getMenuAllCheckedKeys = (): any => {
// 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
@@ -444,57 +444,57 @@
checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
}
return checkedKeys;
-}
+};
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
roleFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
- form.value.menuIds = getMenuAllCheckedKeys()
+ form.value.menuIds = getMenuAllCheckedKeys();
form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛")
- dialog.visible = false
- getList()
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
+ getList();
}
- })
-}
+ });
+};
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset()
+ reset();
dialog.visible = false;
-}
+};
/** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
const dataScopeSelectChange = (value: string) => {
- if (value !== "2") {
- deptRef.value?.setCheckedKeys([])
+ if (value !== '2') {
+ deptRef.value?.setCheckedKeys([]);
}
-}
+};
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
const handleDataScope = async (row: RoleVO) => {
const response = await getRole(row.roleId);
Object.assign(form.value, response.data);
const res = await getRoleDeptTreeSelect(row.roleId);
openDataScope.value = true;
- dialog.title = "鍒嗛厤鏁版嵁鏉冮檺";
+ dialog.title = '鍒嗛厤鏁版嵁鏉冮檺';
await nextTick(() => {
deptRef.value?.setCheckedKeys(res.checkedKeys);
- })
-}
+ });
+};
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
const submitDataScope = async () => {
if (form.value.roleId) {
form.value.deptIds = getDeptAllCheckedKeys();
await dataScope(form.value);
- proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛');
openDataScope.value = false;
getList();
}
-}
+};
/** 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級*/
const cancelDataScope = () => {
dataScopeRef.value?.resetFields();
form.value = { ...initForm };
openDataScope.value = false;
-}
+};
onMounted(() => {
getList();
--
Gitblit v1.9.3