From 9872d678fc6703101d02f68b88b7519a0b6bc82c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/TestForm/XtraForm2.cs | 21 +++
DevApp/Gs.DevApp/TestForm/XtraForm2.resx | 120 ++++++++++++++++++++
DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs | 190 +++++++++++++++++++++++++++++++
3 files changed, 331 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs
new file mode 100644
index 0000000..f0bedb5
--- /dev/null
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs
@@ -0,0 +1,190 @@
+锘縩amespace Gs.DevApp.TestForm
+{
+ partial class XtraForm2
+ {
+ /// <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.gridControl1 = new DevExpress.XtraGrid.GridControl();
+ this.bandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gridControl1
+ //
+ this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridControl1.Location = new System.Drawing.Point(0, 0);
+ this.gridControl1.MainView = this.bandedGridView1;
+ this.gridControl1.Name = "gridControl1";
+ this.gridControl1.Size = new System.Drawing.Size(967, 467);
+ this.gridControl1.TabIndex = 0;
+ this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.bandedGridView1});
+ //
+ // bandedGridView1
+ //
+ this.bandedGridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand1,
+ this.gridBand4,
+ this.gridBand6,
+ this.gridBand7});
+ this.bandedGridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5});
+ this.bandedGridView1.GridControl = this.gridControl1;
+ this.bandedGridView1.Name = "bandedGridView1";
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "gridColumn1";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Width = 479;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "gridColumn2";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "gridColumn3";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 478;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "gridColumn4";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "gridColumn5";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Width = 94;
+ //
+ // gridBand1
+ //
+ this.gridBand1.Caption = "gridBand1";
+ this.gridBand1.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand5,
+ this.gridBand2});
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 886;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "gridBand5";
+ this.gridBand5.Columns.Add(this.gridColumn3);
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 0;
+ this.gridBand5.Width = 440;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "gridBand2";
+ this.gridBand2.Columns.Add(this.gridColumn1);
+ this.gridBand2.Columns.Add(this.gridColumn2);
+ this.gridBand2.Columns.Add(this.gridColumn4);
+ this.gridBand2.Columns.Add(this.gridColumn5);
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.Width = 446;
+ //
+ // gridBand4
+ //
+ this.gridBand4.Caption = "gridBand4";
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 1;
+ this.gridBand4.Width = 220;
+ //
+ // gridBand6
+ //
+ this.gridBand6.Caption = "gridBand6";
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 2;
+ this.gridBand6.Width = 150;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "gridBand7";
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 3;
+ this.gridBand7.Width = 183;
+ //
+ // XtraForm2
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(967, 467);
+ this.Controls.Add(this.gridControl1);
+ this.Name = "XtraForm2";
+ this.Text = "XtraForm2";
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gridControl1;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView bandedGridView1;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn1;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn2;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn3;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn4;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn5;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm2.cs b/DevApp/Gs.DevApp/TestForm/XtraForm2.cs
new file mode 100644
index 0000000..26ce58f
--- /dev/null
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm2.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+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.TestForm
+{
+ public partial class XtraForm2 : DevExpress.XtraEditors.XtraForm
+ {
+ public XtraForm2()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm2.resx b/DevApp/Gs.DevApp/TestForm/XtraForm2.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm2.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
--
Gitblit v1.9.3