提交最新源码

master
baogq 2 years ago
parent f473200669
commit 6d879836fa

@ -284,6 +284,7 @@
<DependentUpon>SetCratParamForm.cs</DependentUpon> <DependentUpon>SetCratParamForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Test\Form1Action.cs" /> <Compile Include="Test\Form1Action.cs" />
<Compile Include="Test\TestFrm.cs" />
<Compile Include="Test\TestMDown.cs" /> <Compile Include="Test\TestMDown.cs" />
<Compile Include="UserManage\DeleteUserAction.cs" /> <Compile Include="UserManage\DeleteUserAction.cs" />
<Compile Include="Entity\ActionType.cs" /> <Compile Include="Entity\ActionType.cs" />

@ -0,0 +1,17 @@
using Mesnac.Action.Base;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mesnac.Action.ChemicalWeighing.Test
{
class TestFrm : DatabaseAction, IAction
{
public void Run(RuntimeParameter runtime)
{
base.RunIni(runtime); //必须调用
}
}
}

@ -0,0 +1,25 @@
<?xml version="1.0"?>
<ActionService>
<Design>
<Path path="测试首页">
<Action action="258C2B2055084B56AE847B0D8E181188">
<Caption>测试首页</Caption>
<Remark>测试首页</Remark>
</Action>
</Path>
</Design>
<DesignToRuntime>
<Design action="258C2B2055084B56AE847B0D8E181188">
<Runtime action="9B1049BDD8204D95A621EC00638B35AF"/>
</Design>
</DesignToRuntime>
<Runtime>
<Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
<Action action="9B1049BDD8204D95A621EC00638B35AF" class="Mesnac.Action.ChemicalWeighing.Test.TestFrm"/>
</Import>
</Runtime>
</ActionService>

@ -17,6 +17,7 @@
<Node Name="PLC测试" Text="PLC测试" ToolTipText="PLC测试" Tag="PLC测试" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="PLC测试" Text="PLC测试" ToolTipText="PLC测试" Tag="PLC测试" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="BaseUser" Text="用户信息" ToolTipText="BaseUser" Tag="BaseUser" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="BaseUser" Text="用户信息" ToolTipText="BaseUser" Tag="BaseUser" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="监控主界面" Text="监控主界面" ToolTipText="监控主界面" Tag="监控主界面" ImageIndex="3" SelectedImageIndex="3" /> <Node Name="监控主界面" Text="监控主界面" ToolTipText="监控主界面" Tag="监控主界面" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="Form1tt" Text="test1111" ToolTipText="Form1tt" Tag="Form1tt" ImageIndex="3" SelectedImageIndex="3" />
</Node> </Node>
<Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2"> <Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2">
<Node Name="CWSS_PLC" Text="CWSS_PLC" ToolTipText="" Tag="CWSS_PLC" ImageIndex="5" SelectedImageIndex="5" /> <Node Name="CWSS_PLC" Text="CWSS_PLC" ToolTipText="" Tag="CWSS_PLC" ImageIndex="5" SelectedImageIndex="5" />

@ -1,5 +1,21 @@
<Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="监控画面1" children="Controls"> <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Form1tt" children="Controls">
<Object type="Mesnac.Controls.Feeding.StraightTubeH, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="StraightTubeH1" children="Controls">
<Property name="StatusName" />
<Property name="Type">ptLeftToRight</Property>
<Property name="Status">ptTurnOff</Property>
<Property name="Master" />
<Property name="Location">189, 172</Property>
<Property name="Name">StraightTubeH1</Property>
<Property name="Size">45, 5</Property>
</Object>
<Object type="Mesnac.Controls.Feeding.PressureSwitch, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PressureSwitch1" children="Controls">
<Property name="StatusName" />
<Property name="Status">ylNormal</Property>
<Property name="Location">103, 172</Property>
<Property name="Name">PressureSwitch1</Property>
<Property name="Size">13, 13</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCTextBox1" children="Controls"> <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCTextBox1" children="Controls">
<Property name="KeyDownActionList"> <Property name="KeyDownActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@ -18,13 +34,13 @@
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="TextName" /> <Property name="TextName" />
<Property name="Location">463, 151</Property> <Property name="Location">211, 105</Property>
<Property name="Name">MCTextBox1</Property> <Property name="Name">MCTextBox1</Property>
<Property name="Size">100, 21</Property> <Property name="Size">100, 21</Property>
<Property name="TabIndex">0</Property> <Property name="TabIndex">0</Property>
</Object> </Object>
<Property name="LoadActionList"> <Property name="LoadActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDJCQUJGRkQzM0VGNzRGQzdCMTUxMTU1MjJGOUFBQzhCBgYAAAAN55uR5o6n55S76Z2iMQYHAAAADeebkeaOp+eUu+mdojEL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
</Property> </Property>
<Property name="ActivatedActionList"> <Property name="ActivatedActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@ -39,13 +55,13 @@
<Property name="MCPurview">False</Property> <Property name="MCPurview">False</Property>
<Property name="AllowOriginalSizeShow">False</Property> <Property name="AllowOriginalSizeShow">False</Property>
<Property name="BackColor">Control</Property> <Property name="BackColor">Control</Property>
<Property name="Size">1933, 1062</Property> <Property name="Size">600, 401</Property>
<Property name="StartPosition">WindowsDefaultLocation</Property> <Property name="StartPosition">WindowsDefaultLocation</Property>
<Property name="Text">监控画面1</Property> <Property name="Text">test1111</Property>
<Property name="WindowState">Normal</Property> <Property name="WindowState">Normal</Property>
<Property name="BackgroundImage" /> <Property name="BackgroundImage" />
<Property name="BackgroundImageLayout">Tile</Property> <Property name="BackgroundImageLayout">Tile</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="ForeColor">ControlText</Property> <Property name="ForeColor">ControlText</Property>
<Property name="Name">监控画面1</Property> <Property name="Name">Form1tt</Property>
</Object> </Object>

