From 7c37f98f0d6e0da998a5d3dad5dd0081f5686e17 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 18 十月 2024 11:22:12 +0800
Subject: [PATCH] 修复一些bug,添加存档文件的维护功能
---
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_cmContent.def | 24 ++++
/dev/null | 18 ---
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Method_Create.def | 10 ++
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation#568.def | 17 ++
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_abpContent.def | 10 ++
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_lstContent.def | 59 +++++++++++
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def | 28 +++++
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_pnlContent.def | 15 +++
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Response_lstContent_mnDelete_OnClick.def | 23 ++++
_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def | 20 ++++
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def | 17 +++
11 files changed, 217 insertions(+), 24 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_abpContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_abpContent.def
new file mode 100644
index 0000000..3d17366
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_abpContent.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component abpContent
+{
+ #keys: '[414996.1.144423201]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_cmContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_cmContent.def
new file mode 100644
index 0000000..698f89b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_cmContent.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component cmContent
+{
+ #keys: '[414996.1.144423206]'
+ BaseType: 'listContextMenu'
+ Children:
+ [
+ Component mnDelete
+ {
+ #keys: '[414996.1.144423645]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'DELETE'
+ Taborder: 3
+ Title: 'Delete'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_lstContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_lstContent.def
new file mode 100644
index 0000000..f071461
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_lstContent.def
@@ -0,0 +1,59 @@
+Quintiq file version 2.0
+Component lstContent
+{
+ #keys: '[414996.1.144423198]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component deContent
+ {
+ #keys: '[414996.1.144423199]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'Archive'
+ Source: 'Archive'
+ Taborder: 0
+ Transformation: 'ArchiveFile'
+ ]
+ }
+ #child: abpContent
+ Component dslContent
+ {
+ #keys: '[414996.1.144423204]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: cmContent
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FilePath","title":"FilePath","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FilePath"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DateTime","title":"DateTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DateTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UserName","title":"UserName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UserName"}}]'
+ ContextMenu: 'cmContent'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+ ResponseDefinitions:
+ [
+ DelegatedResponseDefinition OnClick id:Responsedef_lstContent_WebMenu_OnClick
+ {
+ #keys: '[414996.1.144423479]'
+ Initiator: 'WebMenu'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[267.0.23880229]'
+ Binding: 'this.Selection()'
+ }
+ ]
+ }
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_pnlContent.def
new file mode 100644
index 0000000..55877b4
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Component_pnlContent.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[414996.1.144423160]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: lstContent
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Method_Create.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Method_Create.def
new file mode 100644
index 0000000..1165fb4
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Method_Create.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#parent: #root
+Method Create () id:Method_DialogMaintainArchivedFiles_Create
+{
+ #keys: '[414996.1.144423799]'
+ Body:
+ [*
+ ApplicationMacroPlanner.ShowFormModal( this );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Response_lstContent_mnDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Response_lstContent_mnDelete_OnClick.def
new file mode 100644
index 0000000..eb67442
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/Response_lstContent_mnDelete_OnClick.def
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: lstContent
+Response OnClick (
+ structured[ArchiveFile] selection
+) id:Response_lstContent_mnDelete_OnClick
+{
+ #keys: '[414996.1.144423689]'
+ CanBindMultiple: false
+ DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
+ GroupServerCalls: true
+ Initiator: 'mnDelete'
+ QuillAction
+ {
+ Body:
+ [*
+ if( WebMessageBox::Question( Translations::MessageBox_ConfirmDeletion( "this files" ),Translations::MessageBox_YesNo() ) = 0 ){
+ traverse( selection,Elements,element ){
+ element.Delete();
+ }
+ }
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def
new file mode 100644
index 0000000..d37216a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogMaintainArchivedFiles
+{
+ #keys: '[414996.1.144423158]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pnlContent
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ Description: 'Maintain archived files '
+ ExcludeFromActiveComponent: true
+ Padding: 'false'
+ Title: 'Maintain archived files '
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
index 44b99a9..b87d778 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
@@ -12,7 +12,7 @@
Properties:
[
Label: '寮�濮嬪姣�'
- Taborder: 2
+ Taborder: 3
]
}
Component dhXMLDataListener id:dhXMLDataListener_906
@@ -38,7 +38,7 @@
]
Properties:
[
- Taborder: 1
+ Taborder: 2
]
}
Component bExport id:bExport_98
@@ -49,10 +49,21 @@
[
Image: 'EXPORT1'
Label: '瀵煎嚭'
- Taborder: 0
+ Taborder: 1
]
}
#child: pVersionInfomation
+ Component bMaintainArchivedFiles
+ {
+ #keys: '[414996.1.144423972]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'MAGAZINE_FOLDER'
+ Label: 'M'
+ Taborder: 0
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
index f06061c..4cb57ad 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
@@ -5,8 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- #child: pVersionInfomationBase
- #child: pVersionInfomationCompare
Component dhCompareVersion
{
#keys: '[414996.1.137780879]'
@@ -27,9 +25,33 @@
Taborder: 2
]
}
+ Component lBaseVersionName
+ {
+ #keys: '[414996.1.144422027]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ DataBinding: 'dhBaseVersion.Data.Name'
+ Label: '鍩哄噯闇�姹傜増鏈細'
+ NumberOfColumns: 50
+ Taborder: 0
+ ]
+ }
+ Component lCompareVersionName
+ {
+ #keys: '[414996.1.144422050]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ DataBinding: 'dhCompareVersion.Data.Name'
+ Label: '瀵规瘮闇�姹傜増鏈細'
+ NumberOfColumns: 50
+ Taborder: 1
+ ]
+ }
]
Properties:
[
- Taborder: 3
+ Taborder: 4
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def
deleted file mode 100644
index 6d7436e..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationBase.def
+++ /dev/null
@@ -1,37 +0,0 @@
-Quintiq file version 2.0
-Component pVersionInfomationBase
-{
- #keys: '[414996.1.137700459]'
- BaseType: 'WebPanel'
- Children:
- [
- Component lBaseVersionName id:lBaseVersionName_774
- {
- #keys: '[414996.1.137700529]'
- BaseType: 'WebLabel'
- Properties:
- [
- DataBinding: 'dhBaseVersion.Data.Name'
- Label: '鍩哄噯闇�姹傜増鏈細'
- Taborder: 1
- ]
- }
- Component ButtonDelete
- {
- #keys: '[414996.1.137420506]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'DELETE'
- Label: 'Delete'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 0
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def
deleted file mode 100644
index e0e936b..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomationCompare.def
+++ /dev/null
@@ -1,37 +0,0 @@
-Quintiq file version 2.0
-Component pVersionInfomationCompare
-{
- #keys: '[414996.1.137700548]'
- BaseType: 'WebPanel'
- Children:
- [
- Component lCompareVersionName id:lCompareVersionName_456
- {
- #keys: '[414996.1.137700586]'
- BaseType: 'WebLabel'
- Properties:
- [
- DataBinding: 'dhCompareVersion.Data.Name'
- Label: '瀵规瘮闇�姹傜増鏈細'
- Taborder: 1
- ]
- }
- Component ButtonDelete2
- {
- #keys: '[414996.1.137740415]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'DELETE'
- Label: 'Delete'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Orientation: 'horizontal'
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def
new file mode 100644
index 0000000..c0d561f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: PanelOperation_568/bMaintainArchivedFiles
+Response OnClick () id:Response_PanelOperation_568_bMaintainArchivedFiles_OnClick
+{
+ #keys: '[414996.1.144820904]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ dlg := construct( DialogMaintainArchivedFiles );
+ dlg.Create();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pVersionInfomationBase_ButtonDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pVersionInfomationBase_ButtonDelete_OnClick.def
deleted file mode 100644
index ecf5902..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pVersionInfomationBase_ButtonDelete_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: pVersionInfomationBase/ButtonDelete
-Response OnClick () id:Response_pVersionInfomationBase_ButtonDelete_OnClick
-{
- #keys: '[414996.1.137612795]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- if( WebMessageBox::Question( Translations::MessageBox_ConfirmDeletion( dhBaseVersion.Name() ),Translations::MessageBox_YesNo() ) = 0 ){
- dhBaseVersion.Data().Delete();
- }
- *]
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pVersionInfomationCompare_ButtonDelete2_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pVersionInfomationCompare_ButtonDelete2_OnClick.def
deleted file mode 100644
index 8448354..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pVersionInfomationCompare_ButtonDelete2_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: pVersionInfomationCompare/ButtonDelete2
-Response OnClick () id:Response_pVersionInfomationCompare_ButtonDelete2_OnClick
-{
- #keys: '[414996.1.137612881]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
- QuillAction
- {
- Body:
- [*
- if( WebMessageBox::Question( Translations::MessageBox_ConfirmDeletion( dhBaseVersion.Name() ),Translations::MessageBox_YesNo() ) = 0 ){
- dhCompareVersion.Data().Delete();
- }
- *]
- }
-}
--
Gitblit v1.9.3