From a2500752dfbfdf152a5a24792acaad3b54477e41 Mon Sep 17 00:00:00 2001 From: tdx Date: Tue, 18 Mar 2025 09:30:55 +0000 Subject: [PATCH] SVN r341 SVN-Revision: r341 --- 插件库/Lskj.Control/FrmPicture.Designer.cs | 30 ++++++++++++++++++++- 插件库/Lskj.Control/FrmPicture.cs | Bin 663 -> 2555 bytes 插件库/Lskj.Control/GridControlEx.cs | 5 +++- 插件库/Lskj.Control/Resources/left.png | Bin 0 -> 770 bytes 插件库/Lskj.Control/Resources/right.png | Bin 0 -> 592 bytes 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 插件库/Lskj.Control/Resources/left.png create mode 100644 插件库/Lskj.Control/Resources/right.png diff --git a/插件库/Lskj.Control/FrmPicture.Designer.cs b/插件库/Lskj.Control/FrmPicture.Designer.cs index 94ee7ec..da49ae0 100644 --- a/插件库/Lskj.Control/FrmPicture.Designer.cs +++ b/插件库/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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/插件库/Lskj.Control/FrmPicture.cs b/插件库/Lskj.Control/FrmPicture.cs index 41e400c47418e86e5bf250da9a4feb016b123c22..2d19ce9bc52f1725efdf829a36dede6d6202ec11 100644 GIT binary patch literal 2555 zcmd5-&2HOB48Hp*SfdDJq@8ZB+c=BFaTdn9P0)1P1%e#L5^YZ^&uC{xPP&1gtcN~Q zU!kOaEK9PoEqbXgwm9VXedLhT*Uw*4r}P5Oa6P_HEIKFt@mBt6RU}3xPFLE!>UF!k zS9s?Hdw-vo;DCvqo6>#iKHiE`CLrpXab&c&CKj(vgmHOt^~rf$)!$fWjGPVCcW`dP)L}$_UuC#EE)`hmm4me$Co8!?=3}8-lu99EF3@jJ_`QD0 z7K;?FA<1FJk@6w~uISinQ$un8i`s&NA*^MbVi#;hP*keAgJ7^Fugjlk#h0f3!;vZ4 zD;U%Xc6D4@lOSC)I&rl$cdt>Wq-ri>*HGn`%87V3#km(F>W+_aID`v*>NT4(OP!?% zc&ir6W<+Ldglu}-gc7UP(j%;migJo7ATYCAnksOpBec(8yr%g%u?q*-RS~5m$T*3JO_*a^Mf>vIE#(C^ct>G#_uU^QHZ zT#=Z#H3!1w zVFg8njm*oNe^vOiM2+ga)FFzC6FL)P9Th|``drOUPb%Qk{zK>S=0!(!Im0qBx@f}4 zL~R~Qy_jW`9ro@Xi^?Q{fRfF}2wy93cpi`5A z;{l7mL661})bXDN=a2#asV#(D=%P?(D->7a-$1tb94%i*QsXXxU=B~~=4}9Y4CLt& zT=Yfsp^gTSoc8P4!>3{|Hu4ez;vQqC`}(hm!0(KWexHw#Ft;#6g3c=W`9X zSra%Pn+E_i6nSDf@tJn^FH@R|r6%_mR4RuYs_8Nl`ZtvaN^aA99DarckyA}61RR&= zb0fII$ED+T<8#IqvZ8sB~PADZST(`>8D zDT`|Ila)SEH@SFdIypbzVM#=c!3M*vM+Yq^5iO)9hgH|OnypI?em^(G+kMVg;LquvhhNKSE9-ouO xE9!RCx6Fvu)(?>G2mXmnNb>Af<1BXXkb>8$b5D!;tLVO!z0M~wgg diff --git a/插件库/Lskj.Control/GridControlEx.cs b/插件库/Lskj.Control/GridControlEx.cs index 54b9b19..55d792e 100644 --- a/插件库/Lskj.Control/GridControlEx.cs +++ b/插件库/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(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)columnModel.LabPicUrlImages[imageUrl]).Key; frmPicture.Text = "预览"; frmPicture.Picture = image; diff --git a/插件库/Lskj.Control/Resources/left.png b/插件库/Lskj.Control/Resources/left.png new file mode 100644 index 0000000000000000000000000000000000000000..565e19fd2b11a8a309cb09df4dd672a7d7232230 GIT binary patch literal 770 zcmV+d1O5DoP)Px%yh%hsRCr$9n?ZKMAP|OuT*NMnxq#MXJxTQ>>PfUG(WTW3#JH#zQCiaYp6yEn z1{en28WR4Gnea0Z&Jz6<{ozzH_O80mvus(GyDdZthct@aX3!sQ80T;I{oq2pl;!Sh z+qdKZw27~yK+0KpI;@`-Kv9f)@^V@IANiZ$r;dPH{PntFjP+VaSjz43bePzVejPcG zMwo4iV*J*KZ-1e@1^&lVc$lm&{+S&@Ty&edlyLy|_=!4$@ zP5!Hmi`LD`lpug2K#^y^PP20TpS{2r%gEB%q%T#GQ zXmu9~!6^c64>hsER3Uf)P^W|L6bDkB-!>Aw0Z0{sR{%HqgM6f1V*7a>Vv!I8!0$Av z-RcIN>$44U-Sxo$+<67G!wx#JZT|-aU;-hwYYYy6Is_B|l&v!wfM%LhhaMj;qOh$q zDgYA**wz^xfRSNBTt7qsU<3ilFhv7E1wvE+6s$7|05PpI82~1RDMZDY6aW(lzO6Gk z0N4;n0>HG+WC57CMwJe()|oT_69}%>nLGd!!{o9Podf_A2v7atq{;pRbb3rC0`BX1 zZB^%EwFhYdHG&i$eYd&oOG?JKLU6VJ2>N{f8^b5|PzXz_%m4rY07*qoM6N<$g03M{ ALI3~& literal 0 HcmV?d00001 diff --git a/插件库/Lskj.Control/Resources/right.png b/插件库/Lskj.Control/Resources/right.png new file mode 100644 index 0000000000000000000000000000000000000000..697aeb3312b5a749265b9f70f59a0307189fb28f GIT binary patch literal 592 zcmV-W0Px%3Q0skRCr$H+u?1(Fc1acV-vbb*@RBgc9ND!V3T%}Hcv{VD6#>`_wL>){#!Nh zKJJ{@n1k(n9Cn`HyaA48_FDKQ_We~gp${{cSN+GZS${;WSFc)0a=L9AIsz4rr z4IqyY0q_XnZK{;-tcRs209k}c07-;s03f{1kIk(o#?$ooTVy+A06ao?iQG%b0ssOQ zPFO{@Dj^IZ695PR07M!>Hb6Rp0>FZR&6DlG1}i2;+D5AiKpKJ)Knj8yKsbUTKq!JL zKp28DKnQ|501$fH?N~G57CAI30Ng_ueq^o!fW1YmBDZ7s{SRMYsQ#Y&=U(_-v_P-_ z@o0?lA0EmTKo1W+Re+H2ssQWLChHQXtPIsE;9huapS$lDDglItS84&=<8ixdZHQ1l z`Q?QaDxeo0?~%Suo(+&1KD!0d!)F3WgwFzy37-LgFF%j(E_;Ua@LP_qKnZEUM;|Q eZz0#*J-|PRCWAo*eV8u*0000