From ff38e3818081fdb34a689b60b7086cbd85c30ee8 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期四, 21 九月 2023 11:52:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

---
 _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyOperation.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
index 34a03b8..ffc4427 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyOperation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelPriorityPolicyOperation
+Component PanelPriorityPolicyOperation713
 {
-  #keys: '[414382.0.490130786]'
+  #keys: '[414382.0.494931742]'
   BaseType: 'WebPanel'
   Children:
   [
     Component ButtonAddPriorityPolicy
     {
-      #keys: '[414382.0.490130807]'
+      #keys: '[414382.0.494931743]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -17,7 +17,7 @@
     }
     Component Buttonplus
     {
-      #keys: '[414382.0.490130825]'
+      #keys: '[414382.0.494931744]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -27,16 +27,17 @@
     }
     Component ButtonSubtract
     {
-      #keys: '[414382.0.490130836]'
+      #keys: '[414382.0.494931745]'
       BaseType: 'WebButton'
       Properties:
       [
+        Label: '*'
         Taborder: 3
       ]
     }
     Component StringListPriorityPolicyOperation
     {
-      #keys: '[414382.0.492194048]'
+      #keys: '[414382.0.494931746]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -46,50 +47,54 @@
     }
     Component ButtonMultiply
     {
-      #keys: '[414382.0.490151249]'
+      #keys: '[414382.0.494931747]'
       BaseType: 'WebButton'
       Properties:
       [
+        Label: 'x'
         Taborder: 4
       ]
     }
     Component ButtonDivide
     {
-      #keys: '[414382.0.490151283]'
+      #keys: '[414382.0.494931748]'
       BaseType: 'WebButton'
       Properties:
       [
+        Label: '/'
         Taborder: 5
       ]
     }
     Component ButtonLeftParenthesis
     {
-      #keys: '[414382.0.490151322]'
+      #keys: '[414382.0.494931749]'
       BaseType: 'WebButton'
       Properties:
       [
+        Label: '('
         Taborder: 6
       ]
     }
     Component ButtonRightParenthesis
     {
-      #keys: '[414382.0.490151325]'
+      #keys: '[414382.0.494931750]'
       BaseType: 'WebButton'
       Properties:
       [
+        Label: ')'
         Taborder: 7
       ]
     }
     Component ButtonRollBack
     {
-      #keys: '[414382.0.490151327]'
+      #keys: '[414382.0.494931751]'
       BaseType: 'WebButton'
       Properties:
       [
+        Label: '<-'
         Taborder: 8
       ]
     }
-    #child: PanelPriorityPolicyCoefficient
   ]
   Properties:
   [
@@ -97,6 +102,6 @@
     MinimumColumns: 10
     MinimumRows: 1
     Orientation: 'horizontal'
-    Taborder: 4
+    Taborder: 3
   ]
 }

--
Gitblit v1.9.3