From 40036d84a94b47b82b2d6316fb63df5e2847c6df Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 10 七月 2025 11:17:46 +0800
Subject: [PATCH] 首检
---
DevApp/Gs.DevApp/packages.config | 8
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs | 29 +++--
DevApp/Gs.DevApp/Gs.DevApp.csproj | 28 ++--
DevApp/Gs.DevApp/App.config | 159 ++++++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 49 +++++----
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs | 8 +
6 files changed, 151 insertions(+), 130 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 23164bc..bd779c3 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -1,78 +1,87 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
- <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
- <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
- </sectionGroup>
- <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
- </configSections>
- <applicationSettings>
- <DevExpress.LookAndFeel.Design.AppSettings>
- <setting name="DPIAwarenessMode" serializeAs="String">
- <value>System</value>
- </setting>
- <setting name="RegisterBonusSkins" serializeAs="String">
- <value>True</value>
- </setting>
- </DevExpress.LookAndFeel.Design.AppSettings>
- </applicationSettings>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
- </startup>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <probing privatePath="x86"/>
- </assemblyBinding>
- </runtime>
- <appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
- <add key="LogPath" value="logs" />
- <add key="ProductName" value="G-MES V2.0" />
- <add key="PageSize" value="50" />
- <add key="Version" value="0.1" />
- <add key="IsAutoUpdater" value="0" />
- <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
- </appSettings>
- <userSettings>
- <Gs.DevApp.Properties.Settings>
- <setting name="userName" serializeAs="String">
- <value />
- </setting>
- <setting name="userPwd" serializeAs="String">
- <value />
- </setting>
- <setting name="remember" serializeAs="String">
- <value>False</value>
- </setting>
- <setting name="fontSizeName" serializeAs="String">
- <value>瀹嬩綋,10</value>
- </setting>
- <setting name="isWeight" serializeAs="String">
- <value>False</value>
- </setting>
- </Gs.DevApp.Properties.Settings>
- </userSettings>
- <system.web>
- <membership defaultProvider="ClientAuthenticationMembershipProvider">
- <providers>
- <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
- </providers>
- </membership>
- <roleManager defaultProvider="ClientRoleProvider" enabled="true">
- <providers>
- <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
- </providers>
- </roleManager>
- </system.web>
- <system.data>
- <DbProviderFactories>
- <remove invariant="Oracle.ManagedDataAccess.Client" />
- <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
- </DbProviderFactories>
- </system.data>
+ <configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
+ <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
+ <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+ </sectionGroup>
+ <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
+ </configSections>
+ <applicationSettings>
+ <DevExpress.LookAndFeel.Design.AppSettings>
+ <setting name="DPIAwarenessMode" serializeAs="String">
+ <value>System</value>
+ </setting>
+ <setting name="RegisterBonusSkins" serializeAs="String">
+ <value>True</value>
+ </setting>
+ </DevExpress.LookAndFeel.Design.AppSettings>
+ </applicationSettings>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+ </startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <probing privatePath="x86" />
+ <dependentAssembly>
+ <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+ <appSettings>
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="LogPath" value="logs" />
+ <add key="ProductName" value="G-MES V2.0" />
+ <add key="PageSize" value="50" />
+ <add key="Version" value="0.1" />
+ <add key="IsAutoUpdater" value="0" />
+ <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
+ <add key="ClientSettingsProvider.ServiceUri" value="" />
+ </appSettings>
+ <userSettings>
+ <Gs.DevApp.Properties.Settings>
+ <setting name="userName" serializeAs="String">
+ <value />
+ </setting>
+ <setting name="userPwd" serializeAs="String">
+ <value />
+ </setting>
+ <setting name="remember" serializeAs="String">
+ <value>False</value>
+ </setting>
+ <setting name="fontSizeName" serializeAs="String">
+ <value>瀹嬩綋,10</value>
+ </setting>
+ <setting name="isWeight" serializeAs="String">
+ <value>False</value>
+ </setting>
+ </Gs.DevApp.Properties.Settings>
+ </userSettings>
+ <system.web>
+ <membership defaultProvider="ClientAuthenticationMembershipProvider">
+ <providers>
+ <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+ </providers>
+ </membership>
+ <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+ <providers>
+ <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+ </providers>
+ </roleManager>
+ </system.web>
+ <system.data>
+ <DbProviderFactories>
+ <remove invariant="Oracle.ManagedDataAccess.Client" />
+ <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
+ </DbProviderFactories>
+ </system.data>
</configuration>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index b89bf39..022514e 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -438,7 +438,7 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 1;
+ this.gv_releaseNo.VisibleIndex = 2;
this.gv_releaseNo.Width = 100;
//
// gv_lotNo
@@ -451,7 +451,7 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 2;
+ this.gv_lotNo.VisibleIndex = 3;
this.gv_lotNo.Width = 120;
//
// gridColumn23
@@ -461,7 +461,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 3;
+ this.gridColumn23.VisibleIndex = 4;
this.gridColumn23.Width = 94;
//
// gv_itemId
@@ -474,7 +474,7 @@
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 6;
+ this.gv_itemId.VisibleIndex = 7;
this.gv_itemId.Width = 30;
//
// gv_itemNo
@@ -487,7 +487,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 7;
+ this.gv_itemNo.VisibleIndex = 8;
this.gv_itemNo.Width = 136;
//
// gv_boardStyle
@@ -500,7 +500,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 8;
+ this.gv_boardStyle.VisibleIndex = 9;
this.gv_boardStyle.Width = 164;
//
// gridColumn14
@@ -511,7 +511,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.VisibleIndex = 10;
this.gridColumn14.Width = 200;
//
// gv_fcovertQty
@@ -525,7 +525,7 @@
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 10;
+ this.gv_fcovertQty.VisibleIndex = 11;
this.gv_fcovertQty.Width = 60;
//
// gv_fbatchQty
@@ -538,12 +538,16 @@
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 11;
+ this.gv_fbatchQty.VisibleIndex = 12;
this.gv_fbatchQty.Width = 80;
//
// gv_fcheckResu
//
+ this.gv_fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.CornflowerBlue;
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckResu.AppearanceCell.Options.UseForeColor = true;
+ this.gv_fcheckResu.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
+ this.gv_fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
this.gv_fcheckResu.MinWidth = 30;
@@ -551,7 +555,7 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 5;
+ this.gv_fcheckResu.VisibleIndex = 6;
this.gv_fcheckResu.Width = 50;
//
// gv_remarks
@@ -564,7 +568,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 12;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -577,7 +581,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 13;
+ this.gv_fcheckBy.VisibleIndex = 14;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -590,7 +594,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 14;
+ this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -603,7 +607,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 15;
+ this.gv_createBy.VisibleIndex = 16;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -613,7 +617,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 16;
+ this.gridColumn15.VisibleIndex = 17;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -626,7 +630,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 17;
+ this.gv_lastupdateBy.VisibleIndex = 18;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -639,7 +643,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 18;
+ this.gv_lastupdateDate.VisibleIndex = 19;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -649,7 +653,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 19;
+ this.gridColumn18.VisibleIndex = 20;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -659,7 +663,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 20;
+ this.gridColumn19.VisibleIndex = 21;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -677,7 +681,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 21;
+ this.gridColumn13.VisibleIndex = 22;
this.gridColumn13.Width = 94;
//
// gridColumn17
@@ -695,7 +699,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -705,7 +709,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 22;
+ this.gridColumn6.VisibleIndex = 1;
this.gridColumn6.Width = 94;
//
// rptButtonUrl
@@ -735,6 +739,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageVisible = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
index cd92cde..6dae013 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.DevFrm.User;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -32,13 +33,13 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
- Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
- {
- getModel(value, "0");
- }, (value) =>
- {
- getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ //{
+ // getModel(value, "0");
+ //}, (value) =>
+ //{
+ // getPageList(this.pageBar1.CurrentPage);
+ //}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
@@ -382,10 +383,14 @@
/// <param name="e"></param>
private void rptButtonUrl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- Frm_ShouJianDetect01H5 frm = new Frm_ShouJianDetect01H5("");
- frm.ShowDialog();
+ if (e.Button.Index == 0)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var userGuid = dr["guid"].ToString()+"&mth="+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+ Frm_ShouJianDetect01H5 frm = new Frm_ShouJianDetect01H5(userGuid);
+ frm.ShowDialog();
+ }
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
index 79c53e1..9d1ce60 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
@@ -15,10 +15,13 @@
{
public partial class Frm_ShouJianDetect01H5 : DevExpress.XtraEditors.XtraForm
{
- private static readonly string WebApiUrl = "http://192.168.1.145:86/AutoUpdater/h5/shoujian.html";
+ private string guid = "";
+ private string WebApiUrl = "http://192.168.1.145:86/AutoUpdater/h5/shoujian.html";
private ChromiumWebBrowser chromeBrowser;
- public Frm_ShouJianDetect01H5(string _urlPath)
+ public Frm_ShouJianDetect01H5(string _guid)
{
+ this.guid = _guid;
+ this.WebApiUrl = (WebApiUrl + "?guid=" + guid);
InitializeComponent();
this.Load += ShowFile_Load;
this.FormClosed += ShowFile_FormClosed;
@@ -37,6 +40,5 @@
txtUrl.Text = WebApiUrl;
txtUrl.ReadOnly = true;
}
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index e8477a0..73f424a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1,7 +1,7 @@
锘�<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" />
- <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" />
- <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" />
+ <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" />
+ <Import Project="..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" />
+ <Import Project="..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -63,14 +63,14 @@
<Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
<HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath>
</Reference>
- <Reference Include="CefSharp, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.dll</HintPath>
+ <Reference Include="CefSharp, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.Core, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.Core.dll</HintPath>
+ <Reference Include="CefSharp.Core, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.Core.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.WinForms, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>..\packages\CefSharp.WinForms.129.0.110\lib\net462\CefSharp.WinForms.dll</HintPath>
+ <Reference Include="CefSharp.WinForms, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.WinForms.109.1.110\lib\net462\CefSharp.WinForms.dll</HintPath>
</Reference>
<Reference Include="DevExpress.BonusSkins.v22.2" />
<Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -2324,12 +2324,12 @@
<ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" />
- <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props'))" />
- <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props'))" />
- <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props'))" />
- <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets'))" />
+ <Error Condition="!Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props'))" />
+ <Error Condition="!Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets'))" />
</Target>
- <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" />
+ <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
diff --git a/DevApp/Gs.DevApp/packages.config b/DevApp/Gs.DevApp/packages.config
index 461862c..ab9df28 100644
--- a/DevApp/Gs.DevApp/packages.config
+++ b/DevApp/Gs.DevApp/packages.config
@@ -1,10 +1,10 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autoupdater.NET.Official" version="1.9.2" targetFramework="net48" />
- <package id="CefSharp.Common" version="129.0.110" targetFramework="net48" />
- <package id="CefSharp.WinForms" version="129.0.110" targetFramework="net48" />
- <package id="chromiumembeddedframework.runtime.win-x64" version="129.0.11" targetFramework="net48" />
- <package id="chromiumembeddedframework.runtime.win-x86" version="129.0.11" targetFramework="net48" />
+ <package id="cef.redist.x64" version="109.1.11" targetFramework="net48" />
+ <package id="cef.redist.x86" version="109.1.11" targetFramework="net48" />
+ <package id="CefSharp.Common" version="109.1.110" targetFramework="net48" />
+ <package id="CefSharp.WinForms" version="109.1.110" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Web.WebView2" version="1.0.2592.51" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
--
Gitblit v1.9.3