@nokecy/qc-ui 1.1.47 → 1.1.49

package/dist/cjs/RuleBuilder/RuleBuilderContainer.js

@@ -62,7 +62,8 @@ var RuleBuilderInner = function RuleBuilderInner(_ref) {
     path: [],
     level: 0,
     maxLevel: (config === null || config === void 0 ? void 0 : config.maxNestingLevel) || 5,
-    readonly: readonly
+    readonly: readonly,
+    allowFieldComparison: config === null || config === void 0 ? void 0 : config.allowFieldComparison
   }));
 };
 

package/dist/cjs/RuleBuilder/RuleCard.d.ts

@@ -11,6 +11,8 @@ export interface RuleCardProps {
     path: RulePath;
     /** 是否只读模式 */
     readonly?: boolean;
+    /** 是否允许与另一个字段比较 @author nokecy */
+    allowFieldComparison?: boolean;
 }
 /**
  * 规则卡片组件 - 紧凑版

package/dist/cjs/RuleBuilder/RuleCard.js

@@ -32,7 +32,9 @@ var RuleCard = exports.RuleCard = function RuleCard(_ref) {
   var rule = _ref.rule,
     path = _ref.path,
     _ref$readonly = _ref.readonly,
-    readonly = _ref$readonly === void 0 ? false : _ref$readonly;
+    readonly = _ref$readonly === void 0 ? false : _ref$readonly,
+    _ref$allowFieldCompar = _ref.allowFieldComparison,
+    allowFieldComparison = _ref$allowFieldCompar === void 0 ? false : _ref$allowFieldCompar;
   var _useRuleBuilderContex = (0, _RuleBuilderContext.useRuleBuilderContext)(),
     state = _useRuleBuilderContex.state,
     dispatch = _useRuleBuilderContex.dispatch;
@@ -62,7 +64,9 @@ var RuleCard = exports.RuleCard = function RuleCard(_ref) {
         rule: _objectSpread(_objectSpread({}, rule), {}, {
           fieldName: fieldName,
           value: undefined,
-          value2: undefined
+          value2: undefined,
+          // 可比较的字段随数据类型变化，保留字段模式但清空已选字段。@author nokecy
+          valueField: rule.valueField !== undefined ? '' : undefined
         })
       }
     });
@@ -81,7 +85,8 @@ var RuleCard = exports.RuleCard = function RuleCard(_ref) {
         rule: _objectSpread(_objectSpread({}, rule), {}, {
           operator: operator,
           value: needsValue || needsValue2 || needsMultiValue ? rule.value : undefined,
-          value2: needsValue2 ? rule.value2 : undefined
+          value2: needsValue2 ? rule.value2 : undefined,
+          valueField: (0, _operators.operatorSupportsValueField)(operator) ? rule.valueField : undefined
         })
       }
     });
@@ -101,6 +106,21 @@ var RuleCard = exports.RuleCard = function RuleCard(_ref) {
     });
   };
 
+  // 比较字段改变处理：切换模式或选择字段时清空固定值，undefined 表示回到固定值模式。@author nokecy
+  var handleValueFieldChange = function handleValueFieldChange(valueField) {
+    dispatch({
+      type: 'UPDATE_RULE',
+      payload: {
+        path: path,
+        rule: _objectSpread(_objectSpread({}, rule), {}, {
+          value: undefined,
+          value2: undefined,
+          valueField: valueField
+        })
+      }
+    });
+  };
+
   // 删除规则处理
   var handleDelete = function handleDelete() {
     dispatch({
@@ -159,6 +179,10 @@ var RuleCard = exports.RuleCard = function RuleCard(_ref) {
     value: rule.value,
     value2: rule.value2,
     onChange: handleValueChange,
+    valueField: rule.valueField,
+    onValueFieldChange: allowFieldComparison ? handleValueFieldChange : undefined,
+    fields: state.fields,
+    fieldName: rule.fieldName,
     disabled: readonly,
     size: "small"
   }), ruleErrors.some(function (e) {

package/dist/cjs/RuleBuilder/RuleGroupEditor.d.ts

@@ -14,6 +14,8 @@ export interface RuleGroupEditorProps {
     maxLevel: number;
     /** 是否只读模式 */
     readonly?: boolean;
