From 490a4c0a1b3bb5df04c238aadb422c25173c6022 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期五, 10 一月 2025 13:14:48 +0800 Subject: [PATCH] 菜单自定义:根据数据表中的HShowMode字段,设置页面打开方式为主控台框架内打开还是打开新页面 --- sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 1 + SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0 WebAPI/Controllers/WebAPIController.cs | 10 +++++----- DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 8 ++++---- sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache index 7b23a18..199012b 100644 --- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache +++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fea44e6 --- /dev/null +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt index a84a65c..7143ce1 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt @@ -3,3 +3,4 @@ D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index bec0e3a..9c15b19 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -16269,7 +16269,7 @@ public int HLevel { get; set; } public string Hurl { get; set; } public string HPicNum { get; set; } - public string HOpenType { get; set; } + public string HShowMode { get; set; } public List<MenuLoad> childMenus { get; set; } } @@ -16281,11 +16281,11 @@ { List<MenuLoad> mu = new List<MenuLoad>(); //浠ョ埗瀛愮骇缁撴瀯瀛樻斁鑿滃崟娓呭崟淇℃伅 SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //鏁版嵁搴撴搷浣滃伐鍏� - string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HOpenType from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition"; + string sql = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' order by HPosition"; ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁 if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅 { - string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HOpenType from Gy_MenuDefineSet where HMakeName=" + + string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode from Gy_MenuDefineSet where HMakeName=" + "(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " + "left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))"; ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓� @@ -16307,7 +16307,7 @@ tbj.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString(); tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString()); tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString(); - tbj.HOpenType = ds.Tables[0].Rows[i]["HOpenType"].ToString(); + tbj.HShowMode = ds.Tables[0].Rows[i]["HShowMode"].ToString(); if (ds.Tables[0].Rows[i]["HPicNum"] != null) { tbj.HPicNum = ds.Tables[0].Rows[i]["HPicNum"].ToString(); @@ -16350,7 +16350,7 @@ tbjson.HName = dt.Rows[i]["HName"].ToString(); tbjson.HLevel = tree[m].HLevel; tbjson.Hurl = dt.Rows[i]["Hurl"].ToString(); - tbjson.HOpenType = dt.Rows[i]["HOpenType"].ToString(); + tbjson.HShowMode = dt.Rows[i]["HShowMode"].ToString(); if (dt.Rows[i]["HPicNum"] != null) { tbjson.HPicNum = dt.Rows[i]["HPicNum"].ToString(); diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user index 58ecbf1..5317e54 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user @@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2025-01-10T03:11:49.4016910Z;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History> + <History>True|2025-01-10T05:10:47.2046185Z;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> @@ -294,13 +294,13 @@ <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>01/10/2025 11:11:43</publishTime> + <publishTime>01/10/2025 13:10:41</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>01/10/2025 11:11:43</publishTime> + <publishTime>01/10/2025 13:10:41</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> - <publishTime>01/10/2025 11:11:48</publishTime> + <publishTime>01/10/2025 13:10:46</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll index 6c434e1..e773ed9 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb index b1264fb..c3a7a1d 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll index 6c434e1..e773ed9 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb index b1264fb..c3a7a1d 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb Binary files differ -- Gitblit v1.9.1