SVN r341

SVN-Revision: r341

插件库/Lskj.Control/FrmPicture.Designer.cs

@@ -30,6 +30,8 @@ namespace Lskj.Control
         private void InitializeComponent()
         {
             this.pictureEdit = new DevExpress.XtraEditors.PictureEdit();
+            this.lbRight = new System.Windows.Forms.Label();
+            this.lbLeft = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pictureEdit.Properties)).BeginInit();
             this.SuspendLayout();
             // 
@@ -39,4 +41,30 @@ namespace Lskj.Control
             this.pictureEdit.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureEdit.Location = new System.Drawing.Point(0, 0);
             this.pictureEdit.Name = "pictureEdit";
-            this.pictureEdit.Properties
+            this.pictureEdit.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom;
+            this.pictureEdit.Size = new System.Drawing.Size(787, 571);
+            this.pictureEdit.TabIndex = 44;
+            // 
+            // lbRight
+            // 
+            this.lbRight.BackColor = System.Drawing.Color.White;
+            this.lbRight.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lbRight.Image = global::Lskj.Control.Properties.Resources.right;
+            this.lbRight.Location = new System.Drawing.Point(757, 0);
+            this.lbRight.Name = "lbRight";
+            this.lbRight.Size = new System.Drawing.Size(30, 571);
+            this.lbRight.TabIndex = 48;
+            // 
+            // lbLeft
+            // 
+            this.lbLeft.BackColor = System.Drawing.Color.White;
+            this.lbLeft.Dock = System.Windows.Forms.DockStyle.Left;
+            this.lbLeft.Image = global::Lskj.Control.Properties.Resources.left;
+            this.lbLeft.Location = new System.Drawing.Point(0, 0);
+            this.lbLeft.Name = "lbLeft";
+            this.lbLeft.Size = new System.Drawing.Size(30, 571);
+            this.lbLeft.TabIndex = 47;
+            // 
+            // FrmPicture
+            // 
+            this.Appearance.Back

插件库/Lskj.Control/GridControlEx.cs

@@ -7487,7 +7487,7 @@ namespace Lskj.Control
                                         using (MemoryStream memoryStream = new MemoryStream(bytes))
                                         {
                                             Bitmap bitmap = new Bitmap(memoryStream);
-                                            int height = 18;
+                                            int height = columnModel.LabPicUrlHeight <= 18 ? 30 : columnModel.LabPicUrlHeight;
                                             int newWidth = (int)((decimal)height / (decimal)bitmap.Height * (decimal)bitmap.Width);
                                             Bitmap zoomBitmap = new Bitmap(bitmap, new Size(newWidth, height));
                                             columnModel.LabPicUrlImages[imageUrl] = new KeyValuePair<Image, Image>(bitmap, zoomBitmap);
@@ -7552,6 +7552,9 @@ namespace Lskj.Control
                 {
                     using (FrmPicture frmPicture = new FrmPicture())
                     {
+                        frmPicture.PicUrlColumns = gridView.Columns.Where(n => n.Tag != null && n.Tag is GridColumnModel model && model.FieldType == ControlType.LabPicUrl).ToList();
+                        frmPicture.FocusedRow = gridView.GetFocusedDataRow();
+                        frmPicture.FocusedColumn = gridView.FocusedColumn;
                         Image image = ((KeyValuePair<Image, Image>)columnModel.LabPicUrlImages[imageUrl]).Key;
                         frmPicture.Text = "预览";
                         frmPicture.Picture = image;