From 589a65a22722749e45a7710353e11816e2fb73f3 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 24 六月 2024 18:48:56 +0800
Subject: [PATCH] 菜单更新

---
 Tiger.Business/SYS/Biz.SYS_MENU.cs |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs
index db7a385..b6a5b83 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);
@@ -134,6 +143,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,6 +171,8 @@
                     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();
@@ -202,6 +217,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 +234,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 +301,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;
@@ -305,6 +328,8 @@
                     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;

--
Gitblit v1.9.3