!87 update Yi.RuoYi.Vue3/src/views/system/role/index.vue.

Merge pull request !87 from YangHaiPing/N/A

Yi.RuoYi.Vue3/src/views/system/role/index.vue

@@ -184,10 +184,11 @@ import {
   treeselect as menuTreeselect,
   listMenu,
 } from "@/api/system/menu";
-import { listDept, roleDeptTreeselect } from "@/api/system/dept";
+import {listDept, roleDeptTreeselect} from "@/api/system/dept";
+
 const router = useRouter();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const {proxy} = getCurrentInstance();
+const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
 
 const roleList = ref([]);
 const open = ref(false);
@@ -211,16 +212,15 @@ const deptRef = ref(null);
 
 /** 数据范围选项*/
 const dataScopeOptions = ref([
-  { value: 'ALL', label: "全部数据权限" },
-  { value: 'CUSTOM', label: "自定数据权限" },
-  { value: 'DEPT', label: "本部门数据权限" },
-  { value: 'DEPT_FOLLOW', label: "本部门及以下数据权限" },
-  { value: 'USER', label: "仅本人数据权限" },
+  {value: 'ALL', label: "全部数据权限"},
+  {value: 'CUSTOM', label: "自定数据权限"},
+  {value: 'DEPT', label: "本部门数据权限"},
+  {value: 'DEPT_FOLLOW', label: "本部门及以下数据权限"},
+  {value: 'USER', label: "仅本人数据权限"},
 ]);
 
 const data = reactive({
-  form: {
-  },
+  form: {},
   queryParams: {
     skipCount: 1,
     maxResultCount: 10,
@@ -230,18 +230,18 @@ const data = reactive({
   },
   rules: {
     roleName: [
-      { required: true, message: "角色名称不能为空", trigger: "blur" },
+      {required: true, message: "角色名称不能为空", trigger: "blur"},
     ],
     roleCode: [
-      { required: true, message: "权限字符不能为空", trigger: "blur" },
+      {required: true, message: "权限字符不能为空", trigger: "blur"},
     ],
     orderNum: [
-      { required: true, message: "角色顺序不能为空", trigger: "blur" },
+      {required: true, message: "角色顺序不能为空", trigger: "blur"},
     ],
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询角色列表 */
 function getList() {
@@ -254,17 +254,20 @@ function getList() {
       }
   );
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.skipCount = 1;
   getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
   dateRange.value = [];
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
   const roleIds = row.id || ids.value;
@@ -277,8 +280,10 @@ function handleDelete(row) {
         getList();
         proxy.$modal.msgSuccess("删除成功");
       })
-    .catch(() => { });
+      .catch(() => {
+      });
 }
+
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download(
@@ -289,12 +294,14 @@ function handleExport() {
       `role_${new Date().getTime()}.xlsx`
   );
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
+
 /** 角色状态修改 */
 function handleStatusChange(row) {
   let text = row.state === true ? "启用" : "停用";
@@ -310,6 +317,7 @@ function handleStatusChange(row) {
         row.state = row.state === true ? false : true;
       });
 }
+
 /** 更多操作 */
 function handleCommand(command, row) {
   switch (command) {
@@ -323,10 +331,12 @@ function handleCommand(command, row) {
       break;
   }
 }
+
 /** 分配用户 */
 function handleAuthUser(row) {
   router.push("/system/role-auth/user/" + row.id);
 }
+
 /** 查询菜单树结构 */
 function getMenuTreeselect() {
   return listMenu().then((response) => {
@@ -354,6 +364,7 @@ function getDeptAllCheckedKeys() {
   checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
   return checkedKeys;
 }
+
 /** 重置新增的表单以及其他数据  */
 function reset() {
   if (menuRef.value != undefined) {
@@ -379,6 +390,7 @@ function reset() {
   };
   proxy.resetForm("roleRef");
 }
+
 /** 添加角色 */
 function handleAdd() {
   reset();
@@ -386,8 +398,9 @@ function handleAdd() {
   open.value = true;
   title.value = "添加角色";
 }
+
 /** 修改角色 */
- function handleUpdate(row) {
+function handleUpdate(row) {
   reset();
   const roleId = row.id || ids.value;
   getRoleMenuTreeselect(roleId);
@@ -398,12 +411,13 @@ function handleAdd() {
     title.value = "修改角色";
   });
 }
+
 /** 根据角色ID查询菜单树结构 */
- function getRoleMenuTreeselect(roleId) {
+function getRoleMenuTreeselect(roleId) {
   //1：获取该角色下的全部菜单id
   //2：获取全量菜单
-    const menuTreeselect=getMenuTreeselect();
-    menuTreeselect.then(()=>{
+  const menuTreeselect = getMenuTreeselect();
+  menuTreeselect.then(() => {
     nextTick(() => {
       roleMenuTreeselect(roleId).then((response) => {
         const menuIds = [];
@@ -422,6 +436,7 @@ function handleAdd() {
 
 
 }
+
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {
   return listDept().then((response) => {
@@ -439,7 +454,7 @@ function getDeptTree(roleId) {
 
     let deptIds = [];
     roleDeptTreeselect(roleId).then((response) => {
-      deptIds = response.data.map(x=>x.id);
+      deptIds = response.data.map(x => x.id);
       // nextTick(() => {
       if (deptRef.value) {
         deptRef.value.setCheckedKeys(deptIds);
@@ -448,6 +463,7 @@ function getDeptTree(roleId) {
     });
   });
 }
+
 /** 树权限（展开/折叠）*/
 function handleCheckedTreeExpand(value, type) {
   if (type == "menu") {
@@ -462,6 +478,7 @@ function handleCheckedTreeExpand(value, type) {
     }
   }
 }
+
 /** 树权限（全选/全不选） */
 function handleCheckedTreeNodeAll(value, type) {
   if (type == "menu") {
@@ -470,6 +487,7 @@ function handleCheckedTreeNodeAll(value, type) {
     deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
   }
 }
+
 /** 树权限（父子联动） */
 function handleCheckedTreeConnect(value, type) {
   if (type == "menu") {
@@ -478,6 +496,7 @@ function handleCheckedTreeConnect(value, type) {
     form.value.deptCheckStrictly = value ? true : false;
   }
 }
+
 /** 所有菜单节点数据 */
 function getMenuAllCheckedKeys() {
   // 目前被选中的菜单节点
@@ -487,6 +506,7 @@ function getMenuAllCheckedKeys() {
   checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
   return checkedKeys;
 }
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["roleRef"].validate((valid) => {
@@ -509,37 +529,53 @@ function submitForm() {
     }
   });
 }
+
 /** 取消按钮 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 选择角色权限范围触发 */
 function dataScopeSelectChange(value) {
   if (value !== "2") {
     deptRef.value.setCheckedKeys([]);
   }
 }
+// 判断返回值是否是数字
+function isNumeric(value) {
+  return /^[+-]?\d+(\.\d+)?$/;
+}
 /** 分配数据权限操作 */
 function handleDataScope(row) {
   reset();
   getDeptTree(row.id);
   getRole(row.id).then((response) => {
-    form.value = response.data;
+    if(response && response.data) {
+      let data = {...response.data};
+      if(isNumeric(data.dataScope)) {
+        let obj = dataScopeOptions.value[data.dataScope];
+        if(obj) {
+          data["dataScope"] = obj["value"];
+        }
+        form.value = {...data};
+      }
+    }
     openDataScope.value = true;
     title.value = "分配数据权限";
   });
 }
+
 /** 提交按钮（数据权限） */
 function submitDataScope() {
   if (form.value.id != undefined) {
     form.value.deptIds = getDeptAllCheckedKeys();
-const data={
-  roleId:form.value.id,
-  deptIds:form.value.deptIds,
-  dataScope:form.value.dataScope
-}
-console.log(data)
+    const data = {
+      roleId: form.value.id,
+      deptIds: form.value.deptIds,
+      dataScope: form.value.dataScope
+    }
+    console.log(data)
     dataScope(data).then((response) => {
       proxy.$modal.msgSuccess("修改成功");
       openDataScope.value = false;
@@ -547,6 +583,7 @@ console.log(data)
     });
   }
 }
+
 /** 取消按钮（数据权限）*/
 function cancelDataScope() {
   openDataScope.value = false;