@nokecy/qc-ui 1.1.21 → 1.1.23

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.js

@@ -20,6 +20,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -137,8 +141,10 @@ function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
  * 【重要】如果提供了 originalColumnDefs，会合并原始列定义中的所有属性
  * 这样可以保留 cellRenderer、valueFormatter、valueEnum 等自定义渲染属性
  *
+ * 【重要】会自动检测并追加代码中新增的列（在 originalColumnDefs 中存在但 flatConfig 中不存在的列）
+ *
  * @param flatConfig 扁平化配置数组
- * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性
+ * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性和检测新增列
  * @returns AG-Grid 列定义数组
  */
 function flatConfigToGridState(flatConfig, originalColumnDefs) {
@@ -173,6 +179,30 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
     return undefined;
   }
 
+  /**
+   * 递归收集所有列定义（包括分组内的列）
+   */
+  function collectAllColumns(defs) {
+    var columns = [];
+    var _iterator3 = _createForOfIteratorHelper(defs),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var def = _step3.value;
+        if ('children' in def && def.children) {
+          columns.push.apply(columns, _toConsumableArray(collectAllColumns(def.children)));
+        } else {
+          columns.push(def);
+        }
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+    return columns;
+  }
+
   /**
    * 递归构建树形结构
    */
@@ -227,7 +257,74 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
       }
     });
   }
-  return buildTree();
+  var result = buildTree();
+
+  // 【新增】检测并插入代码中新增的列到原始位置
+  // 场景：用户保存列配置后，开发者在代码中新增了列，这些列应该在其原始定义位置显示
+  if (originalColumnDefs && originalColumnDefs.length > 0) {
+    // 收集 flatConfig 中所有已存在的 field
+    var existingFields = new Set(flatConfig.filter(function (item) {
+      return item.type === 'column' && item.field;
+    }).map(function (item) {
+      return item.field;
+    }));
+
+    // 收集原始列定义中所有的列（保留顺序索引）
+    var allOriginalColumns = collectAllColumns(originalColumnDefs);
+
+    // 找出新增的列及其在原始定义中的索引
+    var newColumnsWithIndex = [];
+    allOriginalColumns.forEach(function (col, index) {
+      if (col.field && !existingFields.has(col.field)) {
+        newColumnsWithIndex.push({
+          col: col,
+          originalIndex: index
+        });
+      }
+    });
+    if (newColumnsWithIndex.length > 0) {
+      // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
+      var _iterator4 = _createForOfIteratorHelper(newColumnsWithIndex),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _step4$value = _step4.value,
+            col = _step4$value.col,
+            originalIndex = _step4$value.originalIndex;
+          var insertIndex = 0; // 默认插入到开头
+
+          // 从该列之前的列开始查找，找到第一个在 result 中存在的列
+          var _loop = function _loop() {
+              var prevCol = allOriginalColumns[i];
+              if (!prevCol.field) return 0; // continue
+
+              // 在 result 中找到这个前置列的位置
+              var prevIndexInResult = result.findIndex(function (r) {
+                return r.field === prevCol.field;
+              });
+              if (prevIndexInResult !== -1) {
+                insertIndex = prevIndexInResult + 1;
+                return 1; // break
+              }
+            },
+            _ret;
+          for (var i = originalIndex - 1; i >= 0; i--) {
+            _ret = _loop();
+            if (_ret === 0) continue;
+            if (_ret === 1) break;
+          }
+
+          // 在 insertIndex 位置插入新列
+          result.splice(insertIndex, 0, col);
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+    }
+  }
+  return result;
 }
 
 /**
@@ -355,11 +452,37 @@ function isOldSchemeData(data) {
  * 扁平化配置 → AG-Grid Column State
  * 将扁平化数组转换为 AG-Grid 的 columnState 格式，用于控制列的顺序和属性
  *
+ * 【重要】会自动检测并追加代码中新增的列（在 originalColumnDefs 中存在但 flatConfig 中不存在的列）
+ *
  * @param flatConfig 扁平化配置数组
+ * @param originalColumnDefs 原始列定义数组（可选），用于检测新增列
  * @returns AG-Grid columnState 数组
  */
