From 2ffa3cda080d1990775fe42e13ced433d27ca3e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index fd2785d..abdeef7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -257,7 +257,7 @@
/// </summary>
private void getTree()
{
- var pgq = new PageQueryModel(1, 999999, "idx");
+ var pgq = new PageQueryModel(1, 999999, "a.idx");
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -270,7 +270,7 @@
tlMenu.ParentFieldName = "upGuid";
tlMenu.Tag = "name";
tlMenu.EndUpdate();
- // this.tlMenu.ExpandAll();
+ this.tlMenu.CollapseAll();
tlMenu.OptionsView.CheckBoxStyle =
DefaultNodeCheckBoxStyle.Default;
}
@@ -321,8 +321,8 @@
/// </summary>
private void getDownList()
{
- var pgq = new PageQueryModel(1, 999999, "idx", "asc", "",
- " and category=1");
+ var pgq = new PageQueryModel(1, 999999, "a.idx", "asc", "",
+ " and a.category=1");
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -376,7 +376,6 @@
i++;
}
}
-
txt_icon.Properties.LargeImages = dicImg;
txt_icon.Properties.SmallImages = dicImg;
}
--
Gitblit v1.9.3