From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml |  313 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 313 insertions(+), 0 deletions(-)

diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
new file mode 100644
index 0000000..0992467
--- /dev/null
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+  <Arguments/>
+  <Context/>
+  <Model>
+    <DataType name="dtMain">
+      <Property name="creationType">com.ld.igds.models.DeviceModbus</Property>
+      <PropertyDef name="id">
+        <Property/>
+        <Property name="label">ID</Property>
+      </PropertyDef>
+      <PropertyDef name="deviceCode">
+        <Property/>
+        <Property name="label">璁惧缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="open">
+        <Property/>
+        <Property name="label">寮�鍦板潃</Property>
+      </PropertyDef>
+      <PropertyDef name="openFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="close">
+        <Property/>
+        <Property name="label">鍏冲湴鍧�</Property>
+      </PropertyDef>
+      <PropertyDef name="closeFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="stop">
+        <Property/>
+        <Property name="label">鍋滃湴鍧�</Property>
+      </PropertyDef>
+      <PropertyDef name="stopFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="openEnd">
+        <Property/>
+        <Property name="label">鍋滃湴鍧�</Property>
+      </PropertyDef>
+      <PropertyDef name="openEndFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="closeEnd">
+        <Property/>
+        <Property name="label">鍏冲埌浣嶅湴鍧�</Property>
+      </PropertyDef>
+      <PropertyDef name="closeEndFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="openError">
+        <Property/>
+        <Property name="label">寮�鏁呴殰鍦板潃</Property>
+      </PropertyDef>
+      <PropertyDef name="openErrorFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="closeError">
+        <Property/>
+        <Property name="label">鍏虫晠闅滃湴鍧�</Property>
+      </PropertyDef>
+      <PropertyDef name="closeErrorFun">
+        <Property/>
+        <Property name="label">鍔熻兘鍙�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceModbusPR#triggerFun&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="bizType">
+        <Property/>
+        <Property name="label">涓氬姟绫诲瀷</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerBizType").getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="serId">
+        <Property/>
+        <Property name="label">鎵�灞炲垎鏈�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+    </DataType>
+  </Model>
+  <View layout="padding:5;regionPadding:5">
+    <Property name="packages">font-awesome,css-common</Property>
+    <DataSet id="dsMain">
+      <Property name="loadMode">lazy</Property>
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="dataProvider">deviceModbusPR#listAll</Property>
+    </DataSet>
+    <Container layout="regionPadding:10" layoutConstraint="top">
+      <Property name="exClassName">bg-color</Property>
+      <Property name="contentOverflow">hidden</Property>
+      <Property name="height">55</Property>
+      <Label layoutConstraint="left">
+        <Property name="text">鑿滃崟鏍忥細</Property>
+      </Label>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert({});</ClientEvent>
+        <Property name="caption">鏂板</Property>
+        <Property name="exClassName">btn-default</Property>
+        <Property name="iconClass">fa fa-plus</Property>
+      </Button>
+      <Button>
+        <ClientEvent name="onClick"> view.get(&quot;#uaAction&quot;).execute();   </ClientEvent>
+        <Property name="caption">淇濆瓨</Property>
+        <Property name="iconClass">fa fa-check</Property>
+        <Property name="exClassName">btn-normal</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!data){&#xD;
+	return;&#xD;
+}&#xD;
+view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+		return;&#xD;
+	}else{&#xD;
+		data.remove();&#xD;
+	}&#xD;
+});           </ClientEvent>
+        <Property name="caption">鍒犻櫎</Property>
+        <Property name="exClassName">btn-warn</Property>
+        <Property name="iconClass">fa fa-minus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync(); </ClientEvent>
+        <Property name="caption">鍒锋柊</Property>
+        <Property name="exClassName">btn-default</Property>
+        <Property name="iconClass">fa fa-refresh</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <Property name="caption">鍒锋柊缂撳瓨</Property>
+        <Property name="exClassName">btn-default</Property>
+        <Property name="iconClass">fa fa-refresh</Property>
+        <Property name="action">ajaxFlushCache</Property>
+      </Button>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="center">
+      <Property name="exClassName">bg-color</Property>
+      <DataGrid layoutConstraint="center padding:5px">
+        <Property name="dataSet">dsMain</Property>
+        <RowNumColumn/>
+        <DataColumn name="deviceCode">
+          <Property name="property">deviceCode</Property>
+        </DataColumn>
+        <DataColumn name="serId">
+          <Property name="property">serId</Property>
+        </DataColumn>
+        <DataColumn name="bizType">
+          <Property name="property">bizType</Property>
+        </DataColumn>
+        <ColumnGroup>
+          <Property name="caption">寮�鎿嶄綔</Property>
+          <DataColumn name="open">
+            <Property name="property">open</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="openFun">
+            <Property name="property">openFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+        <ColumnGroup>
+          <Property name="caption">鍏虫搷浣�</Property>
+          <DataColumn name="close">
+            <Property name="property">close</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="closeFun">
+            <Property name="property">closeFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+        <ColumnGroup>
+          <Property name="caption">鍋滄搷浣�</Property>
+          <DataColumn name="stop">
+            <Property name="property">stop</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="stopFun">
+            <Property name="property">stopFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+        <ColumnGroup>
+          <Property name="caption">寮�鍒颁綅</Property>
+          <DataColumn name="openEnd">
+            <Property name="property">openEnd</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="openEndFun">
+            <Property name="property">openEndFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+        <ColumnGroup>
+          <Property name="caption">鍏冲埌浣�</Property>
+          <DataColumn name="closeEnd">
+            <Property name="property">closeEnd</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="closeEndFun">
+            <Property name="property">closeEndFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+        <ColumnGroup>
+          <Property name="caption">寮�鏁呴殰</Property>
+          <DataColumn name="openError">
+            <Property name="property">openError</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="openErrorFun">
+            <Property name="property">openErrorFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+        <ColumnGroup>
+          <Property name="caption">鍏虫晠闅�</Property>
+          <DataColumn name="closeError">
+            <Property name="property">closeError</Property>
+            <Property name="caption">鍦板潃</Property>
+            <Property name="width">80</Property>
+          </DataColumn>
+          <DataColumn name="closeErrorFun">
+            <Property name="property">closeErrorFun</Property>
+            <Property name="caption">鍔熻兘</Property>
+            <Property name="width">100</Property>
+            <Property name="trigger">autoMappingDropDown1</Property>
+          </DataColumn>
+        </ColumnGroup>
+      </DataGrid>
+    </Container>
+    <UpdateAction id="uaAction">
+      <Property name="dataResolver">deviceModbusPR#updateData</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">!DIRTY_TREE</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxDel">
+      <Property name="service">deviceModbusPR#delData</Property>
+      <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
+    </AjaxAction>
+    <AjaxAction id="ajaxFlushCache">
+      <Property name="service">deviceModbusPR#flushCache</Property>
+      <Property name="successMessage">缂撳瓨鏇存柊鎴愬姛</Property>
+    </AjaxAction>
+  </View>
+</ViewConfig>

--
Gitblit v1.9.3