From 652c2b6fd02e111917899ef6b561c71da442d514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E7=BA=A7CV=E5=B7=A5=E7=A8=8B=E5=B8=88?=
 <2535688890@qq.com>
Date: Mon, 23 Dec 2024 12:15:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Role/{UpdateDataScpoceInput.cs => UpdateDataScopeInput.cs}  | 2 +-
 .../Services/System/RoleService.cs                              | 2 +-
 Yi.Pure.Vue3/src/api/system/role.ts                             | 2 +-
 Yi.RuoYi.Vue3/src/api/system/role.js                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/{UpdateDataScpoceInput.cs => UpdateDataScopeInput.cs} (87%)

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScpoceInput.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScopeInput.cs
similarity index 87%
rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScpoceInput.cs
rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScopeInput.cs
index 4ef0c9c1..3ce38966 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScpoceInput.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Role/UpdateDataScopeInput.cs
@@ -2,7 +2,7 @@
 
 namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Role
 {
-    public class UpdateDataScpoceInput
+    public class UpdateDataScopeInput
     {
         public Guid RoleId { get; set; }
 
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs
index 7ea3f185..6188f0ce 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/RoleService.cs
@@ -39,7 +39,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
 
         private ISqlSugarRepository<UserRoleEntity> _userRoleRepository;
 
-        public async Task UpdateDataScpoceAsync(UpdateDataScpoceInput input)
+        public async Task UpdateDataScopeAsync(UpdateDataScopeInput input)
         {
             //只有自定义的需要特殊处理
             if (input.DataScope == DataScopeEnum.CUSTOM)
diff --git a/Yi.Pure.Vue3/src/api/system/role.ts b/Yi.Pure.Vue3/src/api/system/role.ts
index a112cf85..49032d49 100644
--- a/Yi.Pure.Vue3/src/api/system/role.ts
+++ b/Yi.Pure.Vue3/src/api/system/role.ts
@@ -38,7 +38,7 @@ export const delRole = roleIds => {
 
 /** 修改角色数据权限 */
 export const updataDataScope = data => {
-  return http.request<Result>("put", `/role/data-scpoce`, { data });
+  return http.request<Result>("put", `/role/data-scope`, { data });
 };
 
 /** 根据角色ID查询菜单下拉树结构 */
diff --git a/Yi.RuoYi.Vue3/src/api/system/role.js b/Yi.RuoYi.Vue3/src/api/system/role.js
index dc6da671..63f8d15e 100644
--- a/Yi.RuoYi.Vue3/src/api/system/role.js
+++ b/Yi.RuoYi.Vue3/src/api/system/role.js
@@ -40,7 +40,7 @@ export function updateRole(data) {
 // 角色数据权限
 export function dataScope(data) {
   return request({
-    url: '/role/data-scpoce',
+    url: '/role/data-scope',
     method: 'put',
     data: data
   })

From 03a712fcfe7d30a56d1fd6dc9524c09f6186dfc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E7=BA=A7CV=E5=B7=A5=E7=A8=8B=E5=B8=88?=
 <2535688890@qq.com>
Date: Mon, 23 Dec 2024 19:25:56 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96token=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../YiTokenAuthorizationFilter.cs                              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs b/Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs
index eeb0171b..4c7c3bb8 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs
@@ -75,6 +75,7 @@ public class YiTokenAuthorizationFilter : IDashboardAsyncAuthorizationFilter, IT
                               function sendToken() {
                                   // 获取输入的 token
                                   var token = document.getElementById("tokenInput").value;
+                                  token = token.replace('Bearer ','');
                                   // 构建请求 URL
                                   var url = "/hangfire";
                                   // 发送 GET 请求
@@ -107,7 +108,7 @@ public class YiTokenAuthorizationFilter : IDashboardAsyncAuthorizationFilter, IT
                       <body style="text-align: center;">
                           <h1>Yi-hangfire</h1>
                           <h1>输入您的Token，我们将验证您是否为管理员</h1>
-                          <input type="text" id="tokenInput" placeholder="请输入 token" />
+                          <textarea id="tokenInput" placeholder="请输入 token" style="width: 80%;height: 120px;margin: 0 10%;"></textarea>
                           <button onclick="sendToken()">校验</button>
                       </body>
                       </html>

From 350e4a575338e116f4aa7e11478cf3bbc823f535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=98=8A=E5=BC=98?= <yihh@seeyon.com>
Date: Tue, 21 Jan 2025 19:35:30 +0800
Subject: [PATCH 3/5] =?UTF-8?q?refactor(tool):=20=E4=BD=BF=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=94=AF=E6=8C=81=E8=B7=A8=E5=B9=B3=E5=8F=B0=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AddModuleCommand 和 CloneCommand 中增加了对操作系统类型的判断
- 为 Windows、macOS 和 Linux 系统分别设置了不同的进程启动信息
-优化了路径组合方式，使用 Path.Combine 以确保跨平台兼容性
---
 .../Yi.Abp.Tool/Commands/AddModuleCommand.cs   | 18 ++++++++++++++----
 .../tool/Yi.Abp.Tool/Commands/CloneCommand.cs  | 16 +++++++++++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
index d1e9b1dc..d6578c90 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
@@ -41,7 +42,7 @@ namespace Yi.Abp.Tool.Commands
                 CheckFirstSlnPath(slnPath);
                 var dotnetSlnCommandPart1 = $"dotnet sln \"{slnPath}\" add \"{modulePath}\\{moduleName}.";
                 var dotnetSlnCommandPart2 = new List<string>() { "Application", "Application.Contracts", "Domain", "Domain.Shared", "SqlSugarCore" };
-                var paths = dotnetSlnCommandPart2.Select(x => $@"{modulePath}\{moduleName}." + x).ToArray();
+                var paths = dotnetSlnCommandPart2.Select(x => Path.Combine(modulePath, $"{moduleName}.{x}")).ToArray();
                 CheckPathExist(paths);
                 
                 var cmdCommands = dotnetSlnCommandPart2.Select(x => dotnetSlnCommandPart1 + x+"\"").ToArray();
@@ -81,15 +82,24 @@ namespace Yi.Abp.Tool.Commands
         {
             ProcessStartInfo psi = new ProcessStartInfo
             {
-                FileName = "cmd.exe",
-                Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}",
                 RedirectStandardInput = true,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 CreateNoWindow = true,
                 UseShellExecute = false
             };
-
+            // 判断操作系统
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                psi.FileName = "cmd.exe";
+                psi.Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}";
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            {
+                psi.FileName = "/bin/bash";
+                psi.Arguments = $"-c \"{string.Join("; ", cmdCommands)}\"";
+            }
+            
             Process proc = new Process
             {
                 StartInfo = psi
diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs
index 00802bc9..d959e170 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/CloneCommand.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
@@ -35,15 +36,24 @@ namespace Yi.Abp.Tool.Commands
         {
             ProcessStartInfo psi = new ProcessStartInfo
             {
-                FileName = "cmd.exe",
-                Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}",
                 RedirectStandardInput = true,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 CreateNoWindow = true,
                 UseShellExecute = false
             };
-
+            // 判断操作系统
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                psi.FileName = "cmd.exe";
+                psi.Arguments = $"/c chcp 65001&{string.Join("&", cmdCommands)}";
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            {
+                psi.FileName = "/bin/bash";
+                psi.Arguments = $"-c \"{string.Join("; ", cmdCommands)}\"";
+            }
+            
             Process proc = new Process
             {
                 StartInfo = psi

From b9866af6cda5c1072817d72946418faeffd9fff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=98=8A=E5=BC=98?= <yihh@seeyon.com>
Date: Wed, 22 Jan 2025 17:58:46 +0800
Subject: [PATCH 4/5] =?UTF-8?q?refactor(tool):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优化了路径组合的方式，使代码更加简洁
- 修复AddModule在mac/linux下只能添加一个文件夹的问题
---
 .../tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
index d6578c90..6540a976 100644
--- a/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
+++ b/Yi.Abp.Net8/tool/Yi.Abp.Tool/Commands/AddModuleCommand.cs
@@ -40,12 +40,11 @@ namespace Yi.Abp.Tool.Commands
                 }
                 
                 CheckFirstSlnPath(slnPath);
-                var dotnetSlnCommandPart1 = $"dotnet sln \"{slnPath}\" add \"{modulePath}\\{moduleName}.";
-                var dotnetSlnCommandPart2 = new List<string>() { "Application", "Application.Contracts", "Domain", "Domain.Shared", "SqlSugarCore" };
-                var paths = dotnetSlnCommandPart2.Select(x => Path.Combine(modulePath, $"{moduleName}.{x}")).ToArray();
+                var dotnetSlnCommandPart = new List<string>() { "Application", "Application.Contracts", "Domain", "Domain.Shared", "SqlSugarCore" };
+                var paths = dotnetSlnCommandPart.Select(x => Path.Combine(modulePath, $"{moduleName}.{x}")).ToArray();
                 CheckPathExist(paths);
-                
-                var cmdCommands = dotnetSlnCommandPart2.Select(x => dotnetSlnCommandPart1 + x+"\"").ToArray();
+
+                var cmdCommands = dotnetSlnCommandPart.Select(x => $"dotnet sln \"{slnPath}\" add \"{Path.Combine(modulePath, $"{moduleName}.{x}")}\"").ToArray();
                 StartCmd(cmdCommands);
                 
                 Console.WriteLine("恭喜~模块添加成功！");

From 78b874936cf3ebdcde968e3896b1667f383465c0 Mon Sep 17 00:00:00 2001
From: YangHaiPing <yang1426251993@163.com>
Date: Thu, 30 Jan 2025 19:10:35 +0000
Subject: [PATCH 5/5] =?UTF-8?q?update=20Yi.RuoYi.Vue3/src/views/system/rol?=
 =?UTF-8?q?e/index.vue.=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86-=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=EF=BC=9A=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E6=97=B6?=
 =?UTF-8?q?=E2=80=9C=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4=E2=80=9D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E7=9A=84=E4=B8=BA?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=B4=A2=E5=BC=95=E5=80=BC=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: YangHaiPing <yang1426251993@163.com>
---
 Yi.RuoYi.Vue3/src/views/system/role/index.vue | 195 +++++++++++-------
 1 file changed, 116 insertions(+), 79 deletions(-)

diff --git a/Yi.RuoYi.Vue3/src/views/system/role/index.vue b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
index 5fdc3334..aef256ca 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
@@ -3,11 +3,11 @@
     <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
       <el-form-item label="角色名称" prop="roleName">
         <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
-          @keyup.enter="handleQuery" />
+                  @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="角色编号" prop="roleCode">
         <el-input v-model="queryParams.roleCode" placeholder="请输入角色编号" clearable style="width: 240px"
-          @keyup.enter="handleQuery" />
+                  @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="state">
         <el-select v-model="queryParams.state" placeholder="角色状态" clearable style="width: 240px">
@@ -16,7 +16,7 @@
       </el-form-item>
       <el-form-item label="创建时间" style="width: 308px">
         <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                        start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -29,11 +29,11 @@
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:role:edit']">修改</el-button>
+                   v-hasPermi="['system:role:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:role:remove']">删除</el-button>
+                   v-hasPermi="['system:role:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出
@@ -52,7 +52,7 @@
       <el-table-column label="状态" align="center">
         <template #default="scope">
           <el-switch v-model="scope.row.state" :active-value="true" :inactive-value="false"
-            @change="handleStatusChange(scope.row)"></el-switch>
+                     @change="handleStatusChange(scope.row)"></el-switch>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="creationTime">
@@ -72,7 +72,7 @@
           </el-tooltip>
           <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
             <el-button link icon="CircleCheck" @click="handleDataScope(scope.row)"
-              v-hasPermi="['system:role:edit']"></el-button>
+                       v-hasPermi="['system:role:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
             <el-button link icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']">
@@ -83,7 +83,7 @@
     </el-table>
 
     <pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount" v-model:limit="queryParams.maxResultCount"
-      @pagination="getList" />
+                @pagination="getList" />
 
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -110,7 +110,7 @@
         <el-form-item label="状态">
           <el-radio-group v-model="form.state">
             <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="JSON.parse(dict.value)">{{ dict.label
-            }}</el-radio>
+              }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
@@ -119,8 +119,8 @@
           <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动
           </el-checkbox>
           <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
-            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+                   :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
+                   :props="{ label: 'label', children: 'children' }"></el-tree>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
@@ -155,8 +155,8 @@
           <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动
           </el-checkbox>
           <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
-            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+                   :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
+                   :props="{ label: 'label', children: 'children' }"></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -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,86 +230,94 @@ 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() {
   loading.value = true;
   listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(
-    (response) => {
-      roleList.value = response.data.items;
-      total.value = response.data.totalCount;
-      loading.value = false;
-    }
+      (response) => {
+        roleList.value = response.data.items;
+        total.value = response.data.totalCount;
+        loading.value = false;
+      }
   );
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.skipCount = 1;
   getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
   dateRange.value = [];
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
   const roleIds = row.id || ids.value;
   proxy.$modal
-    .confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?')
-    .then(function () {
-      return delRole(roleIds);
-    })
-    .then(() => {
-      getList();
-      proxy.$modal.msgSuccess("删除成功");
-    })
-    .catch(() => { });
+      .confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?')
+      .then(function () {
+        return delRole(roleIds);
+      })
+      .then(() => {
+        getList();
+        proxy.$modal.msgSuccess("删除成功");
+      })
+      .catch(() => {
+      });
 }
+
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download(
-    "system/role/export",
-    {
-      ...queryParams.value,
-    },
-    `role_${new Date().getTime()}.xlsx`
+      "system/role/export",
+      {
+        ...queryParams.value,
+      },
+      `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 ? "启用" : "停用";
   proxy.$modal
-    .confirm('确认要"' + text + '""' + row.roleName + '"角色吗?')
-    .then(function () {
-      return changeRoleStatus(row.id, row.state);
-    })
-    .then(() => {
-      proxy.$modal.msgSuccess(text + "成功");
-    })
-    .catch(function () {
-      row.state = row.state === true ? false : true;
-    });
+      .confirm('确认要"' + text + '""' + row.roleName + '"角色吗?')
+      .then(function () {
+        return changeRoleStatus(row.id, row.state);
+      })
+      .then(() => {
+        proxy.$modal.msgSuccess(text + "成功");
+      })
+      .catch(function () {
+        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,30 +411,32 @@ function handleAdd() {
     title.value = "修改角色";
   });
 }
+
 /** 根据角色ID查询菜单树结构 */
- function getRoleMenuTreeselect(roleId) {
+function getRoleMenuTreeselect(roleId) {
   //1：获取该角色下的全部菜单id
   //2：获取全量菜单
-    const menuTreeselect=getMenuTreeselect();
-    menuTreeselect.then(()=>{
-      nextTick(() => {
+  const menuTreeselect = getMenuTreeselect();
+  menuTreeselect.then(() => {
+    nextTick(() => {
       roleMenuTreeselect(roleId).then((response) => {
-    const menuIds = [];
-    response.data.forEach((m) => {
-      menuIds.push(m.id);
-    });
+        const menuIds = [];
+        response.data.forEach((m) => {
+          menuIds.push(m.id);
+        });
 
-      menuIds.forEach((v) => {
-        menuRef.value.setChecked(v, true, false);
+        menuIds.forEach((v) => {
+          menuRef.value.setChecked(v, true, false);
+        });
+        //这里是要一个当前用户已拥有的菜单的id
       });
-      //这里是要一个当前用户已拥有的菜单的id
     });
-  });
 
-    })
+  })
 
 
 }
+
 /** 根据角色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;
@@ -554,4 +591,4 @@ function cancelDataScope() {
 }
 
 getList();
-</script>
+</script>
\ No newline at end of file