From d4208b18ee7c6be4b5ebb26e5e942cb24d9f8bf4 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期一, 25 九月 2023 22:38:49 +0800
Subject: [PATCH] Merge branch 'dev_cyy' into dev_realse_cyy
---
/dev/null | 63 -------------------------------
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def | 4 ++
2 files changed, 4 insertions(+), 63 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def
index 130115e..c806feb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def
@@ -11,6 +11,7 @@
BaseType: 'WebButton'
Properties:
[
+ ButtonSize: 'compact'
Description: '璁㈠崟鏂板鍙嶇/鎺堟潈'
Label: '璁㈠崟鏂板鍙嶇/鎺堟潈'
Taborder: 1
@@ -39,6 +40,7 @@
BaseType: 'WebButton'
Properties:
[
+ ButtonSize: 'compact'
Description: '鍘熸枡鏂板鍙嶇/鎺堟潈'
Label: '鍘熸枡鏂板鍙嶇/鎺堟潈'
Taborder: 2
@@ -67,6 +69,7 @@
BaseType: 'WebButton'
Properties:
[
+ ButtonSize: 'compact'
Description: '鍔犺浇鏁版嵁锛堝亣鐨勶紝鍚庣画闇�瑕佸鎺ユ暟鎹級'
Label: '鍔犺浇棰勬祴璁㈠崟鏁版嵁'
Taborder: 0
@@ -79,6 +82,7 @@
BaseType: 'WebButton'
Properties:
[
+ ButtonSize: 'compact'
Description: 'ERO璁㈠崟鍐插噺'
Image: 'AMMUNITION_BOX_CLOSED'
Label: 'ERP璁㈠崟鍐插噺'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_List212.def b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_List212.def
deleted file mode 100644
index d04a4cb..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_List212.def
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component List212
-{
- #keys: '[414724.0.153225431]'
- BaseType: 'WebList'
- Children:
- [
- Component DataExtractor924
- {
- #keys: '[414724.0.153225432]'
- BaseType: 'WebDataExtractor'
- Properties:
- [
- DataType: 'MacroPlan'
- Source: 'MacroPlan'
- Taborder: 0
- Transformation: 'MappingProduct'
- ]
- }
- #child: listActionBarPage441
- Component DataSetLevel622
- {
- #keys: '[414724.0.153225437]'
- BaseType: 'WebDataSetLevel'
- Children:
- [
- #child: listContextMenu182
- ]
- Properties:
- [
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CommonBusiness","title":"CommonBusiness","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CommonBusiness"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"EndDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ID","title":"ID","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCommon","title":"IsCommon","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCommon"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"KeyProduct","title":"KeyProduct","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"KeyProduct"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Notes","title":"Notes","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Notes"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductMajorType","title":"ProductMajorType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductMajorType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductSubclassType","title":"ProductSubclassType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductSubclassType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShelfLife","title":"ShelfLife","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShelfLife"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasureName","title":"UnitOfMeasureName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnitOfMeasureName"}}]'
- ContextMenu: 'listContextMenu182'
- Taborder: 2
- ]
- }
- ]
- Properties:
- [
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listActionBarPage441.def b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listActionBarPage441.def
deleted file mode 100644
index bb08f37..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listActionBarPage441.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage441
-{
- #keys: '[414724.0.153225434]'
- BaseType: 'listActionBarPage'
- Properties:
- [
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listContextMenu182.def b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listContextMenu182.def
deleted file mode 100644
index e5e38ee..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listContextMenu182.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu182
-{
- #keys: '[414724.0.153225439]'
- BaseType: 'listContextMenu'
- Properties:
- [
- Taborder: 0
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button593_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button593_OnClick.def
deleted file mode 100644
index d37a96f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button593_OnClick.def
+++ /dev/null
@@ -1,24 +0,0 @@
-Quintiq file version 2.0
-#parent: Button593
-Response OnClick () id:Response_Frm_TEST_Button593_OnClick
-{
- #keys: '[414724.0.153411735]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- QuillAction
- {
- Body:
- [*
- HObj := H_FunctionClass::SM_GetProductInfo( MacroPlan,"");
- if( not isnull( HObj))
- {
- WebMessageBox::Information( HObj.BusinessType());
- }
- else
- {
- WebMessageBox::Information( "寰楀埌鐨勭┖鍊�");
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def b/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def
deleted file mode 100644
index 356e36c..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def
+++ /dev/null
@@ -1,63 +0,0 @@
-Quintiq file version 2.0
-#root
-#parent: MacroPlannerWebApp
-OrphanComponent Frm_TEST
-{
- #keys: '[414724.0.153225415]'
- BaseType: 'WebForm'
- Children:
- [
- #child: List212
- Component DataHolder417
- {
- #keys: '[414724.0.153253171]'
- BaseType: 'WebDataHolder'
- Databinding: 'structured[MappingProduct]*'
- Children:
- [
- Component DataExtractor742
- {
- #keys: '[414724.0.153253184]'
- BaseType: 'WebDataExtractor'
- Properties:
- [
- DataType: 'MacroPlan'
- Source: 'MacroPlan'
- Taborder: 0
- Transformation: 'MappingProduct'
- ]
- }
- ]
- Properties:
- [
- Taborder: 2
- ]
- }
- Component Button593
- {
- #keys: '[414724.0.153411711]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'MONITOR_RGB'
- Label: '娴嬭瘯'
- Taborder: 0
- ]
- }
- Component Button687
- {
- #keys: '[414724.0.164341716]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'HORSE'
- Label: '璁㈠崟鍐插噺'
- Taborder: 3
- ]
- }
- ]
- Properties:
- [
- Title: '娴嬭瘯椤甸潰'
- ]
-}
--
Gitblit v1.9.3