From bce35410b00e2b7228ab5409744e173f2726b8d3 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 01 七月 2024 14:43:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
index dd916e8..e22590b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
@@ -20,13 +20,13 @@
             DataType: 'LocalTable'
             Source: 'dhComparisonData'
             Taborder: 0
-            Transformation: 'LocalRow.LocalCell'
+            Transformation: 'LocalRow.LocalCell.astype(LocalCell_DemandComparison)'
           ]
         }
       ]
       Properties:
       [
-        Attributes: 'Value'
+        Attributes: 'BaseVersionValue;CompareVersionValue;BaseVersion;CompareVersion;Gap'
         Column: 'LocalColumn'
         Row: 'LocalRow'
         Taborder: 0
@@ -53,7 +53,7 @@
       ]
       Properties:
       [
-        Legend: 'Index'
+        Legend: 'Name'
         SortCriteria: 'Index'
         Taborder: 1
       ]
@@ -89,6 +89,7 @@
   ]
   Properties:
   [
+    AllowMultipleAttributes: true
     Columns: 'MatrixEditorColumns'
     ContextMenu: 'matrixeditorContextMenuDemandComparison'
     Rows: 'MatrixEditorRows'

--
Gitblit v1.9.3