From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def | 95 ++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 70 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
index 8538493..cf6148c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
@@ -5,69 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- Component cbMonday
- {
- #keys: '[414996.1.116589495]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 3
- ]
- }
- Component cbTuesday
- {
- #keys: '[414996.1.116589517]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 4
- ]
- }
- Component cbWednesday
- {
- #keys: '[414996.1.116589519]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 5
- ]
- }
- Component cbThursday
- {
- #keys: '[414996.1.116589521]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 6
- ]
- }
- Component cbFriday
- {
- #keys: '[414996.1.116589523]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 7
- ]
- }
- Component cbSaturday
- {
- #keys: '[414996.1.116589525]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 8
- ]
- }
- Component cbSunday
- {
- #keys: '[414996.1.116589527]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 9
- ]
- }
Component dsStartDate
{
#keys: '[414996.1.116589712]'
@@ -75,7 +12,7 @@
Properties:
[
Label: 'Start'
- Taborder: 1
+ Taborder: 2
]
}
Component dsEndDate
@@ -85,7 +22,7 @@
Properties:
[
Label: 'End'
- Taborder: 2
+ Taborder: 3
]
}
Component LabelSelectUnit
@@ -98,16 +35,34 @@
Taborder: 0
]
}
- Component bApply
+ Component ddlShiftPattern
{
- #keys: '[414996.1.116470621]'
- BaseType: 'WebButton'
+ #keys: '[414996.1.116430349]'
+ BaseType: 'WebDropDownList'
+ Databinding: 'ShiftPattern'
+ Children:
+ [
+ Component deContent710 id:deContent710_593
+ {
+ #keys: '[414996.1.116430350]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'ShiftPattern'
+ ]
+ }
+ ]
Properties:
[
- Label: 'Apply'
- Taborder: 10
+ DisplayField: 'Name'
+ Label: 'Shift pattern 1'
+ Taborder: 1
]
}
+ #child: PanelRight445
]
Properties:
[
--
Gitblit v1.9.3