From adf8845272d8005f7bb088cda9ce80bfd21e59d2 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 16 十月 2024 19:16:08 +0800
Subject: [PATCH] 修复一些bug
---
_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def | 4 ++--
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def | 3 ++-
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor#988.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bExport_OnClick#891.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def | 4 ++--
8 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
index d565641..7bbfc28 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
@@ -46,7 +46,7 @@
[
DataType: 'LocalTable'
FilterArguments: 'checkedProduct:QMacroPlanner::FormOfflinePlanChanges.dhFinelProduct'
- FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )'
+ FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.ProductID())'
Source: 'dhTable'
Taborder: 0
Transformation: 'LocalRow'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def
index b79df21..9aa1ca2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def
@@ -10,7 +10,7 @@
{
Body:
[*
- rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.Name()) );
+ rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.ProductID()));
columns := selectset( dhTable.Data( ),LocalColumn,column,true );
LocalCell_OfflinePlanComparison::AsyncExport( RecycleBin, rows, columns, MacroPlan );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def
index 0c750e5..6d7436e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def
@@ -13,7 +13,7 @@
[
DataBinding: 'dhBaseVersion.Data.Name'
Label: '鍩哄噯闇�姹傜増鏈細'
- Taborder: 0
+ Taborder: 1
]
}
Component ButtonDelete
@@ -24,7 +24,7 @@
[
Image: 'DELETE'
Label: 'Delete'
- Taborder: 1
+ Taborder: 0
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def
index 048766e..e0e936b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def
@@ -13,7 +13,7 @@
[
DataBinding: 'dhCompareVersion.Data.Name'
Label: '瀵规瘮闇�姹傜増鏈細'
- Taborder: 0
+ Taborder: 1
]
}
Component ButtonDelete2
@@ -24,7 +24,7 @@
[
Image: 'DELETE'
Label: 'Delete'
- Taborder: 1
+ Taborder: 0
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
index 3acda12..4298bba 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return isnull( dhBaseVersion.Data() ) or isnull( dhCompareVersion.Data() );
+ return not isnull( dhBaseVersion.Data() ) and not isnull( dhCompareVersion.Data() );
*]
QuillAction
{
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
index 3bb08ff..059b443 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
@@ -46,7 +46,7 @@
[
DataType: 'LocalTable'
FilterArguments: 'checkedProduct:QMacroPlanner::FormOfflinePlanComparison.dhFinelProduct'
- FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )'
+ FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.ProductID())'
Source: 'dhTable'
Taborder: 0
Transformation: 'LocalRow'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
index f13344f..1adf537 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
@@ -48,7 +48,8 @@
BaseType: 'WebLabel'
Properties:
[
- DataBinding: 'ddlOfflinePlanTable.Data.SaveDateTime'
+ DataBinding: 'ddlOfflinePlanTable.Data.TableName'
+ NumberOfColumns: 50
Taborder: 4
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bExport_OnClick\043891.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bExport_OnClick\043891.def"
index 15ae8fb..f919155 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bExport_OnClick\043891.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bExport_OnClick\043891.def"
@@ -10,7 +10,7 @@
{
Body:
[*
- rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.Name()) );
+ rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.ProductID()));
columns := selectset( dhTable.Data( ),LocalColumn,column,true );
LocalCell_ProductionComparison::AsyncExport( RecycleBin, rows, columns, MacroPlan );
*]
--
Gitblit v1.9.3