From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001 From: admin <admin@admin.com> Date: 星期三, 22 一月 2025 12:20:44 +0800 Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def index a761ea1..559df7f 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def @@ -2,14 +2,18 @@ #parent: PanelOperation/ButtonCompare Response OnClick () id:Response_PanelOperation_ButtonCompare_OnClick { - #keys: '[412672.0.1085802211]' + #keys: '[414996.1.211223313]' CanBindMultiple: false DefinitionID: 'Responsedef_WebButton_OnClick' + Precondition: + [* + return not isnull( dhBaseVersion.Data() ) and not isnull( dhCompareVersion.Data() ); + *] QuillAction { Body: [* - table := ArchivePR::Compared( RecycleBin,DropDownListBaseVersion.Data(),DropDownListCompareVersion.Data() ); + table := LocalCell_DemandComparison::Compared( RecycleBin,MacroPlan, dhBaseVersion.Data().FilePath(),dhCompareVersion.Data().FilePath(),lBaseVersionName.Text(),lCompareVersionName.Text() ); dhComparisonData.Data( table ); *] GroupServerCalls: false -- Gitblit v1.9.3