From 224bc6082b06f53755ee7e834d78e17f51cb0fa2 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期二, 15 十月 2024 16:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
index 9d0dfe9..f06061c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
@@ -5,49 +5,31 @@
BaseType: 'WebPanel'
Children:
[
- Component dhBaseVersionPath id:dhBaseVersionPath_640
+ #child: pVersionInfomationBase
+ #child: pVersionInfomationCompare
+ Component dhCompareVersion
{
- #keys: '[412672.0.1119852775]'
+ #keys: '[414996.1.137780879]'
BaseType: 'WebDataHolder'
- Databinding: 'String*'
- Properties:
- [
- Taborder: 2
- ]
- }
- Component dhCompareVersionPath id:dhCompareVersionPath_582
- {
- #keys: '[412672.0.1119852802]'
- BaseType: 'WebDataHolder'
- Databinding: 'String*'
+ Databinding: 'ArchiveFile'
Properties:
[
Taborder: 3
]
}
- Component lBaseVersionName
+ Component dhBaseVersion
{
- #keys: '[412672.0.1119853064]'
- BaseType: 'WebLabel'
+ #keys: '[414996.1.137780892]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'ArchiveFile'
Properties:
[
- Label: '鍩哄噯闇�姹傜増鏈細'
- Taborder: 0
- ]
- }
- Component lCompareVersionName
- {
- #keys: '[412672.0.1119853066]'
- BaseType: 'WebLabel'
- Properties:
- [
- Label: '瀵规瘮闇�姹傜増鏈細'
- Taborder: 1
+ Taborder: 2
]
}
]
Properties:
[
- Taborder: 4
+ Taborder: 3
]
}
--
Gitblit v1.9.3