From d48d966dfde7a0c31bd81466559e5e8d681dc200 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 21 十月 2023 16:16:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/view/Device.view.xml |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/view/Device.view.xml b/igds-core/src/main/java/com/ld/igds/view/Device.view.xml
index 4e847df..5b7bcfb 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Device.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Device.view.xml
@@ -34,7 +34,11 @@
     </DataType>
   </Model>
   <View layout="padding:5;regionPadding:5">
-    <ClientEvent name="onReady">view.get(&quot;#dataSetC&quot;).insert();</ClientEvent>
+    <ClientEvent name="onReady">view.get(&quot;#dataSetC&quot;).insert();&#xD;
+&#xD;
+openModbusDevice = function(){&#xD;
+	view.get(&quot;#dialogModbus&quot;).show();&#xD;
+}</ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsDevice">
       <Property name="dataProvider">devicePR#loadDeviceByContion</Property>
@@ -130,7 +134,7 @@
       </DataColumn>
       <DataColumn name="link">
         <Property name="property">link</Property>
-        <Property name="caption">鍏宠仈璁惧</Property>
+        <Property name="caption">椋庢満缂栫爜</Property>
         <Property name="align">center</Property>
       </DataColumn>
       <DataColumn name="serId">
@@ -140,6 +144,15 @@
       <DataColumn name="remark">
         <Property name="property">remark</Property>
         <Property name="align">center</Property>
+      </DataColumn>
+      <DataColumn>
+        <ClientEvent name="onRenderCell">arg.dom.innerHTML =&quot;&lt;a href='javascripe:;' onclick='openModbusDevice()'>Modbus閰嶇疆&lt;/a>&quot;;&#xD;
+arg.progressDefault = false;</ClientEvent>
+        <Property name="name">id</Property>
+        <Property name="property">id</Property>
+        <Property name="width">100</Property>
+        <Property name="caption">鎿嶄綔</Property>
+        <Editor/>
       </DataColumn>
     </DataGrid>
     <ToolBar layoutConstraint="bottom">
@@ -226,24 +239,6 @@
             <Property name="property">power</Property>
             <Editor/>
           </AutoFormElement>
-          <AutoFormElement layoutConstraint="colSpan:2">
-            <Property name="name">modbus</Property>
-            <Property name="property">modbus</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement layoutConstraint="colSpan:2">
-            <Property name="name">linkModbus</Property>
-            <Property name="property">linkModbus</Property>
-            <Property name="label">椋庢満Modbus</Property>
-            <Editor/>
-          </AutoFormElement>
-          <Label layoutConstraint="colSpan:2">
-            <Property name="text">modbus瑙勫垯锛氬紑鍦板潃-鍏冲湴鍧�-鍋滃湴鍧�-寮�鍒颁綅-鍏冲埌浣�-寮�鏁呴殰-鍏虫晠闅滐紝鏃犲湴鍧�鐢∟浠ｆ浛</Property>
-            <Property name="style">
-              <Property name="padding-left">100px</Property>
-              <Property name="color">blue</Property>
-            </Property>
-          </Label>
           <AutoFormElement layoutConstraint="colSpan:2">
             <Property name="name">remark</Property>
             <Property name="property">remark</Property>
@@ -332,5 +327,17 @@
       <Property name="successMessage">鍒锋柊鎴愬姛锛�</Property>
       <Property name="confirmMessage">纭畾瑕佸埛鏂扮紦瀛樹箞锛�</Property>
     </AjaxAction>
+    <Dialog id="dialogModbus">
+      <Property name="width">100%</Property>
+      <Property name="height">95%</Property>
+      <Property name="caption">璁惧MOBUS-TCP鐩稿叧閰嶇疆</Property>
+      <Buttons/>
+      <Children>
+        <IFrame id="iframeModbusDevice">
+          <Property name="path">com.ld.igds.modbus.DeviceModbus.d</Property>
+        </IFrame>
+      </Children>
+      <Tools/>
+    </Dialog>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3