From f3223777ec57ba93f2825c89811bf74e099e69f6 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 24 十月 2024 11:32:33 +0800
Subject: [PATCH] 调整界面布局
---
/dev/null | 28 --------------
_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl | 6 ++-
_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504#801.def | 9 +++-
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def | 16 +-------
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def | 13 ++++++
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def | 6 +-
_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl | 2
7 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
index 577d26c..0851470 100644
--- a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
+++ b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
@@ -45,7 +45,7 @@
localRowHandle := localRowIndexTree.GetHandle( rowKey );
localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
if( isnull( localRowIndex )){
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),ProductionLine := row.ProductionLine(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
localRows.Add( localRow );
localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
}
@@ -62,7 +62,7 @@
localRowHandle := localRowIndexTree.GetHandle( rowKey );
localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
if( isnull( localRowIndex )){
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),ProductionLine := row.ProductionLine(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
localRows.Add( localRow );
localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
}
@@ -75,6 +75,8 @@
}
traverse( localRows,Elements,localRow ){
+ info( localRow.ProductionLine() );
+
rowKey := localRow.Remark();
traverse( localColumns,Elements,localColumn ){
columnKey := localColumn.CustomDate().AsQUILL();
diff --git a/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl b/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl
index d4ba83e..fda0be5 100644
--- a/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl
+++ b/_Main/BL/Type_NewOfflinePlanTable/Method_Comparison.qbl
@@ -32,7 +32,7 @@
traverse( this,NewOfflinePlanRow,row,row.Type() = "1" ){
productID := row.ProductID();
productLine := row.ProductionLine();
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := productID + " > " + productLine,ProductID := productID );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := productID + " > " + productLine,ProductID := productID,ProductionLine := productLine );
traverse( row,NewOfflinePlanCell,cell,cell.NewOfflinePlanColumn().StartDate() >= macroPlan.StartOfPlanning().Date() ){
localColumnHandle := localColumnIndexTree.GetHandle( cell.NewOfflinePlanColumn().StartDate().AsQUILL() );
localColumnIndex := guard( localColumnIndexTree.Root().Child( localColumnHandle ),null( NamedValue ));
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
index 3f5a6da..d5ad5a9 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
@@ -29,6 +29,7 @@
[
DisplayField: 'TableName'
Label: '鍩哄噯涓嬬嚎璁″垝:'
+ NumberOfColumns: 50
Taborder: 0
]
}
@@ -66,6 +67,7 @@
[
DisplayField: 'TableName'
Label: '瀵规瘮涓嬬嚎璁″垝:'
+ NumberOfColumns: 50
Taborder: 1
]
}
@@ -76,7 +78,7 @@
Properties:
[
Image: 'EXPORT1'
- Taborder: 5
+ Taborder: 3
]
}
Component dhXMLDataListener
@@ -114,7 +116,8 @@
BoundValue: 'Day'
ButtonLabels: 'Day;Week;Month'
ButtonValues: 'Day;Week;Month'
- Taborder: 3
+ Orientation: 'horizontal'
+ Taborder: 4
]
}
Component dhTimeUnit id:dhTimeUnit_384
@@ -124,7 +127,7 @@
Databinding: 'String*'
Properties:
[
- Taborder: 4
+ Taborder: 5
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
index 9b59356..39c2223 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
@@ -5,17 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- Component LabelRibbon
- {
- #keys: '[412672.1.66018113]'
- BaseType: 'WebLabel'
- Properties:
- [
- DataBinding: 'ddlOfflinePlanTable.Data.TableName'
- NumberOfColumns: 50
- Taborder: 4
- ]
- }
Component dhXMLDataListener id:dhXMLDataListener_273
{
#keys: '[414996.1.108480431]'
@@ -39,7 +28,7 @@
]
Properties:
[
- Taborder: 3
+ Taborder: 2
]
}
Component dhTimeUnit
@@ -49,10 +38,9 @@
Databinding: 'String*'
Properties:
[
- Taborder: 2
+ Taborder: 1
]
}
- #child: PanelRibbon510
#child: PanelRibbon763
]
Properties:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon510.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon510.def
deleted file mode 100644
index 942eb3a..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon510.def
+++ /dev/null
@@ -1,28 +0,0 @@
-Quintiq file version 2.0
-Component PanelRibbon510
-{
- #keys: '[414996.1.148040419]'
- BaseType: 'WebPanel'
- Children:
- [
- Component rbgTimeUnit id:rbgTimeUnit_19
- {
- #keys: '[414996.1.148040622]'
- BaseType: 'WebRadioButtonGroup'
- Properties:
- [
- BoundValue: 'Day'
- ButtonLabels: 'Day;Week;Month'
- ButtonValues: 'Day;Week;Month'
- Orientation: 'horizontal'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def
index 1c87d6e..4e60ae5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def
@@ -53,6 +53,19 @@
Taborder: 2
]
}
+ Component rbgTimeUnit
+ {
+ #keys: '[414996.1.158400570]'
+ BaseType: 'WebRadioButtonGroup'
+ Properties:
+ [
+ BoundValue: 'Day'
+ ButtonLabels: 'Day;Week;Month'
+ ButtonValues: 'Day;Week;Month'
+ Orientation: 'horizontal'
+ Taborder: 3
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon510_rbgTimeUnit_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
similarity index 64%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon510_rbgTimeUnit_OnUserChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
index bf2b6d7..2ce7f7e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon510_rbgTimeUnit_OnUserChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelRibbon510/rbgTimeUnit_19
-Response OnUserChanged () id:Response_PanelRibbon504_rbgTimeUnit_OnUserChanged
+#parent: PanelRibbon763/rbgTimeUnit
+Response OnUserChanged () id:Response_PanelRibbon510_rbgTimeUnit_OnUserChanged
{
- #keys: '[414996.1.148040621]'
+ #keys: '[414996.1.158400569]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
GroupServerCalls: true
--
Gitblit v1.9.3