From f144ca99e6b013ab135e72a50ceb19a351a79031 Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期二, 26 九月 2023 23:27:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lmj
---
_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader#545.def | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def"
index 4ff0600..26dee9c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Component_PanelOrderLockHeader\043545.def"
@@ -87,7 +87,7 @@
ButtonSize: 'compact'
Description: '璁㈠崟閿佸畾'
Label: '閿佸畾'
- Taborder: 7
+ Taborder: 8
]
}
Component ButtonOrderLockHeaderUnlock
@@ -99,7 +99,7 @@
ButtonSize: 'compact'
Description: '璁㈠崟瑙ｉ攣'
Label: '瑙ｉ攣'
- Taborder: 8
+ Taborder: 9
]
}
Component ButtonOrderLockHeaderClear
@@ -114,6 +114,18 @@
Taborder: 6
]
}
+ Component ButtonOrderLockHeaderFresh
+ {
+ #keys: '[412960.0.259721852]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ ButtonSize: 'compact'
+ Description: '浠庢暟鎹簮鍒锋柊璁㈠崟鏁版嵁'
+ Label: '閲嶆柊鑾峰彇璁㈠崟'
+ Taborder: 7
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3