From ce47e1a46da2b1191faace70d8d8a64d6f400bf9 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 26 八月 2024 15:07:14 +0800
Subject: [PATCH] PDA菜单更新
---
Tiger.Api/Language.db | 0
Tiger.Model.Net/Entitys/SYS/MenuItem.cs | 6 +++++-
Tiger.Business/SYS/Biz.SYS_MENU.cs | 39 +++++++++++++++++++++++++++------------
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index 5860058..583eec3 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs
index 96cb053..8c5a5a1 100644
--- a/Tiger.Business/SYS/Biz.SYS_MENU.cs
+++ b/Tiger.Business/SYS/Biz.SYS_MENU.cs
@@ -29,7 +29,7 @@
JoinType.Inner, p.USERGROUP_CODE == r.USERGROUP_CODE,
JoinType.Inner, r.ROLE_CODE == m.ROLE_CODE,
JoinType.Inner, m.FUNC_CODE == f.ID))
- .WhereIF(!string.IsNullOrEmpty(userid), (t, p, g, r, m, f) => t.USER_ID == userid && f.IS_USE =="1" && f.FUNC_TYPE != "2")
+ .WhereIF(!string.IsNullOrEmpty(userid), (t, p, g, r, m, f) => t.USER_ID == userid && f.IS_USE == "1" && f.FUNC_TYPE != "2")
.Select((t, p, g, r, m, f) => new SYS_MENU
{
ID = f.ID,
@@ -51,10 +51,10 @@
UPDATE_USER = f.UPDATE_USER,
UPDATE_TIME = f.UPDATE_TIME,
SYMBOLIC_NAME = f.SYMBOLIC_NAME,
- COMPONENT=f.COMPONENT,
- CURRENTACTIVEMENU=f.CURRENTACTIVEMENU,
- SHOW=f.SHOW,
- IGNOREKEEPALIVE=f.IGNOREKEEPALIVE,
+ COMPONENT = f.COMPONENT,
+ CURRENTACTIVEMENU = f.CURRENTACTIVEMENU,
+ SHOW = f.SHOW,
+ IGNOREKEEPALIVE = f.IGNOREKEEPALIVE,
IGNOREAUTH = f.IGNOREAUTH,
BUTTON_TYPE = f.BUTTON_TYPE,
DO_METHOD = f.DO_METHOD,
@@ -69,6 +69,11 @@
menuItem.path = (item.PATH ?? "").StartsWith("/dashboard") ? "/dashboard" : $"{item.PATH}";
menuItem.name = item.FUNC_NAME;
menuItem.component = (item.PATH == null || item.PATH == "#") ? "LAYOUT" : item.COMPONENT;
+ if (item.FUNC_CLASS == "PDA")
+ {
+ menuItem.pages = menuItem.component;
+ menuItem.url = item.ICON_URL;
+ }
menuItem.meta = new();
menuItem.meta.icon = item.ICON_URL; // item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
@@ -100,7 +105,7 @@
menuItem.menuName = item.FUNC_NAME;
menuItem.status = item.IS_USE;
menuItem.btnType = item.BUTTON_TYPE;
- menuItem.doMethod = item.DO_METHOD;
+ menuItem.func_group = item.FUNC_GROUP;
menuItem.children = new();
GetMenuItem(items.ToList(), item.FUNC_CODE, ref menuItem);
data.Add(menuItem);
@@ -138,6 +143,11 @@
menuItem.path = (item.PATH ?? "").StartsWith("/dashboard") ? "/dashboard" : $"{item.PATH}";
menuItem.name = item.FUNC_NAME;
menuItem.component = (item.PATH == null || item.PATH == "#") ? "LAYOUT" : item.COMPONENT;
+ if (item.FUNC_CLASS == "PDA")
+ {
+ menuItem.pages = menuItem.component;
+ menuItem.url = item.ICON_URL;
+ }
menuItem.meta = new();
menuItem.meta.icon = item.ICON_URL; // item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
@@ -170,8 +180,8 @@
menuItem.status = item.IS_USE;
menuItem.icon = menuItem.meta.icon;
menuItem.func_type = item.FUNC_TYPE;
+ menuItem.func_group = item.FUNC_GROUP;
menuItem.btnType = item.BUTTON_TYPE;
- menuItem.doMethod = item.DO_METHOD;
menuItem.parentMenu = item.PFUNC_CODE;
menuItem.orderNo = item.SEQ_NO;
menuItem.children = null;
@@ -232,7 +242,7 @@
BUTTON_TYPE = data.btnType,
DO_METHOD = data.doMethod,
PFUNC_CODE = data.parentMenu,
- FUNC_CLASS = "BS",
+ FUNC_CLASS = data.func_class?? "BS",
PATH = data.path,
ICON_URL = data.icon,
SEQ_NO = (int)data.orderNo,
@@ -248,7 +258,7 @@
db.Updateable(func, "system").ExecuteCommand();
}
//鏂板
- else
+ else
{
db.Insertable(func, "system").ExecuteCommand();
//濡傛灉鏄柊澧炵殑鑿滃崟锛屾煡鍑烘墍鏈夌埗绾ф洿鏂颁负鍗婇��
@@ -268,7 +278,7 @@
}
catch (System.Exception ex)
{
-
+
}
return apiAction;
}
@@ -292,6 +302,11 @@
menuItem.path = (item.PATH ?? "").StartsWith("/dashboard") ? "/dashboard" : $"{item.PATH}";
menuItem.name = item.FUNC_NAME;
menuItem.component = (item.PATH == null || item.PATH == "#") ? "LAYOUT" : item.COMPONENT;
+ if (item.FUNC_CLASS == "PDA")
+ {
+ menuItem.pages = menuItem.component;
+ menuItem.url = item.ICON_URL;
+ }
menuItem.meta = new();
menuItem.meta.icon = item.ICON_URL; //item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
@@ -336,7 +351,7 @@
}
}
- private static void GetRootMenu(SYS_MENU menu,ref List<SYS_MENU> items)
+ private static void GetRootMenu(SYS_MENU menu, ref List<SYS_MENU> items)
{
SYS_MENU menuRet = null;
try
@@ -344,7 +359,7 @@
menuRet = Biz.Db.Queryable<SYS_MENU>().Where(q => q.FUNC_CODE == menu.PFUNC_CODE && q.FUNC_CODE != "system01").Single(); //23858079-7241-4e64-b0cf-eb5dbe84a9d6
if (menuRet != null)
{
- if (!items.Where(x=>x.FUNC_CODE == menuRet.FUNC_CODE).Any())
+ if (!items.Where(x => x.FUNC_CODE == menuRet.FUNC_CODE).Any())
{
items.Add(menuRet);
}
diff --git a/Tiger.Model.Net/Entitys/SYS/MenuItem.cs b/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
index b9ff7cc..6d0506b 100644
--- a/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
+++ b/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
@@ -14,17 +14,20 @@
public string menuName { get; set; }
public string icon { get; set; }
public string func_type { get; set; }
+ public string func_group { get; set; }
public int? orderNo { get; set; }
public string func_code { get; set; }
public string keepalive { get; set; }
public string show { get; set; }
+ public string url { get; set; }
+ public string pages { get; set; }
}
public class MenuNoChildren
{
public string id { get; set; }
public string path { get; set; }
- public object component { get; set; }
+ public string component { get; set; }
public RouteMeta meta { get; set; }
public string name { get; set; }
public string alias { get; set; }
@@ -97,6 +100,7 @@
public bool isUpdate { get; set; }
public string show { get; set; }
public string func_type { get; set; }
+ public string func_class { get; set; }
public string keepalive { get; set; }
public int btnType { get; set; }
public string doMethod { get; set; }
--
Gitblit v1.9.3