From 9ce3ff4c9d168929689f4efeb7f00fd6b27d2e99 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 30 十一月 2024 11:22:41 +0800 Subject: [PATCH] 工单 --- DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs | 5 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 3 DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs | 87 +++++++++ DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx | 55 ++++- DevApp/Gs.DevApp/UserControl/ShowUp.cs | 44 ++++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 + DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs | 63 +++++++ DevApp/Gs.DevApp/App.config | 4 DevApp/Gs.DevApp/UserControl/ShowUp.resx | 120 +++++++++++++ DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs | 114 ++++++++---- 10 files changed, 440 insertions(+), 64 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index ae2dc82..be56205 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -28,8 +28,8 @@ </assemblyBinding> </runtime> <appSettings> - <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> - <add key="WebApiUrl" value="http://192.168.1.145:81/" /> + <add key="WebApiUrl" value="http://localhost:5263/" /> + <!--<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" /> diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs index 07a95ae..1eb2928 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs @@ -28,22 +28,22 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SysHelp)); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -52,7 +52,9 @@ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -128,8 +130,10 @@ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_guid, this.gv_1, - this.gv_3, this.gv_2, + this.gridColumn5, + this.gv_3, + this.gridColumn4, this.gridColumn3, this.gridColumn1, this.gridColumn2}); @@ -149,6 +153,7 @@ this.gv_guid.FieldName = "upName"; this.gv_guid.MinWidth = 25; this.gv_guid.Name = "gv_guid"; + this.gv_guid.OptionsColumn.AllowEdit = false; this.gv_guid.Visible = true; this.gv_guid.VisibleIndex = 0; this.gv_guid.Width = 94; @@ -176,84 +181,111 @@ this.gv_2.Name = "gv_2"; this.gv_2.OptionsColumn.AllowEdit = false; this.gv_2.Visible = true; - this.gv_2.VisibleIndex = 2; + this.gv_2.VisibleIndex = 1; this.gv_2.Width = 80; + // + // gridColumn5 + // + this.gridColumn5.Caption = "鏂囨。鍚嶇О"; + this.gridColumn5.FieldName = "fileTitle"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.AllowEdit = false; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 2; + this.gridColumn5.Width = 94; // // gv_3 // this.gv_3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_3.AppearanceCell.Options.UseFont = true; - this.gv_3.Caption = "甯姪鏂囨。"; - this.gv_3.FieldName = "caa020"; + this.gv_3.Caption = "鏂囨。璺緞"; + this.gv_3.FieldName = "urlPath"; this.gv_3.MinWidth = 200; this.gv_3.Name = "gv_3"; this.gv_3.OptionsColumn.AllowEdit = false; this.gv_3.Tag = "query_a.CAA020"; this.gv_3.Visible = true; - this.gv_3.VisibleIndex = 1; + this.gv_3.VisibleIndex = 3; this.gv_3.Width = 200; + // + // gridColumn4 + // + this.gridColumn4.Caption = "鏂囨。绫诲瀷"; + this.gridColumn4.FieldName = "fileType"; + this.gridColumn4.MaxWidth = 100; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.OptionsColumn.AllowEdit = false; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 4; + this.gridColumn4.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "鍦ㄧ嚎闃呰"; this.gridColumn3.ColumnEdit = this.repositoryItemButtonEdit1; - this.gridColumn3.MaxWidth = 80; - this.gridColumn3.MinWidth = 80; + this.gridColumn3.MaxWidth = 100; + this.gridColumn3.MinWidth = 90; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 3; - this.gridColumn3.Width = 80; + this.gridColumn3.VisibleIndex = 5; + this.gridColumn3.Width = 90; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.show_16x161; - editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image"))); + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "棰勮", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "棰勮", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // gridColumn1 // this.gridColumn1.Caption = "涓嬭浇"; this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit2; - this.gridColumn1.MaxWidth = 80; - this.gridColumn1.MinWidth = 80; + this.gridColumn1.MaxWidth = 100; + this.gridColumn1.MinWidth = 90; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 4; - this.gridColumn1.Width = 80; + this.gridColumn1.VisibleIndex = 6; + this.gridColumn1.Width = 90; // // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.down_16x16; - editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); // // gridColumn2 // this.gridColumn2.Caption = "涓婁紶"; this.gridColumn2.ColumnEdit = this.repositoryItemButtonEdit3; - this.gridColumn2.MaxWidth = 80; - this.gridColumn2.MinWidth = 80; + this.gridColumn2.MaxWidth = 100; + this.gridColumn2.MinWidth = 90; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 5; - this.gridColumn2.Width = 80; + this.gridColumn2.VisibleIndex = 7; + this.gridColumn2.Width = 90; // // repositoryItemButtonEdit3 // this.repositoryItemButtonEdit3.AutoHeight = false; - editorButtonImageOptions9.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions9.Image"))); + editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image"))); + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓婁紶", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓婁紶", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3"; this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick); // // treeListColumn7 // @@ -301,5 +333,7 @@ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs index 45c2b87..b794843 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs @@ -1,10 +1,13 @@ 锘縰sing Gs.DevApp.Entity; using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Configuration; using System.Data; using System.Drawing; +using System.Net; using System.Windows.Forms; namespace Gs.DevApp.DevFrm.Sys @@ -34,7 +37,7 @@ e.Graphics.DrawString(str, f, Brushes.Gray, r); }; } - + /// <summary> /// 鏌ヨ浜嬩欢 /// </summary> @@ -65,9 +68,9 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { - getPageList(1, UtilityHelper.GetPageSize()); + getPageList(1, UtilityHelper.GetPageSize()); } - + /// <summary> /// /// </summary> @@ -76,12 +79,11 @@ private void getPageList(int curPage, int pageSize) { System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); - _sbSqlWhere.Append(" and a.CATEGORY=1 and a.UP_GUID is not null"); PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "a.idx", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try { - string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); + string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageHelp", json); ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn); if (dd.rtnCode > 0) { @@ -103,5 +105,80 @@ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + + private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gridView1.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gridView1.GetDataRow(rowhandle); + var mxGuid = dr["guid"].ToString(); + Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(mxGuid); + frm.UpdateParent += (ss, ee) => + { + Gs.DevApp.ToolBox.MsgHelper.ShowInformation("涓婁紶鎴愬姛锛�"); + getPageList(1, UtilityHelper.GetPageSize()); + }; + frm.ShowDialog(); + } + } + + private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gridView1.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + try + { + var dr = gridView1.GetDataRow(rowhandle); + var urlPath = dr["urlPath"].ToString(); + Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath); + frm.ShowDialog(); + } + catch (Exception ex) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message); + } + } + } + + private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gridView1.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + try + { + var dr = gridView1.GetDataRow(rowhandle); + var urlPath = dr["urlPath"].ToString(); + using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog()) + { + folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�"; + DialogResult dialogResult = folderBrowserDialog.ShowDialog(); + if (dialogResult == DialogResult.OK) + { + string _folder = folderBrowserDialog.SelectedPath; + string _folderName = _folder + "\\" + urlPath; + string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "upload/" + urlPath; + using (WebClient client = new WebClient()) + { + client.DownloadFile(_url, _folderName); + } + ToolBox.MsgHelper.ShowInformation("涓嬭浇鎴愬姛锛�"); + } + } + } + catch (Exception ex) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message); + } + } + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx index 7eccd10..af4b5fe 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx +++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx @@ -118,24 +118,45 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="editorButtonImageOptions9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> - 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 +</value> + </data> + <data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAgdEVYdFRpdGxlAENsZWFyUnVsZXM7Q29uZGl0aW9u + O1J1bGU7QBhuUwAAAwNJREFUOE99k1lME1EUhgcUEZAoxgfhwUhQoxQUUEHEJXEBNEJM8IVEIu4aEJUl + qCzGsgiEpVhKgwaKhiWKKMjWlgqUlsUSEDc0wQc1KAGk0FqoLQ+/Z0asJhpv8s3k5j/nm5kzMwytBYTN + f1j0B+x+IWEFgGFhMotkymxxG7KKFcgSKdCf7oV+vhf6rm+EJtUTmmQPpBXKkSaQgl8gRWpug5IVWQQZ + t+TQz5gtaJI9MTfWymEm1LHu0Bt+58k5jdTFLLYIbuS3cIF2+ju0OiPUcRtg/tKC2efxRBzaz62hzIhJ + yllRYkYdK7CzCPoO78NAeChHf3gIVBFeaDuzBoqTbmg97gb5MVfcqepBg+I13r0fh7RjiBXYWwSa0L2Y + y78Kc24i5nIS0B28i7va13lKKrqgM5jQ0TOMT7UPMBQVifq9/tkk4YbJdB3YhTlqNiWdhvnaKSh3+2Fi + 6jsm6LYnSFAvfwXDrAndQjFGirNg7G3Bm7REVPv7ZJLAhmn184bcdxOkWzzRstkDzd48FN9VEWo8lr5E + eY0Kw5X38EHAh0F2H98ayzEjq0Z/RgqEvPVZzNmECkzrTZjQGjFOiMpV3HlKb6Znb4cqrwDDN5Ogq5NA + 90CMaWJmQIkXYWGoDfAHc+LyXSo2YWxeIJR0Qkt7w4wRbTXNeJsSh8lKESYl+Zgsy4O+V4G+wGA0bQ9A + tptbPhN+TtQZcaEMEdFlOBpdinRBE2qbBpAqfgr+w9foeSLHmDAd40XpmO5sxrM9Qaj12YokZxchzcCB + 4A5OxPJ5Vh+8WF56pWIQt7tHIVKPor2qDlpZHXp2BqKK54Uop+XFVLeEsObe5Z/QsguKfYQC5WfktY9w + VA6OIiamFJK1noh0WFJCNY5sc7iNLfMvge2qHQmCsJR6ZMo/QqIZgc/xargfKcFmF587lC9lm9XbAplD + VvQf/kNgTTg6+14S8sLEWBdSCNf9uVjpG882L2PzA1bWTBB9Q/uJvwROvPO/JHYEO5sVBDsbe8I6mCK2 + 8SdWzA+45UNiD23ajgAAAABJRU5ErkJggg== </value> </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 0e10db2..b09a972 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -546,6 +546,12 @@ <Compile Include="UserControl\ShowRptWizard.Designer.cs"> <DependentUpon>ShowRptWizard.cs</DependentUpon> </Compile> + <Compile Include="UserControl\ShowUp.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\ShowUp.Designer.cs"> + <DependentUpon>ShowUp.cs</DependentUpon> + </Compile> <Compile Include="UserControl\UcComBox.cs"> <SubType>UserControl</SubType> </Compile> @@ -796,6 +802,9 @@ <EmbeddedResource Include="UserControl\ShowRptWizard.resx"> <DependentUpon>ShowRptWizard.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="UserControl\ShowUp.resx"> + <DependentUpon>ShowUp.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\UcComBox.resx"> <DependentUpon>UcComBox.cs</DependentUpon> </EmbeddedResource> diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs index 1e396eb..286e95d 100644 --- a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs @@ -44,6 +44,11 @@ // // pane1 // + this.pane1.AllowTouchScroll = true; + this.pane1.AlwaysScrollActiveControlIntoView = false; + this.pane1.Appearance.BorderColor = System.Drawing.Color.Red; + this.pane1.Appearance.Options.UseBorderColor = true; + this.pane1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.pane1.Dock = System.Windows.Forms.DockStyle.Fill; this.pane1.Location = new System.Drawing.Point(0, 24); this.pane1.Name = "pane1"; diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs new file mode 100644 index 0000000..9622a20 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs @@ -0,0 +1,63 @@ +锘縩amespace Gs.DevApp.UserControl +{ + partial class ShowUp + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile(); + this.SuspendLayout(); + // + // ucUpFile1 + // + this.ucUpFile1.Location = new System.Drawing.Point(39, 80); + this.ucUpFile1.Name = "ucUpFile1"; + this.ucUpFile1.parentGuid = null; + this.ucUpFile1.Size = new System.Drawing.Size(613, 59); + this.ucUpFile1.TabIndex = 0; + // + // ShowUp + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(724, 247); + this.Controls.Add(this.ucUpFile1); + this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ShowUp"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "甯姪鏂囨。涓婁紶"; + this.TopMost = true; + this.ResumeLayout(false); + + } + + #endregion + + private UCUpFile ucUpFile1; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.cs new file mode 100644 index 0000000..af70a96 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/ShowUp.cs @@ -0,0 +1,44 @@ +锘縰sing DevExpress.XtraEditors; +using Gs.DevApp.ToolBox; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.UserControl +{ + public partial class ShowUp : DevExpress.XtraEditors.XtraForm + { + + /// <summary> + /// 鍥炶皟浜嬩欢 + /// </summary> + public event EventHandler<UpdateParentEventArgs> UpdateParent; + + string parentGuid = ""; + public ShowUp(string _parentGuid) + { + InitializeComponent(); + this.parentGuid = _parentGuid; + this.ucUpFile1.parentGuid = _parentGuid; + ucUpFile1.UpChanged += UcUpFile1_UpChanged; + } + + /// <summary> + /// 涓婁紶鍚庡埛鏂版枃浠跺垪琛� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void UcUpFile1_UpChanged(object sender, EventArgs e) + { + UpdateParent?.Invoke(this, + new UpdateParentEventArgs { FilterList = null}); + Close(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.resx b/DevApp/Gs.DevApp/UserControl/ShowUp.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/ShowUp.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index f55031f..5ae0c3d 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -480,6 +480,7 @@ lst.Add(btnIn.Name); lst.Add(btnLog.Name); lst.Add(btnPiZhun.Name); + lst.Add(btnHelp.Name); _enabledBtn(lst); if (btnEscClick != null) btnEscClick(this, e); } @@ -517,6 +518,7 @@ var lst = new List<string>(); lst.Add(btnSave.Name); lst.Add(btnEsc.Name); + lst.Add(btnHelp.Name); _enabledBtn(lst); if (btnEdtClick != null) btnEdtClick(this, e); } @@ -535,6 +537,7 @@ var lst = new List<string>(); lst.Add(btnSave.Name); lst.Add(btnEsc.Name); + lst.Add(btnHelp.Name); _enabledBtn(lst); if (btnAddClick != null) btnAddClick(this, e); } -- Gitblit v1.9.3