From 3781e9a6013bc26e01b3a22912d723974e3278e0 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 07 八月 2024 01:02:18 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business/SYS/Biz.SYS_MENU.cs | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs
index db7a385..96cb053 100644
--- a/Tiger.Business/SYS/Biz.SYS_MENU.cs
+++ b/Tiger.Business/SYS/Biz.SYS_MENU.cs
@@ -55,7 +55,9 @@
CURRENTACTIVEMENU=f.CURRENTACTIVEMENU,
SHOW=f.SHOW,
IGNOREKEEPALIVE=f.IGNOREKEEPALIVE,
- IGNOREAUTH = f.IGNOREAUTH
+ IGNOREAUTH = f.IGNOREAUTH,
+ BUTTON_TYPE = f.BUTTON_TYPE,
+ DO_METHOD = f.DO_METHOD,
});
var items = await query.Distinct().ToListAsync();
List<SYS_MENU> entities = items.OrderBy(x => x.SEQ_NO).ToList().FindAll(t => t.PFUNC_CODE == rootCode); //"23858079-7241-4e64-b0cf-eb5dbe84a9d6"
@@ -71,6 +73,11 @@
menuItem.meta.icon = item.ICON_URL; // item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
menuItem.meta.title = item.FUNC_NAME;
+ menuItem.meta.menuId = item.ID;
+ menuItem.meta.menuCode = item.FUNC_CODE;
+ menuItem.btnType = item.BUTTON_TYPE;
+ menuItem.meta.btnType = item.BUTTON_TYPE;
+ menuItem.meta.doMethod = item.DO_METHOD;
if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE))
{
menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false;
@@ -92,6 +99,8 @@
menuItem.show = item.SHOW;
menuItem.menuName = item.FUNC_NAME;
menuItem.status = item.IS_USE;
+ menuItem.btnType = item.BUTTON_TYPE;
+ menuItem.doMethod = item.DO_METHOD;
menuItem.children = new();
GetMenuItem(items.ToList(), item.FUNC_CODE, ref menuItem);
data.Add(menuItem);
@@ -112,16 +121,15 @@
SYS_MENU func = null;
if (!string.IsNullOrEmpty(menuName))
{
- func = Biz.Db.Queryable<SYS_MENU>().Where(x=>x.FUNC_NAME == menuName).First();
+ func = Biz.Db.Queryable<SYS_MENU>().Where(x => x.FUNC_NAME == menuName).First();
}
- var items = await Biz.Db.Queryable<SYS_MENU>()
- .WhereIF(!string.IsNullOrEmpty(status),q=>q.IS_USE == status)
- .OrderBy(x => x.SEQ_NO)
- .Distinct().ToListAsync();
- //娌℃湁鏌ヨ鐨勬椂鍊�
- if (func == null)
+ if (func != null)
{
- List<SYS_MENU> entities = items.OrderBy(x => x.SEQ_NO).ToList().FindAll(t => t.PFUNC_CODE == "0");
+ var items = await Biz.Db.Queryable<SYS_MENU>()
+ .WhereIF(!string.IsNullOrEmpty(status), q => q.IS_USE == status)
+ .OrderBy(x => x.SEQ_NO)
+ .Distinct().ToListAsync();
+ List<SYS_MENU> entities = items.OrderBy(x => x.SEQ_NO).ToList().FindAll(t => t.PFUNC_CODE == func.FUNC_CODE);
foreach (var item in entities)
{
MenuItem menuItem = new();
@@ -134,6 +142,10 @@
menuItem.meta.icon = item.ICON_URL; // item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
menuItem.meta.title = item.FUNC_NAME;
+ menuItem.meta.menuId = item.ID;
+ menuItem.meta.menuCode = item.FUNC_CODE;
+ menuItem.meta.btnType = item.BUTTON_TYPE;
+ menuItem.meta.doMethod = item.DO_METHOD;
if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE))
{
menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false;
@@ -158,20 +170,18 @@
menuItem.status = item.IS_USE;
menuItem.icon = menuItem.meta.icon;
menuItem.func_type = item.FUNC_TYPE;
+ menuItem.btnType = item.BUTTON_TYPE;
+ menuItem.doMethod = item.DO_METHOD;
menuItem.parentMenu = item.PFUNC_CODE;
- menuItem.orderNo= item.SEQ_NO;
- menuItem.children = new();
+ menuItem.orderNo = item.SEQ_NO;
+ menuItem.children = null;
GetMenuItem(items, item.FUNC_CODE, ref menuItem);
data.Add(menuItem);
}
- }
- //鏈夋煡璇㈡潯浠剁殑鏃跺��
- else {
-
- }
+ };
//杞崲Json鏃讹紝鍘婚櫎鍊间负null鐨勫睘鎬�
- var jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
+ var jsonSetting = new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore };
var json = JsonConvert.SerializeObject(data, Formatting.Indented, jsonSetting);
return json;
}
@@ -202,6 +212,8 @@
func.ICON_URL = data.icon;
func.SEQ_NO = (int)data.orderNo;
func.FUNC_TYPE = data.func_type;
+ func.BUTTON_TYPE = data.btnType;
+ func.DO_METHOD = data.doMethod;
func.COMPONENT = string.IsNullOrEmpty(data.component) && data.func_type == "0" ? "LAYOUT" : data.component;
func.IGNOREKEEPALIVE = data.keepalive;
func.SHOW = data.show;
@@ -217,6 +229,8 @@
FUNC_DESC = data.menuName,
FUNC_GROUP = "",
FUNC_TYPE = data.func_type,
+ BUTTON_TYPE = data.btnType,
+ DO_METHOD = data.doMethod,
PFUNC_CODE = data.parentMenu,
FUNC_CLASS = "BS",
PATH = data.path,
@@ -282,6 +296,10 @@
menuItem.meta.icon = item.ICON_URL; //item.ICON_URL;
menuItem.meta.orderNo = item.SEQ_NO;
menuItem.meta.title = item.FUNC_NAME;
+ menuItem.meta.menuId = item.ID;
+ menuItem.meta.menuCode = item.FUNC_CODE;
+ menuItem.meta.btnType = item.BUTTON_TYPE;
+ menuItem.meta.doMethod = item.DO_METHOD;
if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE))
{
menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false;
@@ -302,14 +320,17 @@
menuItem.keepalive = item.IGNOREKEEPALIVE;
menuItem.show = item.SHOW;
menuItem.menuName = item.FUNC_NAME;
- menuItem.createTime = item.CREATE_TIME;
+ menuItem.createTime = item.CREATE_TIME;
menuItem.icon = menuItem.meta.icon;
menuItem.func_type = item.FUNC_TYPE;
+ menuItem.btnType = item.BUTTON_TYPE;
+ menuItem.doMethod = item.DO_METHOD;
menuItem.parentMenu = item.PFUNC_CODE;
menuItem.orderNo = item.SEQ_NO;
menuItem.status = item.IS_USE;
- menuItem.children = new();
+ menuItem.children = null;
GetMenuItem(data, item.FUNC_CODE, ref menuItem);
+ if (pMenuItem.children == null) { pMenuItem.children = new(); }
pMenuItem.children.Add(menuItem);
}
}
--
Gitblit v1.9.3