暂存
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -449,15 +449,15 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
switch(type) {
|
||||
case 'exists':
|
||||
initialConfig = {
|
||||
selectedFields: [],
|
||||
existsLogic: 'all', // 默认为全部必须存在
|
||||
fields: [], // 使用fields替代selectedFields
|
||||
logic: 'and', // 使用logic替代existsLogic
|
||||
availableFields: availableFields
|
||||
};
|
||||
break;
|
||||
case 'consistency':
|
||||
initialConfig = {
|
||||
pairs: [],
|
||||
logicRelation: 'and', // 默认为AND逻辑
|
||||
logic: 'and', // 使用logic替代logicRelation
|
||||
availableFields: availableFields
|
||||
};
|
||||
break;
|
||||
@@ -473,7 +473,7 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
case 'logic':
|
||||
initialConfig = {
|
||||
conditions: [],
|
||||
logicRelation: 'and', // 默认为AND逻辑
|
||||
logic: 'and', // 使用logic替代logicRelation
|
||||
availableFields: availableFields
|
||||
};
|
||||
break;
|
||||
@@ -591,7 +591,7 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
|
||||
// 更新规则配置
|
||||
handleRuleConfigChange(ruleId, {
|
||||
selectedFields: newSelectedFields
|
||||
fields: newSelectedFields
|
||||
});
|
||||
|
||||
// 直接触发配置更新
|
||||
@@ -604,7 +604,7 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
: [...selectedFields, field];
|
||||
|
||||
handleRuleConfigChange(ruleId, {
|
||||
selectedFields: newSelectedFields
|
||||
fields: newSelectedFields
|
||||
});
|
||||
|
||||
// 直接触发配置更新
|
||||
@@ -674,18 +674,19 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
<div className="form-tip mt-2">点击选择需要判断是否存在的字段,已选中的字段会高亮显示</div>
|
||||
</div>
|
||||
<div className="mb-4">
|
||||
<label className="form-label" htmlFor={`existsLogic-all-${id}`}>判断逻辑 <span className="required-mark">*</span></label>
|
||||
<label className="form-label" htmlFor={`logic-and-${id}`}>判断逻辑 <span className="required-mark">*</span></label>
|
||||
<div className="form-radio-group">
|
||||
<label className="form-radio-item">
|
||||
<input
|
||||
type="radio"
|
||||
id={`existsLogic-all-${id}`}
|
||||
name={`existsLogic_${id}`}
|
||||
id={`logic-and-${id}`}
|
||||
name={`logic_${id}`}
|
||||
className="form-radio"
|
||||
value="all"
|
||||
checked={!config.existsLogic || config.existsLogic === 'all'}
|
||||
value="and"
|
||||
checked={!config.logic || config.logic === 'and'}
|
||||
onChange={(e) => {
|
||||
handleRuleConfigChange(id, { existsLogic: e.target.value });
|
||||
console.log(`[调试] 选择判断逻辑 and,规则ID: ${id}, 当前值: ${config.logic}`);
|
||||
handleRuleConfigChange(id, { logic: e.target.value });
|
||||
// 直接触发配置更新
|
||||
generateEvaluationConfig();
|
||||
}}
|
||||
@@ -695,13 +696,14 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
<label className="form-radio-item">
|
||||
<input
|
||||
type="radio"
|
||||
id={`existsLogic-any-${id}`}
|
||||
name={`existsLogic_${id}`}
|
||||
id={`logic-or-${id}`}
|
||||
name={`logic_${id}`}
|
||||
className="form-radio"
|
||||
value="any"
|
||||
checked={config.existsLogic === 'any'}
|
||||
value="or"
|
||||
checked={config.logic === 'or'}
|
||||
onChange={(e) => {
|
||||
handleRuleConfigChange(id, { existsLogic: e.target.value });
|
||||
console.log(`[调试] 选择判断逻辑 or,规则ID: ${id}, 当前值: ${config.logic}`);
|
||||
handleRuleConfigChange(id, { logic: e.target.value });
|
||||
// 直接触发配置更新
|
||||
generateEvaluationConfig();
|
||||
}}
|
||||
@@ -1475,6 +1477,7 @@ export function ReviewSettings({ onChange, initialData }: ReviewSettingsProps) {
|
||||
delete processedConfig.selectedFields;
|
||||
}
|
||||
if (processedConfig.existsLogic) {
|
||||
console.log(`[调试] exists规则 ${rule.id} 转换: existsLogic=${processedConfig.existsLogic} 映射到 logic`);
|
||||
processedConfig.logic = processedConfig.existsLogic;
|
||||
delete processedConfig.existsLogic;
|
||||
}
|
||||
|
||||
+435
-418
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user