-function flatConfigToColumnState(flatConfig) {
-  return flatConfig.filter(function (item) {
+function flatConfigToColumnState(flatConfig, originalColumnDefs) {
+  /**
+   * 递归收集所有列定义（包括分组内的列）
+   */
+  function collectAllColumns(defs) {
+    var columns = [];
+    var _iterator5 = _createForOfIteratorHelper(defs),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var def = _step5.value;
+        if ('children' in def && def.children) {
+          columns.push.apply(columns, _toConsumableArray(collectAllColumns(def.children)));
+        } else {
+          columns.push(def);
+        }
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    return columns;
+  }
+  var result = flatConfig.filter(function (item) {
     return item.type === 'column';
   }) // 只处理列节点，分组不在 columnState 中
   .filter(function (item) {
@@ -384,4 +507,73 @@ function flatConfigToColumnState(flatConfig) {
     }
     return state;
   });
+
+  // 【新增】检测并插入代码中新增的列到原始位置
+  if (originalColumnDefs && originalColumnDefs.length > 0) {
+    // 收集 flatConfig 中所有已存在的 field
+    var existingFields = new Set(flatConfig.filter(function (item) {
+      return item.type === 'column' && item.field;
+    }).map(function (item) {
+      return item.field;
+    }));
+
+    // 收集原始列定义中所有的列（保留顺序索引）
+    var allOriginalColumns = collectAllColumns(originalColumnDefs);
+
+    // 找出新增的列及其在原始定义中的索引
+    var newColumnsWithIndex = [];
+    allOriginalColumns.forEach(function (col, index) {
+      if (col.field && !existingFields.has(col.field)) {
+        newColumnsWithIndex.push({
+          col: col,
+          originalIndex: index
+        });
+      }
+    });
+    if (newColumnsWithIndex.length > 0) {
+      // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
+      var _iterator6 = _createForOfIteratorHelper(newColumnsWithIndex),
+        _step6;
+      try {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var _step6$value = _step6.value,
+            col = _step6$value.col,
+            originalIndex = _step6$value.originalIndex;
+          var insertIndex = 0; // 默认插入到开头
+
+          // 从该列之前的列开始查找，找到第一个在 result 中存在的列
+          var _loop2 = function _loop2() {
+              var prevCol = allOriginalColumns[i];
+              if (!prevCol.field) return 0; // continue
+
+              // 在 result 中找到这个前置列的位置
+              var prevIndexInResult = result.findIndex(function (r) {
+                return r.colId === prevCol.field;
+              });
+              if (prevIndexInResult !== -1) {
+                insertIndex = prevIndexInResult + 1;
+                return 1; // break
+              }
+            },
+            _ret2;
+          for (var i = originalIndex - 1; i >= 0; i--) {
+            _ret2 = _loop2();
+            if (_ret2 === 0) continue;
+            if (_ret2 === 1) break;
+          }
+
+          // 在 insertIndex 位置插入新列状态
+          result.splice(insertIndex, 0, {
+            colId: col.field
+            // 新增列使用默认状态，不设置 hide/width 等
+          });
+        }
+      } catch (err) {
+        _iterator6.e(err);
+      } finally {
+        _iterator6.f();
+      }
+    }
+  }
+  return result;
 }

package/dist/cjs/ag-grid-plus/shared/storage/schemeStorageAdapter.d.ts

@@ -8,6 +8,38 @@ export interface QueryItem {
     /** 是否隐藏 */
     hidden?: boolean;
 }
+/**
+ * 逻辑操作符 // P0
+ */
+export type LogicOperator = 'AND' | 'OR';
+/**
+ * 查询规则操作符 // P0
+ */
+export type RuleOperator = '=' | '!=' | '>' | '>=' | '<' | '<=' | 'contains' | 'startsWith' | 'endsWith' | 'isEmpty' | 'isNotEmpty' | 'between';
+/**
+ * 单条查询规则 // P0
+ */
+export interface QueryRule {
+    /** 规则ID */
+    id: string;
+    /** 字段名 */
+    field: string;
+    /** 操作符 */
+    operator: string;
+    /** 值 */
+    value: any;
+}
+/**
+ * 查询规则组 // P0
+ */
+export interface QueryRuleGroup {
+    /** 组ID */
+    id: string;
+    /** 逻辑连接符 */
+    logic: LogicOperator;
+    /** 子规则或子组 */
+    children: (QueryRule | QueryRuleGroup)[];
+}
 /**
  * 查询配置结构
  */
@@ -16,6 +48,10 @@ export interface QueryConfig {
     items: QueryItem[];
     /** 查询表单默认值 */
     defaultValues?: Record<string, any>;
+    /** 查询模式: simple(简单表单) | advanced(高级组合器) // P0 */
+    mode?: 'simple' | 'advanced';
+    /** 高级模式下的规则树 // P0 */
+    rules?: QueryRuleGroup;
 }
 /**
  * 查询方案

package/dist/cjs/ag-grid-plus/utils.d.ts

@@ -1,5 +1,11 @@
 import { ValueFormatterParams } from 'ag-grid-community';
 import { AgGridColumnPropsClone } from './interface';
+/**
+ * 将高级查询规则转换为后端 Filter 字符串
+ * 注意: 目前为了保持兼容性，只能尽量将 OR 转换为后端支持的格式(如 A=1|A=2)，
+ * 复杂的嵌套 OR 可能需要后端升级支持。当前策略是尽力转换。
+ */
+export declare const convertRulesToFilterString: (ruleGroup: any, colDefs: any[]) => string;
 declare const convertFilterModel: (filterModel: any, colDefs: AgGridColumnPropsClone[]) => string;
 declare const convertSortModel: (sortModel: any[]) => string;
 declare const dateValueFormatter: (params: ValueFormatterParams) => string;

package/dist/cjs/ag-grid-plus/utils.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toTree = exports.flattenTreeDeep = exports.flatten = exports.dateValueFormatter = exports.dateTimeValueFormatter = exports.convertSortModel = exports.convertFilterModel = void 0;
+exports.toTree = exports.flattenTreeDeep = exports.flatten = exports.dateValueFormatter = exports.dateTimeValueFormatter = exports.convertSortModel = exports.convertRulesToFilterString = exports.convertFilterModel = void 0;
 var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -22,6 +22,91 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var esc = function esc(v) {
   return v.replace(/([(),|,\\]|\/i)/g, '\\$1');
 };
+
+// --- Query Builder Logic Helpers (P0) ---
+
+/**
+ * 将高级查询规则转换为后端 Filter 字符串
+ * 注意: 目前为了保持兼容性，只能尽量将 OR 转换为后端支持的格式(如 A=1|A=2)，
+ * 复杂的嵌套 OR 可能需要后端升级支持。当前策略是尽力转换。
+ */
+var convertRulesToFilterString = exports.convertRulesToFilterString = function convertRulesToFilterString(ruleGroup, colDefs) {
+  if (!ruleGroup || !ruleGroup.children || ruleGroup.children.length === 0) {
+    return "";
+  }
+  var processGroup = function processGroup(group) {
+    var results = [];
+    var isAnd = group.logic === 'AND';
+    group.children.forEach(function (child) {
+      if (child.logic) {
+        // Nested Group
+        var childFilters = processGroup(child);
+        if (childFilters.length > 0) {
+          // 简单的嵌套处理，如果顶层是 AND，子组也是 AND，则展开
+          // 如果逻辑不一致，目前简单的 Filter String 可能无法完美表达 ((A=1) AND (B=2)) OR (C=3)
+          // 现在的降级策略：如果是 OR 组，尝试用逗号分隔（但标准是 AND 用逗号）
+          // TODO: 确认后端是否支持 SQL-like filter string。
+          // 假设目前只处理最简单的：平铺的 AND
+          results.push.apply(results, _toConsumableArray(childFilters)); // 暂时打平
+        }
+      } else {
+        // Rule
+        var colDef = colDefs.find(function (c) {
+          return c.field === child.field;
+        });
+        var filter = getRuleFilter(child, colDef);
+        if (filter) {
+          results.push(filter);
+        }
+      }
+    });
+    return results;
+  };
+
+  // 目前为了兼容性，强制打平输出。高级功能的完整支持依赖后端。
+  // 这里我们把所有规则都视为可以通过 convertFilterModel 处理的单元
+  var filters = processGroup(ruleGroup);
+  return filters.join(",");
+};
+var getRuleFilter = function getRuleFilter(rule, colDef) {
+  var field = rule.field,
+    operator = rule.operator,
+    value = rule.value;
+  if (value === undefined || value === null || value === "") return "";
+  var objectKey = field;
+
+  // 根据操作符构造查询串
+  switch (operator) {
+    case '=':
+      return "".concat(objectKey, " = ").concat(value);
+    case '!=':
+      return "".concat(objectKey, " != ").concat(value);
+    case '>':
+      return "".concat(objectKey, " > ").concat(value);
+    case '>=':
+      return "".concat(objectKey, " >= ").concat(value);
+    case '<':
+      return "".concat(objectKey, " < ").concat(value);
+    case '<=':
+      return "".concat(objectKey, " <= ").concat(value);
+    case 'contains':
+      return "".concat(objectKey, " =* ").concat(esc(value));
+    case 'startsWith':
+      return "".concat(objectKey, " ^ ").concat(esc(value));
+    case 'endsWith':
+      // 后端可能不支持 endWith 语法，暂用 =*
+      return "".concat(objectKey, " =* ").concat(esc(value));
+    case 'between':
+      if (Array.isArray(value)) {
+        // 复用现有的 range 逻辑
+        return getFilter(objectKey, value, colDef);
+      }
+      return "";
+    default:
+      // 默认回退到标准处理
+      return getFilter(objectKey, value, colDef);
+  }
+};
 var getFilter = function getFilter(objectKey, value, colDef) {
   if (typeof value === 'string') {
     return value && value != "" ? "".concat(objectKey, " ").concat(colDef !== null && colDef !== void 0 && colDef.exactQuery ? '^' : "=*", " ").concat(esc(value)) : "";

package/dist/cjs/formDesigner/FormDesigner.js

@@ -63,8 +63,10 @@ var FormDesigner = function FormDesigner(props) {
   var getComponents = function getComponents() {
     var components = {};
     businessComponents.map(function (x) {
-      if (!x.Behavior) {}
-      components[x.Behavior[0].name] = x;
+      var _x$Behavior;
+      if ((_x$Behavior = x.Behavior) !== null && _x$Behavior !== void 0 && (_x$Behavior = _x$Behavior[0]) !== null && _x$Behavior !== void 0 && _x$Behavior.name) {
+        components[x.Behavior[0].name] = x;
+      }
     });
     return components;
   };

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -23,7 +23,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { ModuleRegistry } from 'ag-grid-community';
 import { AgGridReact } from 'ag-grid-react';
-import { Spin, Pagination, Card, Tag, Typography } from 'antd';
+import { Spin, Pagination, Card, Tag, Typography, Popover, Badge, Button } from 'antd';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { AllEnterpriseModule } from "ag-grid-enterprise";
 
@@ -36,8 +36,10 @@ import "./index.less";
 import FormRender from "./queryForm";
 import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
-import { RedoOutlined } from '@ant-design/icons';
-import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
+import { RedoOutlined, FilterOutlined } from '@ant-design/icons';
+import { convertFilterModel, convertRulesToFilterString, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
+import AdvancedQueryBuilder from "./queryForm/AdvancedQueryBuilder";
+import { v4 as uuidv4 } from 'uuid';
 import Setting from "./setting";
 import { useGridPlusColumnState } from '.';
 import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
@@ -218,6 +220,23 @@ function AgGridPlus(props) {
     queryItemsOrder = _useState18[0],
     setQueryItemsOrder = _useState18[1];
 
+  // 高级查询状态
+  var _useState19 = useState(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    advancedPopoverOpen = _useState20[0],
+    setAdvancedPopoverOpen = _useState20[1];
+  var createEmptyRuleGroup = function createEmptyRuleGroup() {
+    return {
+      id: uuidv4(),
+      logic: 'AND',
+      children: []
+    };
+  };
+  var _useState21 = useState(createEmptyRuleGroup),
+    _useState22 = _slicedToArray(_useState21, 2),
+    advancedQueryRules = _useState22[0],
+    setAdvancedQueryRules = _useState22[1];
+
   /**
    * 【P1 架构优化】使用单向数据流架构
    *
@@ -676,7 +695,19 @@ function AgGridPlus(props) {
       pagination: pagination
     });
     try {
-      var filter = convertFilterModel(queryFilter, allColDefsRef.current);
+      // 处理高级查询模式
+      var filter;
+      if (queryFilter.__advancedMode__ && queryFilter.__rules__) {
+        // 高级模式：使用规则转换
+        filter = convertRulesToFilterString(queryFilter.__rules__, allColDefsRef.current);
+        logger.debug('高级模式 Filter', {
+          rules: queryFilter.__rules__,
+          filter: filter
+        });
+      } else {
+        // 简单模式：使用原有的转换逻辑
+        filter = convertFilterModel(queryFilter, allColDefsRef.current);
+      }
       var params = _objectSpread(_objectSpread({
         filter: filter
       }, stableGridParams), {}, {
@@ -1181,16 +1212,33 @@ function AgGridPlus(props) {
     defaultExpand: defaultSearchExpand,
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
+      // 优先使用高级搜索：如果存在高级搜索条件，忽略简单查询
+      if (advancedQueryRules.children.length > 0) {
+        var filter = {
+          __advancedMode__: true,
+          __rules__: advancedQueryRules
+        };
+        setQueryFilter(filter);
+        if (pagination.current !== 1) {
+          setPagination(function (prev) {
+            return _objectSpread(_objectSpread({}, prev), {}, {
+              current: 1
+            });
+          });
+        }
+        onRequest && onRequest(filter);
+        return;
+      }
       setQueryFilter(_objectSpread({}, formValues));
-      setPagination(function (prev) {
-        if (prev.current !== 1) {
+      // 始终使用传入的 formValues 发起请求
+      if (pagination.current !== 1) {
+        setPagination(function (prev) {
           return _objectSpread(_objectSpread({}, prev), {}, {
             current: 1
           });
-        }
-        onRequest && onRequest(formValues);
-        return prev;
-      });
+        });
+      }
+      onRequest && onRequest(formValues);
     },
     onInit: function onInit(defaultValues) {
       setQueryFilter(defaultValues);
@@ -1228,7 +1276,79 @@ function AgGridPlus(props) {
       gridKey: gridKey,
       gridApi: apiRef.current,
       onSaveColumnState: onColumnStateChanged
-    })]
+    }),
+    /*#__PURE__*/
+    // 高级搜索（图标风格，位于设置右边）
+    React.createElement(Popover, {
+      key: "advanced-search-setting",
+      content: /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 600,
+          maxHeight: 400,
+          overflow: 'auto'
+        }
+      }, /*#__PURE__*/React.createElement(AdvancedQueryBuilder, {
+        rootGroup: advancedQueryRules,
+        onChange: setAdvancedQueryRules,
+        colDefs: allColDefs
+      }), /*#__PURE__*/React.createElement("div", {
+        style: {
+          marginTop: 12,
+          textAlign: 'right',
+          borderTop: '1px solid #f0f0f0',
+          paddingTop: 12
+        }
+      }, /*#__PURE__*/React.createElement(Button, {
+        size: "small",
+        onClick: function onClick() {
+          setAdvancedQueryRules(createEmptyRuleGroup());
+          setQueryFilter({});
+          onRequest && onRequest({});
+          setAdvancedPopoverOpen(false);
+        },
+        style: {
+          marginRight: 8
+        }
+      }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
+        size: "small",
+        type: "primary",
+        onClick: function onClick() {
+          var filter = {
+            __advancedMode__: true,
+            __rules__: advancedQueryRules
+          };
+          setQueryFilter(filter);
+          if (pagination.current !== 1) {
+            setPagination(function (prev) {
+              return _objectSpread(_objectSpread({}, prev), {}, {
+                current: 1
+              });
+            });
+          }
+          onRequest && onRequest(filter);
+          setAdvancedPopoverOpen(false);
+        }
+      }, "\u67E5\u8BE2"))),
+      title: "\u9AD8\u7EA7\u641C\u7D22",
+      trigger: "click",
+      open: advancedPopoverOpen,
+      onOpenChange: setAdvancedPopoverOpen,
+      placement: "bottomRight",
+      overlayStyle: {
+        maxWidth: 'none'
+      }
+    }, /*#__PURE__*/React.createElement(Badge, {
+      count: advancedQueryRules.children.length,
+      size: "small",
+      offset: [-2, 2]
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: "0 4px",
+        color: advancedQueryRules.children.length > 0 ? '#1890ff' : '#000',
+        fontSize: 16,
+        cursor: "pointer"
+      }
+    }, /*#__PURE__*/React.createElement(FilterOutlined, null))))]
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({
     theme: agGridTheme
   }, rest, {

package/dist/esm/ag-grid-plus/context/useSchemeDataFlow.d.ts

@@ -48,9 +48,10 @@ export declare function useDerivedGridState(currentScheme: ColumnScheme | undefi
  * 派生层 - 计算列样式状态（只读派生）
  *
  * @param currentScheme - 当前列方案
+ * @param allColDefs - 原始列定义（用于检测新增列）
  * @returns 派生的列状态配置
  */
-export declare function useDerivedColumnState(currentScheme: ColumnScheme | undefined): any;
+export declare function useDerivedColumnState(currentScheme: ColumnScheme | undefined, allColDefs: ExtendedColDef[]): any;
 /**
  * 统一的方案数据流 Hook（组合版）
  *

package/dist/esm/ag-grid-plus/context/useSchemeDataFlow.js

@@ -91,9 +91,10 @@ export function useDerivedGridState(currentScheme, allColDefs) {
  * 派生层 - 计算列样式状态（只读派生）
  *
  * @param currentScheme - 当前列方案
+ * @param allColDefs - 原始列定义（用于检测新增列）
  * @returns 派生的列状态配置
  */
-export function useDerivedColumnState(currentScheme) {
+export function useDerivedColumnState(currentScheme, allColDefs) {
   return useMemo(function () {
     if (!(currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig)) {
       return null;
@@ -102,15 +103,15 @@ export function useDerivedColumnState(currentScheme) {
       var _require2 = require("../setting/columnGroupUtils"),
         flatConfigToColumnState = _require2.flatConfigToColumnState;
 
-      // 转换列状态
-      var result = flatConfigToColumnState(currentScheme.columnConfig);
+      // 转换列状态，传入原始列定义以检测新增列
+      var result = flatConfigToColumnState(currentScheme.columnConfig, allColDefs);
       return result;
     } catch (error) {
       console.error('[useDerivedColumnState] 转换失败:', error);
       return null;
     }
   }, [// 使用 scheme.id 作为依赖
-  currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.id]);
+  currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.id, allColDefs]);
 }
 
 /**
@@ -144,7 +145,7 @@ export function useSchemeDataFlow(gridKey, allColDefs, schemeData) {
 
   // 2. 派生层（Derived State）
   var derivedColumnDefs = useDerivedGridState(schemeSource.currentColumnScheme, allColDefs);
-  var derivedColumnState = useDerivedColumnState(schemeSource.currentColumnScheme);
+  var derivedColumnState = useDerivedColumnState(schemeSource.currentColumnScheme, allColDefs);
   return _objectSpread(_objectSpread({}, schemeSource), {}, {
     // 派生状态（只读）
     derivedColumnDefs: derivedColumnDefs,

package/dist/esm/ag-grid-plus/queryForm/AdvancedQueryBuilder.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { QueryRuleGroup } from '../shared/storage/schemeStorageAdapter';
+import { ExtendedColDef } from '../types';
+interface AdvancedQueryBuilderProps {
+    rootGroup: QueryRuleGroup;
+    onChange: (group: QueryRuleGroup) => void;
+    colDefs: ExtendedColDef[];
+}
+declare const AdvancedQueryBuilder: React.FC<AdvancedQueryBuilderProps>;
+export default AdvancedQueryBuilder;