admin/AutoBOM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 style: standardize parameter naming to camelCase

Browse Source 
Refactor parameter and property names from PascalCase to camelCase
for consistent naming conventions across VBA modules.

Changes:
- Conditions → conditions (property and parameters)
- Update all references across 7 modules
- Maintain functional behavior while improving code readability

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Misaka_Company
2026-03-26 14:47:17 +08:00
parent 7d59e489b1
commit d4f8e77c66
7 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
VBA/ClassModules/ConditionEvaluator.cls
View File

@@ -39,7 +39,7 @@ End Function
' conditions - 条件字典
' 返回: Boolean
'=====================================================================
Private Function EvaluateExpression(expr As String, Conditions As Object) As Boolean
Private Function EvaluateExpression(expr As String, conditions As Object) As Boolean
expr = Trim(expr)
' 处理最外层括号
@@ -52,7 +52,7 @@ Private Function EvaluateExpression(expr As String, Conditions As Object) As Boo
' 处理OR运算符(优先级最低)
Dim orResult As Variant
orResult = SplitByOperator(expr, " OR ", Conditions)
orResult = SplitByOperator(expr, " OR ", conditions)
If Not IsEmpty(orResult) Then
EvaluateExpression = orResult
Exit Function
@@ -60,14 +60,14 @@ Private Function EvaluateExpression(expr As String, Conditions As Object) As Boo
' 处理AND运算符
Dim andResult As Variant
andResult = SplitByOperator(expr, " AND ", Conditions)
andResult = SplitByOperator(expr, " AND ", conditions)
If Not IsEmpty(andResult) Then
EvaluateExpression = andResult
Exit Function
End If
' 处理单个条件
EvaluateExpression = EvaluateSingleCondition(expr, Conditions)
EvaluateExpression = EvaluateSingleCondition(expr, conditions)
End Function
'=====================================================================
@@ -78,7 +78,7 @@ End Function
' conditions - 条件字典
' 返回: Variant - 评估结果或Empty
'=====================================================================
Private Function SplitByOperator(expr As String, operator As String, Conditions As Object) As Variant
Private Function SplitByOperator(expr As String, operator As String, conditions As Object) As Variant
Dim pos As Long
Dim leftPart As String
Dim rightPart As String
@@ -103,11 +103,11 @@ Private Function SplitByOperator(expr As String, operator As String, Conditions
' 根据运算符类型评估
If operator = " OR " Then
SplitByOperator = EvaluateExpression(leftPart, Conditions) Or _
EvaluateExpression(rightPart, Conditions)
SplitByOperator = EvaluateExpression(leftPart, conditions) Or _
EvaluateExpression(rightPart, conditions)
ElseIf operator = " AND " Then
SplitByOperator = EvaluateExpression(leftPart, Conditions) And _
EvaluateExpression(rightPart, Conditions)
SplitByOperator = EvaluateExpression(leftPart, conditions) And _
EvaluateExpression(rightPart, conditions)
End If
Exit Function
End If
@@ -125,7 +125,7 @@ End Function
' conditions - 条件字典
' 返回: Boolean
'=====================================================================
Private Function EvaluateSingleCondition(condition As String, Conditions As Object) As Boolean
Private Function EvaluateSingleCondition(condition As String, conditions As Object) As Boolean
Dim varName As String
Dim operator As String
Dim value As String
@@ -142,10 +142,10 @@ Private Function EvaluateSingleCondition(condition As String, Conditions As Obje
value = Trim(parts(1))
' 特殊规则:如果产品条件中不存在该变量,视为满足!=条件
If Not Conditions.Exists(varName) Then
If Not conditions.Exists(varName) Then
EvaluateSingleCondition = True
Else
actualValue = Conditions(varName)
actualValue = conditions(varName)
' fjgn字段特殊处理（多值匹配）
If varName = "fjgn" Then
@@ -168,10 +168,10 @@ Private Function EvaluateSingleCondition(condition As String, Conditions As Obje
varName = Trim(eqParts(0))
value = Trim(eqParts(1))
If Not Conditions.Exists(varName) Then
If Not conditions.Exists(varName) Then
EvaluateSingleCondition = False
Else
actualValue = Conditions(varName)
actualValue = conditions(varName)
' fjgn字段特殊处理（多值匹配）
If varName = "fjgn" Then