From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
index 75c409e..59d21f4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def
@@ -44,10 +44,8 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'Archive'
- FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
- FixedFilter: 'object.ExecutionUserName() = userName'
- Source: 'Archive'
+ DataType: 'ArchiveExecutionStatus'
+ Source: 'ArchiveExecutionStatus'
Taborder: 0
Transformation: 'RequirementImportExecutionStatus'
]
@@ -55,17 +53,18 @@
]
Properties:
[
- Taborder: 2
+ Taborder: 3
]
}
- Component dhUserName
+ Component bBESIWarning
{
- #keys: '[414996.0.387620508]'
- BaseType: 'WebDataHolder'
- Databinding: 'String*'
+ #keys: '[414996.0.413910939]'
+ BaseType: 'WebButton'
Properties:
[
- Taborder: 3
+ Image: 'WARNING'
+ Label: 'BESI warning'
+ Taborder: 2
]
}
]
--
Gitblit v1.9.3