From 0716597b6b182c82942dd1e2764f1eb48388fcd4 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 18 十二月 2024 15:42:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnCreated.def     |   19 +++++++++++++++++++
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnDataChanged.def |    2 +-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnCreated.def
new file mode 100644
index 0000000..907c1b2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnCreated.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: pAnnualPlanReport_921/dhAnnualPlanTable
+Response OnCreated () id:Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnCreated
+{
+  #keys: '[414996.1.270570368]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      table := select( RecycleBin,LocalTable,table,table.Name() = ArchiveCell_AnnualPlanReport::GetTableName() );
+      if( not isnull( table )){
+        this.Data( table );
+      }
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnDataChanged.def
index fc54064..a163643 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_921_dhAnnualPlanTable_OnDataChanged.def
@@ -10,7 +10,7 @@
   {
     Body:
     [*
-      pAnnualPlanReport.Title( this.Data().Name() );
+      pAnnualPlanReport.Title( ifexpr( not isnull( this.Data()), this.Data().Name(), ArchiveCell_AnnualPlanReport::GetTableName() ));
     *]
   }
 }

--
Gitblit v1.9.3