@ -2802,14 +2802,14 @@
<Property name="RefreshDataActionList"> <Property name="RefreshDataActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
</Property> </Property>
<Property name="BHaveAction">False</Property> <Property name="BHaveAction">True</Property>
<Property name="MCPurview">False</Property> <Property name="MCPurview">False</Property>
<Property name="AllowOriginalSizeShow">False</Property> <Property name="AllowOriginalSizeShow">False</Property>
<Property name="BackColor">Control</Property> <Property name="BackColor">Control</Property>
<Property name="Size">1938, 1061</Property> <Property name="Size">1938, 1061</Property>
<Property name="StartPosition">CenterScreen</Property> <Property name="StartPosition">CenterScreen</Property>
<Property name="Text">参数监控画面</Property> <Property name="Text">参数监控画面</Property>
<Property name="WindowState">Maximized</Property> <Property name="WindowState">Normal</Property>
<Property name="BackgroundImage" /> <Property name="BackgroundImage" />
<Property name="BackgroundImageLayout">Tile</Property> <Property name="BackgroundImageLayout">Tile</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>

@ -183,6 +183,10 @@
<Content Include="Data\EventConfig\小料称量\LanguageDefault.xml"> <Content Include="Data\EventConfig\小料称量\LanguageDefault.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Data\EventConfig\小料称量\测试首页画面.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Data\EventConfig\小料称量\报表管理.条码扫描报表.xml"> <Content Include="Data\EventConfig\小料称量\报表管理.条码扫描报表.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -379,6 +383,9 @@
<Content Include="Data\MCProject\nodeForm\FrmScadaExtentScreen.xml"> <Content Include="Data\MCProject\nodeForm\FrmScadaExtentScreen.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Data\MCProject\nodeForm\监控主界面.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Data\template\小料称量\小料称量SCADA\nodeDataSource.xml"> <Content Include="Data\template\小料称量\小料称量SCADA\nodeDataSource.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

@ -1,15 +1,24 @@
<Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="主监控画面" children="Controls"> <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="TestFrm" children="Controls">
<Object type="Mesnac.Controls.Default.MCPanelBlack, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCPanelBlack1" children="Controls"> <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
<Object type="Mesnac.Controls.Default.TopPanel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="TopPanel1" children="Controls"> <Object type="Mesnac.Controls.Feeding.StraightTubeH, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="StraightTubeH1" children="Controls">
<Property name="Dock">Top</Property> <Property name="StatusName" />
<Property name="Location">0, 0</Property> <Property name="Type">ptLeftToRight</Property>
<Property name="Name">TopPanel1</Property> <Property name="Status">ptTurnOn</Property>
<Property name="Size">1292, 78</Property> <Property name="Master" />
<Property name="Location">627, 111</Property>
<Property name="Name">StraightTubeH1</Property>
<Property name="Size">250, 5</Property>
</Object> </Object>
<Object type="Mesnac.Controls.ChemicalWeighing.SmallCar, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SmallCar1" children="Controls">
<Property name="Location">333, 201</Property>
<Property name="Name">SmallCar1</Property>
<Property name="Size">218, 200</Property>
</Object>
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property> <Property name="Location">0, 0</Property>
<Property name="Name">MCPanelBlack1</Property> <Property name="Name">Panel1</Property>
<Property name="Size">1292, 809</Property> <Property name="Size">1141, 634</Property>
</Object> </Object>
<Property name="LoadActionList"> <Property name="LoadActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@ -27,13 +36,13 @@
<Property name="MCPurview">False</Property> <Property name="MCPurview">False</Property>
<Property name="AllowOriginalSizeShow">False</Property> <Property name="AllowOriginalSizeShow">False</Property>
<Property name="BackColor">Control</Property> <Property name="BackColor">Control</Property>
<Property name="Size">1308, 848</Property> <Property name="Size">1157, 673</Property>
<Property name="StartPosition">WindowsDefaultLocation</Property> <Property name="StartPosition">WindowsDefaultLocation</Property>
<Property name="Text">主监控画面</Property> <Property name="Text">测试首页</Property>
<Property name="WindowState">Normal</Property> <Property name="WindowState">Normal</Property>
<Property name="BackgroundImage" /> <Property name="BackgroundImage" />
<Property name="BackgroundImageLayout">Tile</Property> <Property name="BackgroundImageLayout">Tile</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="ForeColor">ControlText</Property> <Property name="ForeColor">ControlText</Property>
<Property name="Name">主监控画面</Property> <Property name="Name">TestFrm</Property>
</Object> </Object>

