From 0b288e121e532eacae485608cd8f2ae497977faa Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期一, 18 九月 2023 17:02:36 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yx

---
 _Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport#136.def |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def"
index 636f952..7519c89 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_PanelMaterialExportAndImport\043136.def"
@@ -13,7 +13,7 @@
       [
         Image: 'EXPORT1'
         Label: '鏁版嵁瀵煎嚭'
-        Taborder: 1
+        Taborder: 2
       ]
     }
     Component ButtonMaterialExportAndImport
@@ -24,7 +24,7 @@
       [
         Image: 'IMPORT1'
         Label: '鏁版嵁瀵煎叆'
-        Taborder: 2
+        Taborder: 3
       ]
     }
     Component ButtonSynchronizeInventoryTargets
@@ -36,7 +36,17 @@
         Image: 'CLOUD_REFRESH'
         Label: '鍚屾搴撳瓨鐩爣'
         Taborder: 0
-        Visible: false
+      ]
+    }
+    Component ButtonPullData
+    {
+      #keys: '[414702.0.199743004]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'TRACTOR'
+        Label: '鎷夊彇鏁版嵁'
+        Taborder: 1
       ]
     }
   ]

--
Gitblit v1.9.3