From fcdc246fcb3e8aef9798b10bb7815ec5bae27bac Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 25 九月 2024 13:24:28 +0800
Subject: [PATCH] 修复一些bug

---
 /dev/null                                                                                               |   12 ------------
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon#799.def                             |    1 -
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504#801.def                          |   24 +++++++++++++++++-------
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhMacroPlans_OnCreated#57.def |   17 +++++++++++++++++
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def                                 |    2 +-
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def
index 3b2424b..eb49efb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def
@@ -91,6 +91,6 @@
   [
     FixedSize: true
     Orientation: 'horizontal'
-    Taborder: 2
+    Taborder: 1
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def"
index 3d20b4f..64fd9b1 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def"
@@ -7,7 +7,6 @@
   [
     #child: PanelFilter
     #child: PanelRibbon504_801
-    #child: PanelRibbon322
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon322.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon322.def
deleted file mode 100644
index 74422d6..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon322.def
+++ /dev/null
@@ -1,89 +0,0 @@
-Quintiq file version 2.0
-Component PanelRibbon322
-{
-  #keys: '[412672.1.82701845]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    Component ddlBaseMacroPlan
-    {
-      #keys: '[412672.1.82701846]'
-      BaseType: 'WebDropDownList'
-      Databinding: 'MacroPlan'
-      Children:
-      [
-        Component deBaseMacroPlan
-        {
-          #keys: '[412672.1.82702010]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[MacroPlan]'
-            Source: 'dhMacroPlans'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        DisplayField: 'DisplayNameForSelection'
-        Label: '鍩哄噯鐗堟湰:'
-        Taborder: 0
-      ]
-    }
-    Component ddlCompareMacroPlan
-    {
-      #keys: '[412672.1.82701851]'
-      BaseType: 'WebDropDownList'
-      Databinding: 'MacroPlan'
-      Children:
-      [
-        Component deCompareMacroPlan
-        {
-          #keys: '[412672.1.82702025]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[MacroPlan]'
-            Source: 'dhMacroPlans'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        DisplayField: 'DisplayNameForSelection'
-        Label: '瀵规瘮鐗堟湰:'
-        Taborder: 1
-      ]
-    }
-    Component dhMacroPlans
-    {
-      #keys: '[412672.1.82701972]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[MacroPlan]*'
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-    Component ButtonRibbon
-    {
-      #keys: '[412672.1.85851524]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: 'Tesyt'
-        Taborder: 3
-      ]
-    }
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 0
-  ]
-}
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
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon322_ButtonRibbon_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon322_ButtonRibbon_OnClick.def
deleted file mode 100644
index db31260..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon322_ButtonRibbon_OnClick.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322/ButtonRibbon
-Response OnClick () id:Response_PanelRibbon322_ButtonRibbon_OnClick
-{
-  #keys: '[412672.1.85851565]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      macroPlans := ApplicationMacroPlanner.GetMacroPlans();
-      dhMacroPlans.Data( &macroPlans );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon322_dhMacroPlans_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon322_dhMacroPlans_OnCreated.def
deleted file mode 100644
index e8423d1..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon322_dhMacroPlans_OnCreated.def
+++ /dev/null
@@ -1,12 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon322/dhMacroPlans
-Response OnCreated () id:Response_PanelRibbon322_dhMacroPlans_OnCreated
-{
-  #keys: '[412672.1.82702179]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  QuillAction
-  {
-    GroupServerCalls: false
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhMacroPlans_OnCreated\04357.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhMacroPlans_OnCreated\04357.def"
new file mode 100644
index 0000000..485814d
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhMacroPlans_OnCreated\04357.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: PanelRibbon504_801/dhMacroPlans_891
+Response OnCreated () id:Response_PanelRibbon322_dhMacroPlans_OnCreated_57
+{
+  #keys: '[414996.1.103241337]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      macroPlans := ApplicationMacroPlanner.GetMacroPlans();
+      this.Data( &macroPlans );
+    *]
+    GroupServerCalls: false
+  }
+}

--
Gitblit v1.9.3