From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index 92f4b4f..459c315 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
@@ -17,10 +17,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'OfflinePlanArchiveVersion'
- Source: 'DataHolderTable'
+ DataType: 'structured[OfflinePlanArchiveRow]'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'Row.Cell'
+ Transformation: 'Elements.Cell'
]
}
]
@@ -44,17 +44,16 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'OfflinePlanArchiveVersion'
- Description: "( search.Generation() = '<All>' or object.Product_MP().Generation() = search.Generation() ) and ( search.MqbMlb() = '<All>' or object.Product_MP().MQBMLB() = search.MqbMlb() ) and ( search.Power() = '<All>' or object.Product_MP().Power() = search.Power() )"
- Source: 'DataHolderTable'
+ DataType: 'structured[OfflinePlanArchiveRow]'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'Row'
+ Transformation: 'Elements'
]
}
]
Properties:
[
- Legend: 'Name'
+ Legend: 'ShowName'
SortCriteria: 'Name'
Taborder: 1
]
@@ -71,10 +70,13 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'OfflinePlanArchiveVersion'
- Source: 'DataHolderTable'
+ DataType: 'structured[OfflinePlanArchiveRow]'
+ Description: '( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
+ FilterArguments: 'search:QMacroPlanner::FormOfflinePlanArchive.dhSearch'
+ FixedFilter: 'object.Filter( search )'
+ Source: 'dhRows'
Taborder: 0
- Transformation: 'Column'
+ Transformation: 'Elements.Cell.Column'
]
}
]
--
Gitblit v1.9.3