@nokecy/qc-ui 1.1.21 → 1.1.23

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

@@ -19,6 +19,8 @@ var _toolBar = _interopRequireDefault(require("./toolBar"));
 var _settingItem = _interopRequireDefault(require("./settingItem"));
 var _icons = require("@ant-design/icons");
 var _utils = require("./utils");
+var _AdvancedQueryBuilder = _interopRequireDefault(require("./queryForm/AdvancedQueryBuilder"));
+var _uuid = require("uuid");
 var _setting = _interopRequireDefault(require("./setting"));
 var _ = require(".");
 var _customGroupCellRenderer = _interopRequireDefault(require("./_utils/customGroupCellRenderer"));
@@ -226,6 +228,23 @@ function AgGridPlus(props) {
     queryItemsOrder = _useState18[0],
     setQueryItemsOrder = _useState18[1];
 
+  // 高级查询状态
+  var _useState19 = (0, _react.useState)(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    advancedPopoverOpen = _useState20[0],
+    setAdvancedPopoverOpen = _useState20[1];
+  var createEmptyRuleGroup = function createEmptyRuleGroup() {
+    return {
+      id: (0, _uuid.v4)(),
+      logic: 'AND',
+      children: []
+    };
+  };
+  var _useState21 = (0, _react.useState)(createEmptyRuleGroup),
+    _useState22 = _slicedToArray(_useState21, 2),
+    advancedQueryRules = _useState22[0],
+    setAdvancedQueryRules = _useState22[1];
+
   /**
    * 【P1 架构优化】使用单向数据流架构
    *
@@ -684,7 +703,19 @@ function AgGridPlus(props) {
       pagination: pagination
     });
     try {
-      var filter = (0, _utils.convertFilterModel)(queryFilter, allColDefsRef.current);
+      // 处理高级查询模式
+      var filter;
+      if (queryFilter.__advancedMode__ && queryFilter.__rules__) {
+        // 高级模式：使用规则转换
+        filter = (0, _utils.convertRulesToFilterString)(queryFilter.__rules__, allColDefsRef.current);
+        _logger.logger.debug('高级模式 Filter', {
+          rules: queryFilter.__rules__,
+          filter: filter
+        });
+      } else {
+        // 简单模式：使用原有的转换逻辑
+        filter = (0, _utils.convertFilterModel)(queryFilter, allColDefsRef.current);
+      }
       var params = _objectSpread(_objectSpread({
         filter: filter
       }, stableGridParams), {}, {
@@ -1189,16 +1220,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);
@@ -1236,7 +1284,79 @@ function AgGridPlus(props) {
       gridKey: gridKey,
       gridApi: apiRef.current,
       onSaveColumnState: onColumnStateChanged
-    })]
+    }),
+    /*#__PURE__*/
+    // 高级搜索（图标风格，位于设置右边）
+    _react.default.createElement(_antd.Popover, {
+      key: "advanced-search-setting",
+      content: /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          width: 600,
+          maxHeight: 400,
+          overflow: 'auto'
+        }
+      }, /*#__PURE__*/_react.default.createElement(_AdvancedQueryBuilder.default, {
+        rootGroup: advancedQueryRules,
+        onChange: setAdvancedQueryRules,
+        colDefs: allColDefs
+      }), /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          marginTop: 12,
+          textAlign: 'right',
+          borderTop: '1px solid #f0f0f0',
+          paddingTop: 12
+        }
+      }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+        size: "small",
+        onClick: function onClick() {
+          setAdvancedQueryRules(createEmptyRuleGroup());
+          setQueryFilter({});
+          onRequest && onRequest({});
+          setAdvancedPopoverOpen(false);
+        },
+        style: {
+          marginRight: 8
+        }
+      }, "\u91CD\u7F6E"), /*#__PURE__*/_react.default.createElement(_antd.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.default.createElement(_antd.Badge, {
+      count: advancedQueryRules.children.length,
+      size: "small",
+      offset: [-2, 2]
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        margin: "0 4px",
+        color: advancedQueryRules.children.length > 0 ? '#1890ff' : '#000',
+        fontSize: 16,
+        cursor: "pointer"
+      }
+    }, /*#__PURE__*/_react.default.createElement(_icons.FilterOutlined, null))))]
   }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({
     theme: _theme.agGridTheme
   }, rest, {

package/dist/cjs/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/cjs/ag-grid-plus/context/useSchemeDataFlow.js

@@ -99,9 +99,10 @@ function useDerivedGridState(currentScheme, allColDefs) {
  * 派生层 - 计算列样式状态（只读派生）
  *
  * @param currentScheme - 当前列方案
+ * @param allColDefs - 原始列定义（用于检测新增列）
  * @returns 派生的列状态配置
  */
-function useDerivedColumnState(currentScheme) {
+function useDerivedColumnState(currentScheme, allColDefs) {
   return (0, _react.useMemo)(function () {
     if (!(currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig)) {
       return null;
@@ -110,15 +111,15 @@ 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]);
 }
 
 /**
@@ -152,7 +153,7 @@ 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/cjs/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;