+    /** 是否允许与另一个字段比较 @author nokecy */
+    allowFieldComparison?: boolean;
     /** 规则组变更回调(可选) */
     onChange?: (group: RuleGroupDto) => void;
 }

package/dist/cjs/RuleBuilder/RuleGroupEditor.js

@@ -42,6 +42,8 @@ var RuleGroupEditor = exports.RuleGroupEditor = function RuleGroupEditor(_ref) {
     maxLevel = _ref.maxLevel,
     _ref$readonly = _ref.readonly,
     readonly = _ref$readonly === void 0 ? false : _ref$readonly,
+    _ref$allowFieldCompar = _ref.allowFieldComparison,
+    allowFieldComparison = _ref$allowFieldCompar === void 0 ? false : _ref$allowFieldCompar,
     onChange = _ref.onChange;
   var _useRuleBuilderContex = (0, _RuleBuilderContext.useRuleBuilderContext)(),
     state = _useRuleBuilderContex.state,
@@ -154,7 +156,8 @@ var RuleGroupEditor = exports.RuleGroupEditor = function RuleGroupEditor(_ref) {
       key: ruleIndex,
       rule: rule,
       path: rulePath,
-      readonly: readonly
+      readonly: readonly,
+      allowFieldComparison: allowFieldComparison
     });
   }), currentGroup.groups.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
     className: _indexModule.default.nestedGroups
