From 880f3c0257eeb8c37761d484258fdd102a369a19 Mon Sep 17 00:00:00 2001
From: 陈清红 <420599804@qq.com>
Date: 星期一, 14 四月 2025 16:46:36 +0800
Subject: [PATCH] BUG&优化项

---
 _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable#384.def |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
index 2b4a7d6..901e355 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
@@ -17,16 +17,16 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'AssemblyOnlinePlanVersion'
-            Source: 'DataHolderTable'
+            DataType: 'structured[AssemblyOnlinePlanVersionRow]'
+            Source: 'dhRows'
             Taborder: 0
-            Transformation: 'Row.Cell'
+            Transformation: 'Elements.Cell'
           ]
         }
       ]
       Properties:
       [
-        Attributes: 'Quantity'
+        Attributes: 'Order;Quantity'
         Column: 'Column'
         Row: 'Row'
         Taborder: 0
@@ -44,16 +44,16 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'AssemblyOnlinePlanVersion'
-            Source: 'DataHolderTable'
+            DataType: 'structured[AssemblyOnlinePlanVersionRow]'
+            Source: 'dhRows'
             Taborder: 0
-            Transformation: 'Row'
+            Transformation: 'Elements'
           ]
         }
       ]
       Properties:
       [
-        Legend: 'Name'
+        Legend: 'ShowName'
         SortCriteria: 'Name'
         Taborder: 1
       ]
@@ -70,10 +70,13 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'AssemblyOnlinePlanVersion'
-            Source: 'DataHolderTable'
+            DataType: 'structured[AssemblyOnlinePlanVersionRow]'
+            Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
+            FilterArguments: 'search:QMacroPlanner::FormAssemblyOnlinePlanVersion.dhSearch'
+            FixedFilter: 'object.Filter( search )'
+            Source: 'dhRows'
             Taborder: 0
-            Transformation: 'Column'
+            Transformation: 'Elements.Cell.Column'
           ]
         }
       ]
@@ -89,6 +92,7 @@
   ]
   Properties:
   [
+    AllowMultipleAttributes: true
     Columns: 'MatrixEditorColumnsTable'
     ContextMenu: 'matrixeditorContextMenuTable'
     Rows: 'MatrixEditorRowsTable'

--
Gitblit v1.9.3