From 3d65ee18d645a30e600c9b63f0daefe2fc2b1151 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 13 十一月 2024 15:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations#529.def | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
index a374678..e2b8f6a 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListGenerations\043529.def"
@@ -5,6 +5,7 @@
BaseType: 'WebList'
Children:
[
+ #child: listActionBarPage963_1
Component DataExtractor989
{
#keys: '[414996.1.209190763]'
@@ -17,7 +18,6 @@
Transformation: 'Elements'
]
}
- #child: listActionBarPage963_1
Component DataSetLevel191
{
#keys: '[414996.1.209190765]'
@@ -28,7 +28,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
ContextMenu: 'listContextMenu687'
Taborder: 2
]
@@ -36,6 +36,7 @@
]
Properties:
[
+ MinimumColumns: 8
Taborder: 0
]
}
--
Gitblit v1.9.3