Merge branch 'main' of http://192.168.0.7:4133/cyf/lserp_cs_6.0

# Conflicts: # 插件库/Lskj.PubModuleDetail/FrmMain.cs
2026-08-29 21:54:25 +08:00
parent 9f5f548dea 98a119ed25
commit 24653fbe6c
10 changed files with 944 additions and 31 deletions
@@ -2043,7 +2043,8 @@ namespace Lskj.PubBill
                    //e.Cancel = !ValidateCond(gridColumnModel.DisableCond, focusedRow);
                    string UpdateCond = this.ControlObj.ReplaceParentControlValue(gridColumnModel.DisableCond);
                    UpdateCond = ReplaceHelper.ReplaceRowParam(rowItem, UpdateCond);
-                    if (!ReplaceHelper.EvalCond(UpdateCond))
+                    
+                    if (!ValidateCond(UpdateCond, rowItem))
                    {
                        e.Cancel = true;//该行不可编辑
                    }