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_FormOfflinePlanComparison/Component_PanelRibbon504.def | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
index 395d971..f13344f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
@@ -9,7 +9,7 @@
{
#keys: '[412672.1.64850982]'
BaseType: 'WebDropDownList'
- Databinding: 'OfflinePlanTable'
+ Databinding: 'OfflinePlanTableInfo'
Children:
[
Component DataExtractorRibbon
@@ -18,16 +18,16 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'MacroPlan'
- Source: 'MacroPlan'
+ DataType: 'RecycleBin'
+ Source: 'RecycleBin'
Taborder: 0
- Transformation: 'OfflinePlanTable'
+ Transformation: 'OfflinePlanTableInfo'
]
}
]
Properties:
[
- DisplayField: 'SaveDateTime'
+ DisplayField: 'TableName'
Label: '涓嬬嚎璁″垝:'
Taborder: 0
]
@@ -49,7 +49,7 @@
Properties:
[
DataBinding: 'ddlOfflinePlanTable.Data.SaveDateTime'
- Taborder: 2
+ Taborder: 4
]
}
Component bExport id:bExport_298
@@ -59,7 +59,7 @@
Properties:
[
Image: 'EXPORT1'
- Taborder: 3
+ Taborder: 2
]
}
Component dhXMLDataListener id:dhXMLDataListener_273
@@ -85,7 +85,7 @@
]
Properties:
[
- Taborder: 4
+ Taborder: 3
]
}
]
--
Gitblit v1.9.3