@@ -166,6 +169,7 @@ var RuleGroupEditor = exports.RuleGroupEditor = function RuleGroupEditor(_ref) {
       level: level + 1,
       maxLevel: maxLevel,
       readonly: readonly,
+      allowFieldComparison: allowFieldComparison,
       onChange: onChange
     });
   })), currentGroup.rules.length === 0 && currentGroup.groups.length === 0 && /*#__PURE__*/_react.default.createElement("div", {

package/dist/cjs/RuleBuilder/constants/operators.d.ts

@@ -41,6 +41,11 @@ export declare const operatorRequiresValue2: (operator: MatchOperator) => boolea
  * 检查操作符是否需要多个值（In/NotIn）
  */
 export declare const operatorRequiresMultiValue: (operator: MatchOperator) => boolean;
+/**
+ * 检查操作符是否支持与另一个字段比较（与后端 RuleGroupValidator 一致：等于、不等于及 4 个大小比较）
+ * @author nokecy
+ */
+export declare const operatorSupportsValueField: (operator: MatchOperator) => boolean;
 /**
  * 最大嵌套层级
  */

package/dist/cjs/RuleBuilder/constants/operators.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.operatorRequiresValue2 = exports.operatorRequiresValue = exports.operatorRequiresMultiValue = exports.getOperatorsByDataType = exports.getOperatorInfo = exports.OPERATOR_INFO_MAP = exports.MAX_NESTING_LEVEL = void 0;
+exports.operatorSupportsValueField = exports.operatorRequiresValue2 = exports.operatorRequiresValue = exports.operatorRequiresMultiValue = exports.getOperatorsByDataType = exports.getOperatorInfo = exports.OPERATOR_INFO_MAP = exports.MAX_NESTING_LEVEL = void 0;
 var _types = require("../types");
 var _OPERATOR_INFO_MAP;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -166,6 +166,14 @@ var operatorRequiresMultiValue = exports.operatorRequiresMultiValue = function o
   return ((_OPERATOR_INFO_MAP$op3 = OPERATOR_INFO_MAP[operator]) === null || _OPERATOR_INFO_MAP$op3 === void 0 ? void 0 : _OPERATOR_INFO_MAP$op3.requiresMultiValue) || false;
 };
 
+/**
+ * 检查操作符是否支持与另一个字段比较（与后端 RuleGroupValidator 一致：等于、不等于及 4 个大小比较）
+ * @author nokecy
+ */
+var operatorSupportsValueField = exports.operatorSupportsValueField = function operatorSupportsValueField(operator) {
+  return [_types.MatchOperator.Equals, _types.MatchOperator.NotEquals, _types.MatchOperator.GreaterThan, _types.MatchOperator.GreaterThanOrEqual, _types.MatchOperator.LessThan, _types.MatchOperator.LessThanOrEqual].includes(operator);
+};
+
 /**
  * 最大嵌套层级
  */

package/dist/cjs/RuleBuilder/index.d.ts

@@ -20,6 +20,6 @@ export { RuleBuilderProvider, useRuleBuilderContext, useRuleBuilderState, useRul
 export { createEmptyRule, createEmptyRuleGroup, generateRuleDescription, cloneRuleGroup, isRuleGroupEmpty, countRules, getMaxDepth, } from './utils/ruleHelpers';
 export { getRuleGroupByPath, getRuleByPath, updateRuleAtPath, deleteRuleAtPath, addRuleAtPath, updateRuleGroupAtPath, deleteRuleGroupAtPath, addRuleGroupAtPath, } from './utils/pathHelpers';
 export { validateRuleGroup, validateRule, isRuleGroupValid, } from './utils/validation';
-export { OPERATOR_INFO_MAP, getOperatorInfo, operatorRequiresValue, operatorRequiresValue2, operatorRequiresMultiValue, getOperatorsByDataType, MAX_NESTING_LEVEL, } from './constants/operators';
+export { OPERATOR_INFO_MAP, getOperatorInfo, operatorRequiresValue, operatorRequiresValue2, operatorRequiresMultiValue, operatorSupportsValueField, getOperatorsByDataType, MAX_NESTING_LEVEL, } from './constants/operators';
 export type { MatchOperator, MatchLogic, FieldDataType, RuleDto, RuleGroupDto, FieldDefinition, ValidationResult, ValidationError, RuleBuilderProps, RuleBuilderConfig, RulePath, RuleBuilderState, RuleBuilderAction, OperatorInfo, } from './types';
 export { RuleBuilderContainer as default } from './RuleBuilderContainer';

package/dist/cjs/RuleBuilder/index.js

@@ -207,6 +207,12 @@ Object.defineProperty(exports, "operatorRequiresValue2", {
     return _operators.operatorRequiresValue2;
   }
 });
+Object.defineProperty(exports, "operatorSupportsValueField", {
+  enumerable: true,
+  get: function get() {
+    return _operators.operatorSupportsValueField;
+  }
+});
 Object.defineProperty(exports, "updateRuleAtPath", {
   enumerable: true,
   get: function get() {

package/dist/cjs/RuleBuilder/inputs/ValueInput.d.ts

@@ -5,10 +5,10 @@
  * - IsNull/IsNotNull: 不渲染任何输入
  * - Between: 渲染 BetweenValueInput
  * - In/NotIn: 渲染 MultiValueInput
- * - 其他: 渲染 SingleValueInput
+ * - 其他: 渲染 SingleValueInput；允许比较字段时前置「固定值 / 字段」切换
  */
 import React from 'react';
-import type { MatchOperator, FieldDataType } from '../types';
+import type { MatchOperator, FieldDataType, FieldDefinition } from '../types';
 export interface ValueInputProps {
     /** 操作符 */
     operator: MatchOperator;
@@ -24,6 +24,14 @@ export interface ValueInputProps {
     disabled?: boolean;
     /** 尺寸 */
     size?: 'small' | 'middle' | 'large';
+    /** 比较字段（undefined 为固定值模式） @author nokecy */
+    valueField?: string;
+    /** 比较字段变更回调；不传则不提供「字段」模式 @author nokecy */
+    onValueFieldChange?: (valueField: string | undefined) => void;
+    /** 可供比较的字段列表 @author nokecy */
+    fields?: FieldDefinition[];
+    /** 当前规则的字段名（比较字段中排除自身） @author nokecy */
+    fieldName?: string;
 }
 export declare const ValueInput: React.FC<ValueInputProps>;
 export default ValueInput;

package/dist/cjs/RuleBuilder/inputs/ValueInput.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.ValueInput = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _operators = require("../constants/operators");
 var _SingleValueInput = _interopRequireDefault(require("./SingleValueInput"));
 var _BetweenValueInput = _interopRequireDefault(require("./BetweenValueInput"));
@@ -17,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * - IsNull/IsNotNull: 不渲染任何输入
  * - Between: 渲染 BetweenValueInput
  * - In/NotIn: 渲染 MultiValueInput
- * - 其他: 渲染 SingleValueInput
+ * - 其他: 渲染 SingleValueInput；允许比较字段时前置「固定值 / 字段」切换
  */
 
 var ValueInput = exports.ValueInput = function ValueInput(_ref) {
@@ -29,7 +30,12 @@ var ValueInput = exports.ValueInput = function ValueInput(_ref) {
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$size = _ref.size,
-    size = _ref$size === void 0 ? 'middle' : _ref$size;
+    size = _ref$size === void 0 ? 'middle' : _ref$size,
+    valueField = _ref.valueField,
+    onValueFieldChange = _ref.onValueFieldChange,
+    _ref$fields = _ref.fields,
+    fields = _ref$fields === void 0 ? [] : _ref$fields,
+    fieldName = _ref.fieldName;
   // 不需要值输入的操作符（IsNull/IsNotNull）
   if (!(0, _operators.operatorRequiresValue)(operator) && !(0, _operators.operatorRequiresValue2)(operator) && !(0, _operators.operatorRequiresMultiValue)(operator)) {
     return null;
@@ -65,9 +71,7 @@ var ValueInput = exports.ValueInput = function ValueInput(_ref) {
       size: size
     });
   }
-
-  // 其他操作符：渲染单值输入
-  return /*#__PURE__*/_react.default.createElement(_SingleValueInput.default, {
+  var singleValueInput = /*#__PURE__*/_react.default.createElement(_SingleValueInput.default, {
     value: value,
     onChange: function onChange(val) {
       return _onChange(val);
@@ -76,5 +80,52 @@ var ValueInput = exports.ValueInput = function ValueInput(_ref) {
     disabled: disabled,
     size: size
   });
+
+  // 其他操作符：渲染单值输入
+  if (!onValueFieldChange || !(0, _operators.operatorSupportsValueField)(operator)) {
+    return singleValueInput;
+  }
+
+  // 比较类操作符：可切换为与同类型的另一个字段比较。@author nokecy
+  var isFieldMode = valueField !== undefined;
+  return /*#__PURE__*/_react.default.createElement(_antd.Space, {
+    size: 4
+  }, /*#__PURE__*/_react.default.createElement(_antd.Segmented, {
+    size: size,
+    value: isFieldMode ? 'field' : 'value',
+    disabled: disabled,
+    options: [{
+      label: '固定值',
+      value: 'value'
+    }, {
+      label: '字段',
+      value: 'field'
+    }],
+    onChange: function onChange(mode) {
+      return onValueFieldChange(mode === 'field' ? '' : undefined);
+    }
+  }), isFieldMode ? /*#__PURE__*/_react.default.createElement(_antd.Select, {
+    value: valueField || undefined,
+    onChange: function onChange(name) {
+      return onValueFieldChange(name);
+    },
+    placeholder: "\u8BF7\u9009\u62E9\u6BD4\u8F83\u5B57\u6BB5",
+    disabled: disabled,
+    size: size,
+    showSearch: true,
+    optionFilterProp: "label",
+    style: {
+      width: 200
+    },
+    options: fields.filter(function (field) {
+      return field.dataType === dataType && field.name !== fieldName;
+    }).map(function (field) {
+      return {
+        value: field.name,
+        label: field.displayName,
+        title: field.description
+      };
+    })
+  }) : singleValueInput);
 };
 var _default = exports.default = ValueInput;

package/dist/cjs/RuleBuilder/types/index.d.ts

@@ -8,7 +8,7 @@
  * JSON 序列化属性名：
  * - fieldName (不是 FieldName)
  * - operator (不是 Operator)
- * - value, value2
+ * - value, value2, valueField
  * - logic, rules, groups
  */
 /**
@@ -78,6 +78,12 @@ export interface RuleDto {
     value?: any;
     /** 第二个值（用于 Between 操作符） */
     value2?: any;
+    /**
+     * 比较字段：与另一个字段的值比较，与 value 互斥，仅 6 个比较操作符可用。
+     * undefined 为固定值模式；空字符串表示已切到字段模式但尚未选择。
+     * @author nokecy
+     */
+    valueField?: string;
 }
 /**
  * 规则组 DTO（与后端保持一致）
@@ -143,6 +149,12 @@ export interface RuleBuilderConfig {
     maxNestingLevel?: number;
     /** 是否显示 JSON 预览 */
     showJsonPreview?: boolean;
+    /**
+     * 是否允许规则与另一个字段比较（valueField）。
+     * 需要后端规则引擎与调用方的格式转换都支持 valueField 才能开启，默认关闭。
+     * @author nokecy
+     */
+    allowFieldComparison?: boolean;
     /** 自定义验证器 */
     validator?: (rule: RuleGroupDto) => ValidationResult;
 }

package/dist/cjs/RuleBuilder/types/index.js

@@ -14,7 +14,7 @@ exports.MatchOperator = exports.MatchLogic = void 0;
  * JSON 序列化属性名：
  * - fieldName (不是 FieldName)
  * - operator (不是 Operator)
- * - value, value2
+ * - value, value2, valueField
  * - logic, rules, groups
  */
 /**

package/dist/cjs/RuleBuilder/utils/validation.js

@@ -112,6 +112,12 @@ function validateRule(rule, fields) {
     });
   }
 
+  // 比较字段模式：值来自另一个字段，不再校验固定值。@author nokecy
+  if (rule.valueField !== undefined) {
+    errors.push.apply(errors, _toConsumableArray(validateValueField(rule, fields)));
+    return errors;
+  }
+
   // 4. 检查值是否为空（对于需要值的操作符）
   if ((0, _operators.operatorRequiresValue)(rule.operator)) {
     if (rule.value === undefined || rule.value === null || rule.value === '') {
@@ -194,6 +200,38 @@ function validateRule(rule, fields) {
   return errors;
 }
 
+/**
+ * 验证比较字段模式的规则
+ * @param rule 规则（valueField 已设置）
+ * @param fields 字段定义列表
+ * @returns 错误列表
+ * @author nokecy
+ */
+function validateValueField(rule, fields) {
+  var errors = [];
+  var addError = function addError(message) {
+    return errors.push({
+      path: [],
+      message: message,
+      field: rule.fieldName
+    });
+  };
+  if (!(0, _operators.operatorSupportsValueField)(rule.operator)) {
+    addError('当前操作符不支持比较字段');
+  }
+  if (rule.value !== undefined && rule.value !== null && rule.value !== '') {
+    addError('固定值和比较字段只能设置一个');
+  }
+  if (!rule.valueField) {
+    addError('请选择比较字段');
+  } else if (!fields.some(function (f) {
+    return f.name === rule.valueField;
+  })) {
+    addError("\u6BD4\u8F83\u5B57\u6BB5 \"".concat(rule.valueField, "\" \u4E0D\u5B58\u5728"));
+  }
+  return errors;
+}
+
 /**
  * 验证值的类型是否匹配
  * @param value 值

package/dist/cjs/array-table/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useArrayTableSources = exports.useArrayTableActions = exports.useAddition = exports.isColumnComponent = exports.buildArrayTableColumns = exports.LazyReadOnlyText = exports.LazyAgField = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _react2 = require("@formily/react");
 var _shared = require("@formily/shared");
 var _arrayBase = _interopRequireDefault(require("./arrayBase"));
@@ -169,6 +170,26 @@ var readByFieldPath = function readByFieldPath(record, path) {
   }, record);
 };
 
+/** 「选一个」型组件:空值占位说「请选择」,其余说「请输入」 */
+var SELECT_LIKE = new Set(['Select', 'TreeSelect', 'Cascader', 'DatePicker', 'TimePicker', 'Radio.Group', 'Checkbox.Group', 'Transfer']);
+
+/**
+ * 懒挂载空值格显示什么。
+ *
+ * 懒挂载把未激活的可编辑格降成纯文本,值为空时整格一片空白——连输入框边框都没有,
+ * 用户看不出这里能填,以为功能坏了。故空值时按真控件的 placeholder 出淡灰占位,
+ * 点开前后看到同一句话,观感连续。
+ *
+ * 同样的理由 Switch/Checkbox 早就强制 eager 了(见 buildArrayTableColumns 的
+ * isInlineToggle),这里是把那条理由推广到其余可编辑列。@author nokecy
+ */
+var resolveEmptyPlaceholder = function resolveEmptyPlaceholder(fieldSchema) {
+  var _fieldSchema$xCompon;
+  var configured = fieldSchema === null || fieldSchema === void 0 || (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.placeholder;
+  if (typeof configured === 'string' && configured) return configured;
+  return SELECT_LIKE.has(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component']) ? '请选择' : '请输入';
+};
+
 /**
  * 懒挂载单元格渲染器(可编辑列)。
  *
@@ -195,6 +216,9 @@ var LazyAgField = exports.LazyAgField = function LazyAgField(params) {
     formatter = params.formatter,
     columnProps = params.columnProps,
     fieldSchema = params.fieldSchema;
+  // hook 必须在下面的条件 return 之前调用
+  var _theme$useToken = _antd.theme.useToken(),
+    token = _theme$useToken.token;
   var key = "".concat(node === null || node === void 0 ? void 0 : node.id, ":").concat(colDef === null || colDef === void 0 ? void 0 : colDef.field);
   var activated = (record === null || record === void 0 ? void 0 : record._isNew) === true || (context === null || context === void 0 || (_context$activeCells = context.activeCells) === null || _context$activeCells === void 0 || (_context$activeCells$ = _context$activeCells.has) === null || _context$activeCells$ === void 0 ? void 0 : _context$activeCells$.call(_context$activeCells, key)) === true;
   if (activated) {
@@ -221,6 +245,18 @@ var LazyAgField = exports.LazyAgField = function LazyAgField(params) {
       fieldSchema: fieldSchema
     }) : liveValue == null ? '' : String(liveValue);
     // 纯文本占满单元格,点击交给 AG-Grid onCellClicked 激活;样式尽量贴近 Editable 只读态避免点开跳动
+    if (text === '') {
+      // 空值:出淡灰 placeholder,让用户看得出这格能填(颜色取 antd 输入框 placeholder 的 token,自动跟随暗色主题)
+      return /*#__PURE__*/_react.default.createElement("span", {
+        className: "ag-array-table-lazy-placeholder",
+        style: {
+          display: 'inline-block',
+          width: '100%',
+          cursor: 'text',
+          color: token.colorTextPlaceholder
+        }
+      }, resolveEmptyPlaceholder(fieldSchema));
+    }
     return /*#__PURE__*/_react.default.createElement("span", {
       className: "ag-array-table-lazy-text",
       style: {

package/dist/esm/RuleBuilder/RuleBuilderContainer.js

@@ -56,7 +56,8 @@ var RuleBuilderInner = function RuleBuilderInner(_ref) {
     path: [],
     level: 0,
     maxLevel: (config === null || config === void 0 ? void 0 : config.maxNestingLevel) || 5,
-    readonly: readonly
+    readonly: readonly,
+    allowFieldComparison: config === null || config === void 0 ? void 0 : config.allowFieldComparison
   }));
 };
 

package/dist/esm/RuleBuilder/RuleCard.d.ts

@@ -11,6 +11,8 @@ export interface RuleCardProps {
     path: RulePath;
     /** 是否只读模式 */
     readonly?: boolean;
+    /** 是否允许与另一个字段比较 @author nokecy */
+    allowFieldComparison?: boolean;
 }
 /**
  * 规则卡片组件 - 紧凑版

package/dist/esm/RuleBuilder/RuleCard.js

@@ -16,7 +16,7 @@ import { FieldSelector } from "./selectors/FieldSelector";
 import { OperatorSelector } from "./selectors/OperatorSelector";
 import ValueInput from "./inputs/ValueInput";
 import { useRuleBuilderContext } from "./context/RuleBuilderContext";
-import { getOperatorInfo } from "./constants/operators";
+import { getOperatorInfo, operatorSupportsValueField } from "./constants/operators";
 import styles from "./styles/index.module.less";
 /**
  * 规则卡片组件 - 紧凑版
@@ -27,7 +27,9 @@ export var RuleCard = function RuleCard(_ref) {
   var rule = _ref.rule,
     path = _ref.path,
     _ref$readonly = _ref.readonly,
-    readonly = _ref$readonly === void 0 ? false : _ref$readonly;
+    readonly = _ref$readonly === void 0 ? false : _ref$readonly,
+    _ref$allowFieldCompar = _ref.allowFieldComparison,
+    allowFieldComparison = _ref$allowFieldCompar === void 0 ? false : _ref$allowFieldCompar;
   var _useRuleBuilderContex = useRuleBuilderContext(),
     state = _useRuleBuilderContex.state,
     dispatch = _useRuleBuilderContex.dispatch;
@@ -57,7 +59,9 @@ export var RuleCard = function RuleCard(_ref) {
         rule: _objectSpread(_objectSpread({}, rule), {}, {
           fieldName: fieldName,
           value: undefined,
-          value2: undefined
+          value2: undefined,
+          // 可比较的字段随数据类型变化，保留字段模式但清空已选字段。@author nokecy
+          valueField: rule.valueField !== undefined ? '' : undefined
         })
       }
     });
@@ -76,7 +80,8 @@ export var RuleCard = function RuleCard(_ref) {
         rule: _objectSpread(_objectSpread({}, rule), {}, {
           operator: operator,
           value: needsValue || needsValue2 || needsMultiValue ? rule.value : undefined,
-          value2: needsValue2 ? rule.value2 : undefined
+          value2: needsValue2 ? rule.value2 : undefined,
+          valueField: operatorSupportsValueField(operator) ? rule.valueField : undefined
         })
       }
     });
@@ -96,6 +101,21 @@ export var RuleCard = function RuleCard(_ref) {
     });
   };
 
+  // 比较字段改变处理：切换模式或选择字段时清空固定值，undefined 表示回到固定值模式。@author nokecy
+  var handleValueFieldChange = function handleValueFieldChange(valueField) {
+    dispatch({
+      type: 'UPDATE_RULE',
+      payload: {
+        path: path,
+        rule: _objectSpread(_objectSpread({}, rule), {}, {
+          value: undefined,
+          value2: undefined,
+          valueField: valueField
+        })
+      }
+    });
+  };
+
   // 删除规则处理
   var handleDelete = function handleDelete() {
     dispatch({
@@ -154,6 +174,10 @@ export var RuleCard = function RuleCard(_ref) {
     value: rule.value,
     value2: rule.value2,
     onChange: handleValueChange,
+    valueField: rule.valueField,
+    onValueFieldChange: allowFieldComparison ? handleValueFieldChange : undefined,
+    fields: state.fields,
+    fieldName: rule.fieldName,
     disabled: readonly,
     size: "small"
   }), ruleErrors.some(function (e) {

package/dist/esm/RuleBuilder/RuleGroupEditor.d.ts

@@ -14,6 +14,8 @@ export interface RuleGroupEditorProps {
     maxLevel: number;
     /** 是否只读模式 */
     readonly?: boolean;
+    /** 是否允许与另一个字段比较 @author nokecy */
+    allowFieldComparison?: boolean;
     /** 规则组变更回调(可选) */
     onChange?: (group: RuleGroupDto) => void;
 }

package/dist/esm/RuleBuilder/RuleGroupEditor.js

@@ -35,6 +35,8 @@ export var RuleGroupEditor = function RuleGroupEditor(_ref) {
     maxLevel = _ref.maxLevel,
     _ref$readonly = _ref.readonly,
     readonly = _ref$readonly === void 0 ? false : _ref$readonly,
+    _ref$allowFieldCompar = _ref.allowFieldComparison,
+    allowFieldComparison = _ref$allowFieldCompar === void 0 ? false : _ref$allowFieldCompar,
     onChange = _ref.onChange;
   var _useRuleBuilderContex = useRuleBuilderContext(),
     state = _useRuleBuilderContex.state,
@@ -147,7 +149,8 @@ export var RuleGroupEditor = function RuleGroupEditor(_ref) {
       key: ruleIndex,
       rule: rule,
       path: rulePath,
-      readonly: readonly
+      readonly: readonly,
+      allowFieldComparison: allowFieldComparison
     });
   }), currentGroup.groups.length > 0 && /*#__PURE__*/React.createElement("div", {
     className: styles.nestedGroups
@@ -159,6 +162,7 @@ export var RuleGroupEditor = function RuleGroupEditor(_ref) {
       level: level + 1,
       maxLevel: maxLevel,
       readonly: readonly,
+      allowFieldComparison: allowFieldComparison,
       onChange: onChange
     });
   })), currentGroup.rules.length === 0 && currentGroup.groups.length === 0 && /*#__PURE__*/React.createElement("div", {

package/dist/esm/RuleBuilder/constants/operators.d.ts

@@ -41,6 +41,11 @@ export declare const operatorRequiresValue2: (operator: MatchOperator) => boolea
  * 检查操作符是否需要多个值（In/NotIn）
  */
 export declare const operatorRequiresMultiValue: (operator: MatchOperator) => boolean;
+/**
+ * 检查操作符是否支持与另一个字段比较（与后端 RuleGroupValidator 一致：等于、不等于及 4 个大小比较）
+ * @author nokecy
+ */
+export declare const operatorSupportsValueField: (operator: MatchOperator) => boolean;
 /**
  * 最大嵌套层级
  */

package/dist/esm/RuleBuilder/constants/operators.js

@@ -163,6 +163,14 @@ export var operatorRequiresMultiValue = function operatorRequiresMultiValue(oper
   return ((_OPERATOR_INFO_MAP$op3 = OPERATOR_INFO_MAP[operator]) === null || _OPERATOR_INFO_MAP$op3 === void 0 ? void 0 : _OPERATOR_INFO_MAP$op3.requiresMultiValue) || false;
 };
 
+/**
+ * 检查操作符是否支持与另一个字段比较（与后端 RuleGroupValidator 一致：等于、不等于及 4 个大小比较）
+ * @author nokecy
+ */
+export var operatorSupportsValueField = function operatorSupportsValueField(operator) {
+  return [MatchOperator.Equals, MatchOperator.NotEquals, MatchOperator.GreaterThan, MatchOperator.GreaterThanOrEqual, MatchOperator.LessThan, MatchOperator.LessThanOrEqual].includes(operator);
+};
+
 /**
  * 最大嵌套层级
  */

package/dist/esm/RuleBuilder/index.d.ts

@@ -20,6 +20,6 @@ export { RuleBuilderProvider, useRuleBuilderContext, useRuleBuilderState, useRul
 export { createEmptyRule, createEmptyRuleGroup, generateRuleDescription, cloneRuleGroup, isRuleGroupEmpty, countRules, getMaxDepth, } from './utils/ruleHelpers';
 export { getRuleGroupByPath, getRuleByPath, updateRuleAtPath, deleteRuleAtPath, addRuleAtPath, updateRuleGroupAtPath, deleteRuleGroupAtPath, addRuleGroupAtPath, } from './utils/pathHelpers';
 export { validateRuleGroup, validateRule, isRuleGroupValid, } from './utils/validation';
-export { OPERATOR_INFO_MAP, getOperatorInfo, operatorRequiresValue, operatorRequiresValue2, operatorRequiresMultiValue, getOperatorsByDataType, MAX_NESTING_LEVEL, } from './constants/operators';
+export { OPERATOR_INFO_MAP, getOperatorInfo, operatorRequiresValue, operatorRequiresValue2, operatorRequiresMultiValue, operatorSupportsValueField, getOperatorsByDataType, MAX_NESTING_LEVEL, } from './constants/operators';
 export type { MatchOperator, MatchLogic, FieldDataType, RuleDto, RuleGroupDto, FieldDefinition, ValidationResult, ValidationError, RuleBuilderProps, RuleBuilderConfig, RulePath, RuleBuilderState, RuleBuilderAction, OperatorInfo, } from './types';
 export { RuleBuilderContainer as default } from './RuleBuilderContainer';

package/dist/esm/RuleBuilder/index.js

@@ -34,7 +34,7 @@ export { getRuleGroupByPath, getRuleByPath, updateRuleAtPath, deleteRuleAtPath,
 export { validateRuleGroup, validateRule, isRuleGroupValid } from "./utils/validation";
 
 // ============ 常量 ============
-export { OPERATOR_INFO_MAP, getOperatorInfo, operatorRequiresValue, operatorRequiresValue2, operatorRequiresMultiValue, getOperatorsByDataType, MAX_NESTING_LEVEL } from "./constants/operators";
+export { OPERATOR_INFO_MAP, getOperatorInfo, operatorRequiresValue, operatorRequiresValue2, operatorRequiresMultiValue, operatorSupportsValueField, getOperatorsByDataType, MAX_NESTING_LEVEL } from "./constants/operators";
 
 // ============ 类型定义 ============