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_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
index 75c409e..301232d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
@@ -27,7 +27,7 @@
Properties:
[
Image: 'FLASH'
- Label: 'Requirement upload'
+ Label: 'Demand upload'
Taborder: 1
]
}
@@ -44,10 +44,10 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'Archive'
+ DataType: 'ArchiveExecutionStatus'
FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
- FixedFilter: 'object.ExecutionUserName() = userName'
- Source: 'Archive'
+ FixedFilter: 'object.Filter( userName )'
+ Source: 'ArchiveExecutionStatus'
Taborder: 0
Transformation: 'RequirementImportExecutionStatus'
]
@@ -55,16 +55,38 @@
]
Properties:
[
+ Taborder: 4
+ ]
+ }
+ Component bBESIWarning
+ {
+ #keys: '[414996.0.413910939]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'WARNING'
+ Label: 'BESI warning'
Taborder: 2
]
}
Component dhUserName
{
- #keys: '[414996.0.387620508]'
+ #keys: '[413988.0.1522010283]'
BaseType: 'WebDataHolder'
Databinding: 'String*'
Properties:
[
+ Taborder: 5
+ ]
+ }
+ Component ButtonMaintainArchivedFiles id:ButtonMaintainArchivedFiles_478
+ {
+ #keys: '[414996.1.257540637]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'DOCUMENTS_GEAR'
+ Label: 'Maintain archived files'
Taborder: 3
]
}
--
Gitblit v1.9.3