From 3f76bb10685b70b3ce8259735cddee4a91132d90 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 25 九月 2024 17:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504#801.def |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
index e90ef60..28e3804 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
@@ -18,10 +18,10 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'MacroPlan'
-            Source: 'MacroPlan'
+            DataType: 'structured[MacroPlan]'
+            Source: 'dhMacroPlans'
             Taborder: 0
-            Transformation: 'OfflinePlanTable'
+            Transformation: 'Elements.OfflinePlanTable'
           ]
         }
       ]
@@ -55,10 +55,10 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'MacroPlan'
-            Source: 'MacroPlan'
+            DataType: 'structured[MacroPlan]'
+            Source: 'dhMacroPlans'
             Taborder: 0
-            Transformation: 'OfflinePlanTable'
+            Transformation: 'Elements.OfflinePlanTable'
           ]
         }
       ]
@@ -69,11 +69,21 @@
         Taborder: 1
       ]
     }
+    Component dhMacroPlans id:dhMacroPlans_891
+    {
+      #keys: '[414996.1.103241339]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'structured[MacroPlan]*'
+      Properties:
+      [
+        Taborder: 3
+      ]
+    }
   ]
   Properties:
   [
     FixedSize: true
     Orientation: 'horizontal'
-    Taborder: 1
+    Taborder: 0
   ]
 }

--
Gitblit v1.9.3