Przeglądaj źródła

😁1、修复代码生成编辑权限标识 2、升级Furion v4.9.1.32

zuohuaijun 2 lat temu
rodzic
commit
e806e2e895

+ 3 - 3
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -21,9 +21,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.31" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.31" />
-    <PackageReference Include="Furion.Pure" Version="4.9.1.31" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.1.32" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.1.32" />
+    <PackageReference Include="Furion.Pure" Version="4.9.1.32" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -517,13 +517,13 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         };
         menuOrder += 10;
 
-        // 按钮-edit
+        // 按钮-update
         var menuType2_4 = new SysMenu
         {
             Pid = pid1,
             Title = "编辑",
             Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":edit",
+            Permission = className[..1].ToLower() + className[1..] + ":update",
             OrderNo = menuOrder
         };
         menuOrder += 10;

+ 3 - 3
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -166,14 +166,14 @@
         }
         }
         @if(@Model.PrintType == "custom"){
-        @:<el-table-column label="操作" width="200" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):edit') || auth('@(@Model.LowerClassName):delete')">
+        @:<el-table-column label="操作" width="200" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):update') || auth('@(@Model.LowerClassName):delete')">
           @:<template #default="scope">
             @:<el-button icon="ele-Printer" size="small" text="" type="primary" @@click="openPrint@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):print'"> 打印 </el-button>
         }else{
-        @:<el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):edit') || auth('@(@Model.LowerClassName):delete')">
+        @:<el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):update') || auth('@(@Model.LowerClassName):delete')">
           @:<template #default="scope">
         }
-            <el-button icon="ele-Edit" size="small" text="" type="primary" @@click="openEdit@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):edit'"> 编辑 </el-button>
+            <el-button icon="ele-Edit" size="small" text="" type="primary" @@click="openEdit@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):update'"> 编辑 </el-button>
             <el-button icon="ele-Delete" size="small" text="" type="primary" @@click="del@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):delete'"> 删除 </el-button>
           </template>
         </el-table-column>