From d1e732b8d7f7294097be7530f6218af5923f97ab Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Thu, 6 Mar 2025 08:38:20 +0000
Subject: [PATCH] SVN r299

SVN-Revision: r299
---
 插件库/Lskj.PubTabDll/FrmMain.Designer.cs  |   2 +-
 插件库/Lskj.PubTabDll/FrmMain.cs           | Bin 644 -> 643 bytes
 插件库/Lskj.PubTabDll/TabDllEx.Designer.cs |  10 +++++-----
 插件库/Lskj.PubTabDll/TabDllEx.cs          |  12 ++++--------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/插件库/Lskj.PubTabDll/FrmMain.Designer.cs b/插件库/Lskj.PubTabDll/FrmMain.Designer.cs
index e3db47c..c93a990 100644
--- a/插件库/Lskj.PubTabDll/FrmMain.Designer.cs
+++ b/插件库/Lskj.PubTabDll/FrmMain.Designer.cs
@@ -29,4 +29,4 @@ namespace Lskj.PubTabDll
         /// </summary>
         private void InitializeComponent()
         {
-            this
\ No newline at end of file
+          
\ No newline at end of file
diff --git a/插件库/Lskj.PubTabDll/FrmMain.cs b/插件库/Lskj.PubTabDll/FrmMain.cs
index 9b0f5d0b3a7059ec17cdb1a21b628176799ccbc1..cb6129ca2330cbf520eaf80c5e40d25f8f5436e0 100644
GIT binary patch
delta 602
zcmV-g0;T<g1%m~UG=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#w9%{^#A|>

delta 603
zcmV-h0;K(e1%w5VG=FkwV0y}jMD0&LNC!IY*`2W7QlzdP+4HO*vZJeaw5iZC{TZnL
z?I#gH=V}MZ6WWj|-JD#CNm$!+<duPAY@0%jbMSmCgtJdNH!zsqF#D4}7e)Ct9a+rm
zRQKKjmciI45bn#JXY3VWWSLt&e`r2jTHp?$-V1`3o#klHmwya&X4!`(g~=S|_;j8J
zjDLywTgcv88`AWdI#Yc*9?f={sUbhsINelky{;ZM75?X%RfC6u@6L?GfjWZFrgVJh
z0#oLb=ud)0Q|8BTWZq9#J0h2!W=3-q{kO!Nn-ZY?*UhG5$k7*Z2A-!sYXY0Qs>Bu}
zpMr{U=vNBU*nbTSepe~%G4kZ_I>}jpqlBka5FY09JU9W)lT&}9CtdLFH&dAKnp=Wc
zpjZs?<;srIf0qaDgMOGv@n}00e?39<+!$hoZpk8_{PTw-REOQBcx+*9+Ewy=s0NIa
zavnuV<#_2gHfS2sj{HdDXa?q5TUY@nBa@Vh>)hB|P=8CcVda?y<)$@!G63XXZuth+
z#Z+j58#469fMYE;bWn3_=x`G#LRQkMQlQ4SmuXhv4%6reG&BDK_nDKC#XrZu_f+Ey
z_B$Sxz@QZ!CGw8Do;T(Gj=TwPZNa(bVTHVCeAKGE+Z9j#CuRQkp3>A&RK%~=Fip9_
zdqrR|rc^{had6jSk4P+LKqYs%zbwsT%J*tT+azGE^6MV+o|HYb4o`LVMD%^N4E5_J
p@IEY)_g4sqKC~Q`HFo5prpL9;6D}P6=a=>N5foNKWGAiGEvm_6Gx-1j

diff --git a/插件库/Lskj.PubTabDll/TabDllEx.Designer.cs b/插件库/Lskj.PubTabDll/TabDllEx.Designer.cs
index 0c634f1..3238567 100644
--- a/插件库/Lskj.PubTabDll/TabDllEx.Designer.cs
+++ b/插件库/Lskj.PubTabDll/TabDllEx.Designer.cs
@@ -29,11 +29,11 @@ namespace Lskj.PubTabDll
         /// </summary>
         private void InitializeComponent()
         {
-            this.xtc_container = new DevExpress.XtraTab.XtraTabControl();
-            ((System.ComponentModel.ISupportInitialize)(this.xtc_container)).BeginInit();
+            this.xtraTabControl = new DevExpress.XtraTab.XtraTabControl();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl)).BeginInit();
             this.SuspendLayout();
             // 
-            // xtc_container
+            // xtraTabControl
             // 
-            this.xtc_container.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
-      
\ No newline at end of file
+            this.xtraTabControl.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+            this
\ No newline at end of file
diff --git a/插件库/Lskj.PubTabDll/TabDllEx.cs b/插件库/Lskj.PubTabDll/TabDllEx.cs
index 946bb43..144ef76 100644
--- a/插件库/Lskj.PubTabDll/TabDllEx.cs
+++ b/插件库/Lskj.PubTabDll/TabDllEx.cs
@@ -20,18 +20,15 @@ namespace Lskj.PubTabDll
         {
             InitializeComponent();
         }
-
-        public void InitTabPages(List<string> gridDetail) 
+        public void InitTabPages(List<string> gridDetail)
         {
             foreach (string item in gridDetail)
             {
-                DataRow dataRow= MainImpl.GetModuleInformation(item);
+                DataRow dataRow = MainImpl.GetModuleInformation(item);
                 if (dataRow == null) continue;
-
                 // 验证权限
-                int purview = MainImpl.GetUserPurviewsByMenuId(dataRow["MenuId"] + "");
+                int purview = BaseImpl.GetUserPurviewsByMenuId(dataRow["MenuId"] + "");
                 if (purview == 0) continue;
-              
                 string[] args = new string[]{
                 dataRow["MenuCaption"] + "",
                 ERPInfo.Instance.UserId,
@@ -40,6 +37,5 @@ namespace Lskj.PubTabDll
                 dataRow["UrlParams"] + "",
                 dataRow["MenuId"] + ""
                 };
-                
                 XtraTabPage tp = new XtraTabPage();
-                IForm iform = FormHelper.LoadDllForm(dataRow["DllFileName"] + "", args);
\ No newline at end of file
+                IForm iform = FormHelper.LoadDllFo
\ No newline at end of file