@nokecy/qc-ui 1.1.22 → 1.1.24

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

@@ -4,9 +4,10 @@ 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"));
+var _gridifyClient = require("gridify-client");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -19,8 +20,106 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _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; }
+// Gridify 值转义函数
 var esc = function esc(v) {
-  return v.replace(/([(),|,\\]|\/i)/g, '\\$1');
+  return String(v).replace(/([(),|,\\]|\/i)/g, '\\$1');
+};
+
+/**
+ * 将高级查询规则转换为后端 Gridify Filter 字符串
+ * 使用 gridify-client 库确保安全性和兼容性
+ */
+var convertRulesToFilterString = exports.convertRulesToFilterString = function convertRulesToFilterString(ruleGroup, colDefs) {
+  if (!ruleGroup || !ruleGroup.children || ruleGroup.children.length === 0) {
+    return "";
+  }
+  var mapOperator = function mapOperator(op) {
+    switch (op) {
+      case '=':
+        return _gridifyClient.ConditionalOperator.Equal;
+      case '!=':
+        return _gridifyClient.ConditionalOperator.NotEqual;
+      case '>':
+        return _gridifyClient.ConditionalOperator.GreaterThan;
+      case '>=':
+        return _gridifyClient.ConditionalOperator.GreaterThanOrEqual;
+      case '<':
+        return _gridifyClient.ConditionalOperator.LessThan;
+      case '<=':
+        return _gridifyClient.ConditionalOperator.LessThanOrEqual;
+      case 'contains':
+        return _gridifyClient.ConditionalOperator.Contains;
+      case 'startsWith':
+        return _gridifyClient.ConditionalOperator.StartsWith;
+      case 'endsWith':
+        return _gridifyClient.ConditionalOperator.EndsWith;
+      default:
+        return _gridifyClient.ConditionalOperator.Equal;
+    }
+  };
+  var processItem = function processItem(builder, item, isFirst) {
+    if (item.logic) {
+      // 嵌套组
+      builder.startGroup();
+      processGroup(builder, item);
+      builder.endGroup();
+    } else {
+      // 单条规则
+      if (item.value === undefined || item.value === null || item.value === '') {
+        return;
+      }
+
+      // 处理特殊操作符
+      if (item.operator === 'isEmpty') {
+        builder.addCondition(item.field, _gridifyClient.ConditionalOperator.Equal, '');
+      } else if (item.operator === 'isNotEmpty') {
+        builder.addCondition(item.field, _gridifyClient.ConditionalOperator.NotEqual, '');
+      } else if (item.operator === 'between' && Array.isArray(item.value)) {
+        // between 操作符需要拆成两个条件
+        if (item.value[0] !== null && item.value[0] !== undefined) {
+          builder.addCondition(item.field, _gridifyClient.ConditionalOperator.GreaterThanOrEqual, item.value[0], undefined, true);
+        }
+        if (item.value[1] !== null && item.value[1] !== undefined) {
+          if (item.value[0] !== null && item.value[0] !== undefined) {
+            builder.and();
+          }
+          builder.addCondition(item.field, _gridifyClient.ConditionalOperator.LessThanOrEqual, item.value[1], undefined, true);
+        }
+      } else {
+        var gridifyOp = mapOperator(item.operator);
+        // escapeValue = true 确保特殊字符（如 / , | ( ) \）被正确转义
+        builder.addCondition(item.field, gridifyOp, item.value, undefined, true);
+      }
+    }
+  };
+  var processGroup = function processGroup(builder, group) {
+    var validChildren = group.children.filter(function (child) {
+      if (child.logic) return true;
+      return child.value !== undefined && child.value !== null && child.value !== '';
+    });
+    validChildren.forEach(function (child, index) {
+      if (index > 0) {
+        // 根据组逻辑添加连接符
+        if (group.logic === 'OR') {
+          builder.or(true); // true = optional, 避免无效表达式
+        } else {
+          builder.and(true);
+        }
+      }
+      processItem(builder, child, index === 0);
+    });
+  };
+  try {
+    var builder = new _gridifyClient.GridifyQueryBuilder({
+      allowEmptyGroups: true
+    });
+    processGroup(builder, ruleGroup);
+    var query = builder.build();
+    return query.filter || "";
+  } catch (e) {
+    console.error('Failed to build Gridify filter:', e);
+    return "";
+  }
 };
 var getFilter = function getFilter(objectKey, value, colDef) {
   if (typeof value === 'string') {

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/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;