From bf57ab9e4db58dbee018268dd8b593ee564bc7ee Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 09 十一月 2023 12:07:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index 9db29e6..75ba1bf 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -115,11 +115,11 @@
         <Property name="label">璁惧绫诲瀷KEY</Property>
       </PropertyDef>
       <PropertyDef name="cableRule">
-        <Property/>
+        <Property></Property>
         <Property name="label">甯冪嚎瑙勫垯</Property>
       </PropertyDef>
       <PropertyDef name="cableCir">
-        <Property/>
+        <Property></Property>
         <Property name="label">绛掍粨灞傝鍒�</Property>
       </PropertyDef>
     </DataType>
@@ -179,6 +179,17 @@
         <Property name="caption">鍒犻櫎</Property>
         <Property name="iconClass">fa fa-minus</Property>
         <Property name="width">90</Property>
+        <Property name="exClassName">toolbar-button-warn</Property>
+      </ToolBarButton>
+      <Separator/>
+      <ToolBarButton>
+        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
+view.get(&quot;#ajaxTestGrain&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
+	$alert(result);&#xD;
+});&#xD;
+</ClientEvent>
+        <Property name="caption">娴嬭瘯绮儏</Property>
+        <Property name="iconClass">fa fa-minus</Property>
         <Property name="exClassName">toolbar-button-warn</Property>
       </ToolBarButton>
     </ToolBar>
@@ -367,5 +378,9 @@
       <Property name="service">gatewayDeviceService#delData</Property>
       <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
     </AjaxAction>
+    <AjaxAction id="ajaxTestGrain">
+      <Property name="service">gatewayDeviceService2#ajaxTestGrain2</Property>
+      <Property name="confirmMessage">纭畾瑕佹墜鍔ㄦ墽琛岀伯鎯呬箞锛�</Property>
+    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3