From 4d3cf3affcf6025e0f05ba032b1e8d4ea6860e43 Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Fri, 7 Mar 2025 07:34:33 +0000
Subject: [PATCH] SVN r304

SVN-Revision: r304
---
 插件库/Lskj.PubTabDll/DllBaseClass.cs       |   2 +-
 插件库/Lskj.PubTabDll/FrmMain.cs            | Bin 643 -> 957 bytes
 插件库/Lskj.PubTabDll/Lskj.PubTabDll.csproj |   5 ++++-
 插件库/Lskj.PubTabDll/TabDllEx.cs           |  13 +++++++++----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/插件库/Lskj.PubTabDll/DllBaseClass.cs b/插件库/Lskj.PubTabDll/DllBaseClass.cs
index f25ab17..9766a07 100644
--- a/插件库/Lskj.PubTabDll/DllBaseClass.cs
+++ b/插件库/Lskj.PubTabDll/DllBaseClass.cs
@@ -1,2 +1,2 @@
 using System;
-using System.Collections.Generi
\ No newline at end of file
+using Syste
\ No newline at end of file
diff --git a/插件库/Lskj.PubTabDll/FrmMain.cs b/插件库/Lskj.PubTabDll/FrmMain.cs
index cb6129ca2330cbf520eaf80c5e40d25f8f5436e0..daf5a8a827376062f8d7bed95b3ccc3bebfa09ab 100644
GIT binary patch
literal 957
zcmb1;W|k5akgVa7<g3Xn%87}Lfq(=9SuleE2$pvR+%q_Mw&!^Jll_G=r=0UyAwOMk
zj?>23Tq`?o?OOkMtMoQKe&55DPaOXi?u}a*yTxdo<IAJpKGf^5-rFM{cP32cV5Y?E
z%wvnydR@w*vh|aeEQmU_YLoxn$Bq(D!|#4GKPOi3OtsMH=A<v2@$0rNK3sG<o#k#`
zqs`OfG7-HTpA)aQfBv4m>%&DS&+}bBWM35ZaYtM(Q9k-6TGa1@U-ayPSq~41zua5m
z7q^@7{I_}RQp{1AiU$++&+wBt_Ko9Y&ZVis%dfcA3V1wxCTzPWB5#lN;cF||_Z4;O
zeq&#7{lwFvt^4PnI;}V>hmAddXNq&B7w5GptgE<At(pBY^jH63wrL;5485&<GUI;*
znM&VjsNK4{B$R3M{!EiOAvb=>dWjmH`|LJ*tKp^7=LL>f=zdYU>gRC&=qZg^`<AY}
zeC>U9G_yo(nC|sluSW0nKioRy<PJQTcR-uD;c1hX&yS8}4D3z|n0F<f{Jj1k_qn4c
zMc?KZs7f!%<9j{-5%;CXOkP#T^Hv1>db-f~<L))Tm~Qw<_it<rj@YcQ_ow$4q05fz
z1qHv?cIoNfYr5SXuQO5N)*(T@Ruk*(B2PtlHg9|^R__#hX@~bD?-J<%g%=SKCsJ4M
z^ZIpl;?)Z*=P$0AV<G;6Q}t?e_sd0W$3>c|Kb<PyeW|m=msRAVQOe{GCFj;TO*Zv#
zSvpOoNNvAK<NKNM>BnXB4xHfCa0+(Z{-9f}OJefMJbSIb;&111Uf}%6;}?AKaBfCG
zhh=I%)1Ra2i!MA6j8ePIV0Yx^r=v&bF2B8r<$~QR{m|s|^X=Df%go-r^@h&>?*CI>
zs@6M*tXm_L_wC69{q0SYPA*a`VdBv*WV*L><?@YuY0r#fJ3bx=c>hn0Stam+)wYl3
zPt#oVbaWLbPAGiGJ?|Oo;~jQ6jbD~M@$g%HF19T4x$&c1?)f_s6)woBbDjA=Tmb-O
CSVTqu

delta 602
zcmV-g0;T=E2ZIHWG=Bi&>#Af9x@;lv?=?&fl{vCw_z+7JZS=y618!xsy*eZ8lKzKx
z0mR!5$z6rbxB<l}`AFw>#pmpqH^`K2k(WQHfqqmI`CTYJdF2mJn`Gz&B5~7swampV
z5&g_ZLXx#@7j2#q<_4o{_K|KiL)B}Mdw{KoaH<?a6=9r&^?z{y)koD1a^U~BQDP>D
zV7yJ+CGtO%j>=-}f5(F?@NeCy4!sl{Y7u`OKkqKRO^r_>IaV93SVf1{UODwN=1fgx
zFIN&~r=cvR$wE}V6L5O?5GCxjEbuc53NCtMcH?q&ww&wR6FICjj7J)c{IA;=_g)zc
zw2h$M=mBX)ntxs&q_}`iQU!jSH-?nc8o8xt)uRoj0U3C_p0d;K+Gv8{LSdGv)>@3$
z#Ee?+KCmVWUiYm2vPe#-hhTe^JIP7J4Xb*)josz^(>dQ#hfGt)M*r$ZNFY4Zar*A;
z7Raf(`vNLm_|vp|i=Jsy#a%;Npd7V8<llpA%*C@^$A3ERB8!(qa5Uih0E{4LunUV!
z;=E#TKD81-S7kbZUT<Ts0#qxmlBjjje-(edGOKwqvr8>=11CosOY4WlP~A@SvrWF(
zO3DwuhPCLkS*eCSnr8{_=?wXvU%urhj6Tu`zJJJd8gUoy(W>y|Sx;yShTeN34B6y0
zQovo3^HXXz*wk?LI88IRS_DBLDDxt+5siP+A3(5~qPIysOmNjqW2*yKrbCSWPO)93
oEzHpttd~tq0>{jJq(_6l`2etw&4Xnr&Do5b8(juA*Q-qt#;^G)FaQ7m

diff --git a/插件库/Lskj.PubTabDll/Lskj.PubTabDll.csproj b/插件库/Lskj.PubTabDll/Lskj.PubTabDll.csproj
index 16e9604..dfae942 100644
--- a/插件库/Lskj.PubTabDll/Lskj.PubTabDll.csproj
+++ b/插件库/Lskj.PubTabDll/Lskj.PubTabDll.csproj
@@ -61,7 +61,6 @@
     <Compile Include="FrmMain.Designer.cs">
       <DependentUpon>FrmMain.cs</DependentUpon>
     </Compile>
-    <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TabDllEx.cs">
       <SubType>UserControl</SubType>
@@ -99,6 +98,10 @@
       <Project>{7eafccc2-a18f-49e9-85c6-a984966cfd01}</Project>
       <Name>Lskj.Business</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Lskj.Control\Lskj.Control.csproj">
+      <Project>{447CDC40-659F-4CCA-9ED6-8E818B4CF8BF}</Project>
+      <Name>Lskj.Control</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Lskj.Model\Lskj.Model.csproj">
       <Project>{52BC40E0-C0C6-4F78-996B-CAE028D209CA}</Project>
       <Name>Lskj.Model</Name>
diff --git a/插件库/Lskj.PubTabDll/TabDllEx.cs b/插件库/Lskj.PubTabDll/TabDllEx.cs
index 144ef76..8d87612 100644
--- a/插件库/Lskj.PubTabDll/TabDllEx.cs
+++ b/插件库/Lskj.PubTabDll/TabDllEx.cs
@@ -20,15 +20,19 @@ namespace Lskj.PubTabDll
         {
             InitializeComponent();
         }
-        public void InitTabPages(List<string> gridDetail)
+
+        public void InitTabPages(string[] gridDetail) 
         {
             foreach (string item in gridDetail)
             {
-                DataRow dataRow = MainImpl.GetModuleInformation(item);
+                if (string.IsNullOrWhiteSpace(item)) continue;
+                DataRow dataRow= MainImpl.GetModuleInformation(item);
                 if (dataRow == null) continue;
+
                 // 验证权限
-                int purview = BaseImpl.GetUserPurviewsByMenuId(dataRow["MenuId"] + "");
+                int purview = MainImpl.GetUserPurviewsByMenuId(dataRow["MenuId"] + "");
                 if (purview == 0) continue;
+              
                 string[] args = new string[]{
                 dataRow["MenuCaption"] + "",
                 ERPInfo.Instance.UserId,
@@ -37,5 +41,6 @@ namespace Lskj.PubTabDll
                 dataRow["UrlParams"] + "",
                 dataRow["MenuId"] + ""
                 };
+                
                 XtraTabPage tp = new XtraTabPage();
-                IForm iform = FormHelper.LoadDllFo
\ No newline at end of file
+                IForm iform = FormHelper.LoadDllForm(dataRow["DllFileName"] + "", args);