@ -1,36 +1,27 @@
<Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Form1" children="Controls"> <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="测试首页" children="Controls">
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton1" children="Controls"> <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
<Property name="ClickActionList"> <Object type="Mesnac.Controls.Feeding.StraightTubeH, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="StraightTubeH1" children="Controls">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Property name="StatusName" />
</Property> <Property name="Type">ptLeftToRight</Property>
<Property name="MCKey" /> <Property name="Status">ptTurnOn</Property>
<Property name="MCDataSourceID" /> <Property name="Master" />
<Property name="IsDbControl">False</Property> <Property name="Location">483, 255</Property>
<Property name="InitDataSource" /> <Property name="Name">StraightTubeH1</Property>
<Property name="ActionDataSource" /> <Property name="Size">368, 5</Property>
<Property name="BindDataSource" /> </Object>
<Property name="DbOptionType">None</Property> <Object type="Mesnac.Controls.ChemicalWeighing.SmallCar, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SmallCar1" children="Controls">
<Property name="MCVisible">True</Property> <Property name="Location">191, 233</Property>
<Property name="MCEnabled">True</Property> <Property name="Name">SmallCar1</Property>
<Property name="MCPurview">False</Property> <Property name="Size">218, 200</Property>
<Property name="Format" /> </Object>
<Property name="TextName" /> <Property name="Dock">Fill</Property>
<Property name="NewFillColor">Red</Property> <Property name="Location">0, 0</Property>
<Property name="OldFillColor">DarkGray</Property> <Property name="Name">Panel1</Property>
<Property name="Text">MCButton1</Property> <Property name="Size">1399, 830</Property>
<Property name="Location">654, 189</Property>
<Property name="Name">MCButton1</Property>
<Property name="Size">75, 23</Property>
<Property name="TabIndex">1</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.SmallCar, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SmallCar1" children="Controls">
<Property name="Location">157, 203</Property>
<Property name="Name">SmallCar1</Property>
<Property name="Size">218, 200</Property>
</Object> </Object>
<Property name="LoadActionList"> <Property name="LoadActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEUzMkE2MzIyRDFEMDRGNUY4MTREOTQ4NzFGRTQ4RjU5BgYAAAAFZm9ybTEGBwAAAAVmb3JtMQs=</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
</Property> </Property>
<Property name="ActivatedActionList"> <Property name="ActivatedActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@ -45,13 +36,13 @@
<Property name="MCPurview">False</Property> <Property name="MCPurview">False</Property>
<Property name="AllowOriginalSizeShow">False</Property> <Property name="AllowOriginalSizeShow">False</Property>
<Property name="BackColor">Control</Property> <Property name="BackColor">Control</Property>
<Property name="Size">1258, 734</Property> <Property name="Size">1415, 869</Property>
<Property name="StartPosition">WindowsDefaultLocation</Property> <Property name="StartPosition">WindowsDefaultLocation</Property>
<Property name="Text">Form1</Property> <Property name="Text">测试首页</Property>
<Property name="WindowState">Normal</Property> <Property name="WindowState">Normal</Property>
<Property name="BackgroundImage" /> <Property name="BackgroundImage" />
<Property name="BackgroundImageLayout">Tile</Property> <Property name="BackgroundImageLayout">Tile</Property>
<Property name="Font">宋体, 9pt</Property> <Property name="Font">宋体, 9pt</Property>
<Property name="ForeColor">ControlText</Property> <Property name="ForeColor">ControlText</Property>
<Property name="Name">Form1</Property> <Property name="Name">测试首页</Property>
</Object> </Object>

File diff suppressed because one or more lines are too long

@ -247,6 +247,10 @@
<Project>{f022c0e6-2819-4fb1-bb86-0f389f061a44}</Project> <Project>{f022c0e6-2819-4fb1-bb86-0f389f061a44}</Project>
<Name>Mesnac.Controls.Default</Name> <Name>Mesnac.Controls.Default</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Controls\Mesnac.Controls.Feeding\Mesnac.Controls.Feeding.csproj">
<Project>{d0c0324f-434e-47eb-8f7c-ba6cd7f233b4}</Project>
<Name>Mesnac.Controls.Feeding</Name>
</ProjectReference>
<ProjectReference Include="..\Mensac.Gui.Run.Global\Mesnac.Gui.Run.Global.csproj"> <ProjectReference Include="..\Mensac.Gui.Run.Global\Mesnac.Gui.Run.Global.csproj">
<Project>{CC98CB3B-F532-4510-AC08-7DDBD520CB06}</Project> <Project>{CC98CB3B-F532-4510-AC08-7DDBD520CB06}</Project>
<Name>Mesnac.Gui.Run.Global</Name> <Name>Mesnac.Gui.Run.Global</Name>

Loading…
Cancel
Save