Merge remote-tracking branch 'origin/master'

vince

2023-09-04 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a

 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml

ÎļþÃû´Ó igds-core/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml ÐÞ¸Ä
@@ -104,6 +104,24 @@
          <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">
@@ -170,12 +188,18 @@
        <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">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="openFun">
            <Property name="property">openFun</Property>
@@ -189,7 +213,7 @@
          <DataColumn name="close">
            <Property name="property">close</Property>
            <Property name="caption">地址</Property>
            <Property name="width">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="closeFun">
            <Property name="property">closeFun</Property>
@@ -203,7 +227,7 @@
          <DataColumn name="stop">
            <Property name="property">stop</Property>
            <Property name="caption">地址</Property>
            <Property name="width">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="stopFun">
            <Property name="property">stopFun</Property>
@@ -217,7 +241,7 @@
          <DataColumn name="openEnd">
            <Property name="property">openEnd</Property>
            <Property name="caption">地址</Property>
            <Property name="width">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="openEndFun">
            <Property name="property">openEndFun</Property>
@@ -231,7 +255,7 @@
          <DataColumn name="closeEnd">
            <Property name="property">closeEnd</Property>
            <Property name="caption">地址</Property>
            <Property name="width">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="closeEndFun">
            <Property name="property">closeEndFun</Property>
@@ -245,7 +269,7 @@
          <DataColumn name="openError">
            <Property name="property">openError</Property>
            <Property name="caption">地址</Property>
            <Property name="width">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="openErrorFun">
            <Property name="property">openErrorFun</Property>
@@ -259,7 +283,7 @@
          <DataColumn name="closeError">
            <Property name="property">closeError</Property>
            <Property name="caption">地址</Property>
            <Property name="width">100</Property>
            <Property name="width">80</Property>
          </DataColumn>
          <DataColumn name="closeErrorFun">
            <Property name="property">closeErrorFun</Property>