Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

 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">
@@ -153,7 +166,6 @@
      <ClientEvent name="onHide">view.id(&quot;dsDevice&quot;).getData().cancel();</ClientEvent>
      <Property name="caption">编辑页面</Property>
      <Property name="width">800</Property>
      <Property name="height">450</Property>
      <Buttons>
        <Button>
          <Property name="caption">确定</Property>
@@ -315,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>