@nokecy/qc-ui 1.1.86 → 1.1.88

package/dist/esm/ag-grid-plus/locale.d.ts

@@ -1,3 +1,4 @@
+/** 包含 AG Grid 全部中文词条，避免组件局部配置覆盖宿主语言包后菜单回退英文。@author nokecy */
 export declare const localeText: {
     page: string;
     more: string;
@@ -138,7 +139,7 @@ export declare const localeText: {
     toolPanelButton: string;
     noRowsToShow: string;
     valueAggregation: string;
-    autosizeThiscolumn: string;
+    autosizeThisColumn: string;
     autosizeAllColumns: string;
     groupBy: string;
     ungroupBy: string;
@@ -159,4 +160,415 @@ export declare const localeText: {
     totalAndFilteredRows: string;
     and: string;
     or: string;
+    selectAllSearchResults: string;
+    addCurrentSelectionToFilter: string;
+    noMatches: string;
+    blank: string;
+    notBlank: string;
+    empty: string;
+    inRangeStart: string;
+    inRangeEnd: string;
+    before: string;
+    after: string;
+    andCondition: string;
+    orCondition: string;
+    resetFilter: string;
+    clearFilter: string;
+    cancelFilter: string;
+    textFilter: string;
+    numberFilter: string;
+    dateFilter: string;
+    setFilter: string;
+    groupFilterSelect: string;
+    advancedFilterContains: string;
+    advancedFilterNotContains: string;
+    advancedFilterTextEquals: string;
+    advancedFilterTextNotEqual: string;
+    advancedFilterStartsWith: string;
+    advancedFilterEndsWith: string;
+    advancedFilterBlank: string;
+    advancedFilterNotBlank: string;
+    advancedFilterEquals: string;
+    advancedFilterNotEqual: string;
+    advancedFilterGreaterThan: string;
+    advancedFilterGreaterThanOrEqual: string;
+    advancedFilterLessThan: string;
+    advancedFilterLessThanOrEqual: string;
+    advancedFilterTrue: string;
+    advancedFilterFalse: string;
+    advancedFilterAnd: string;
+    advancedFilterOr: string;
+    advancedFilterApply: string;
+    advancedFilterBuilder: string;
+    advancedFilterValidationMissingColumn: string;
+    advancedFilterValidationMissingOption: string;
+    advancedFilterValidationMissingValue: string;
+    advancedFilterValidationInvalidColumn: string;
+    advancedFilterValidationInvalidOption: string;
+    advancedFilterValidationMissingQuote: string;
+    advancedFilterValidationNotANumber: string;
+    advancedFilterValidationInvalidDate: string;
+    advancedFilterValidationMissingCondition: string;
+    advancedFilterValidationJoinOperatorMismatch: string;
+    advancedFilterValidationInvalidJoinOperator: string;
+    advancedFilterValidationMissingEndBracket: string;
+    advancedFilterValidationExtraEndBracket: string;
+    advancedFilterValidationMessage: string;
+    advancedFilterValidationMessageAtEnd: string;
+    advancedFilterBuilderTitle: string;
+    advancedFilterBuilderApply: string;
+    advancedFilterBuilderCancel: string;
+    advancedFilterBuilderAddButtonTooltip: string;
+    advancedFilterBuilderRemoveButtonTooltip: string;
+    advancedFilterBuilderMoveUpButtonTooltip: string;
+    advancedFilterBuilderMoveDownButtonTooltip: string;
+    advancedFilterBuilderAddJoin: string;
+    advancedFilterBuilderAddCondition: string;
+    advancedFilterBuilderSelectColumn: string;
+    advancedFilterBuilderSelectOption: string;
+    advancedFilterBuilderEnterValue: string;
+    advancedFilterBuilderValidationAlreadyApplied: string;
+    advancedFilterBuilderValidationIncomplete: string;
+    advancedFilterBuilderValidationSelectColumn: string;
+    advancedFilterBuilderValidationSelectOption: string;
+    advancedFilterBuilderValidationEnterValue: string;
+    filters: string;
+    pivotMode: string;
+    groups: string;
+    values: string;
+    pivots: string;
+    rowDragRow: string;
+    rowDragRows: string;
+    loadingError: string;
+    enabled: string;
+    noAggregation: string;
+    ungroupAll: string;
+    addToValues: string;
+    removeFromValues: string;
+    addToLabels: string;
+    removeFromLabels: string;
+    ctrlX: string;
+    columnFilter: string;
+    columnChooser: string;
+    chooseColumns: string;
+    sortAscending: string;
+    sortDescending: string;
+    sortUnSort: string;
+    pageLastRowUnknown: string;
+    nextPage: string;
+    lastPage: string;
+    firstPage: string;
+    previousPage: string;
+    pageSizeSelectorLabel: string;
+    footerTotal: string;
+    statusBarLastRowUnknown: string;
+    scrollColumnIntoView: string;
+    pivotColumnGroupTotals: string;
+    pivotChartAndPivotMode: string;
+    donut: string;
+    stackedLine: string;
+    normalizedLine: string;
+    scatter: string;
+    bubble: string;
+    polarChart: string;
+    radarLine: string;
+    radarArea: string;
+    nightingale: string;
+    radialColumn: string;
+    radialBar: string;
+    statisticalChart: string;
+    boxPlot: string;
+    rangeBar: string;
+    rangeArea: string;
+    hierarchicalChart: string;
+    treemap: string;
+    sunburst: string;
+    specializedChart: string;
+    waterfall: string;
+    heatmap: string;
+    AreaColumnCombo: string;
+    defaultCategory: string;
+    switchCategorySeries: string;
+    categoryValues: string;
+    seriesLabels: string;
+    aggregate: string;
+    xyValues: string;
+    paired: string;
+    xAxis: string;
+    yAxis: string;
+    polarAxis: string;
+    radiusAxis: string;
+    navigator: string;
+    zoom: string;
+    animation: string;
+    crosshair: string;
+    preferredLength: string;
+    xType: string;
+    axisType: string;
+    automatic: string;
+    category: string;
+    number: string;
+    time: string;
+    timeFormat: string;
+    autoRotate: string;
+    labelRotation: string;
+    circle: string;
+    polygon: string;
+    square: string;
+    cross: string;
+    diamond: string;
+    plus: string;
+    triangle: string;
+    heart: string;
+    orientation: string;
+    fixed: string;
+    parallel: string;
+    perpendicular: string;
+    radiusAxisPosition: string;
+    gridLines: string;
+    spacing: string;
+    chartStyle: string;
+    chartTitles: string;
+    chartTitle: string;
+    chartSubtitle: string;
+    horizontalAxisTitle: string;
+    verticalAxisTitle: string;
+    polarAxisTitle: string;
+    titlePlaceholder: string;
+    weight: string;
+    calloutLabels: string;
+    sectorLabels: string;
+    positionRatio: string;
+    shape: string;
+    minSize: string;
+    maxSize: string;
+    itemSpacing: string;
+    layoutHorizontalSpacing: string;
+    layoutVerticalSpacing: string;
+    lineDash: string;
+    lineDashOffset: string;
+    scrollingZoom: string;
+    scrollingStep: string;
+    selectingZoom: string;
+    durationMillis: string;
+    crosshairLabel: string;
+    crosshairSnap: string;
+    strokeColor: string;
+    miniChart: string;
+    seriesItems: string;
+    seriesItemType: string;
+    seriesItemPositive: string;
+    seriesItemNegative: string;
+    seriesItemLabels: string;
+    columnGroup: string;
+    barGroup: string;
+    pieGroup: string;
+    lineGroup: string;
+    scatterGroup: string;
+    areaGroup: string;
+    polarGroup: string;
+    statisticalGroup: string;
+    hierarchicalGroup: string;
+    specializedGroup: string;
+    combinationGroup: string;
+    groupedColumnTooltip: string;
+    stackedColumnTooltip: string;
+    normalizedColumnTooltip: string;
+    groupedBarTooltip: string;
+    stackedBarTooltip: string;
+    normalizedBarTooltip: string;
+    pieTooltip: string;
+    donutTooltip: string;
+    lineTooltip: string;
+    stackedLineTooltip: string;
+    normalizedLineTooltip: string;
+    groupedAreaTooltip: string;
+    stackedAreaTooltip: string;
+    normalizedAreaTooltip: string;
+    scatterTooltip: string;
+    bubbleTooltip: string;
+    histogramTooltip: string;
+    radialColumnTooltip: string;
+    radialBarTooltip: string;
+    radarLineTooltip: string;
+    radarAreaTooltip: string;
+    nightingaleTooltip: string;
+    rangeBarTooltip: string;
+    rangeAreaTooltip: string;
+    boxPlotTooltip: string;
+    treemapTooltip: string;
+    sunburstTooltip: string;
+    waterfallTooltip: string;
+    heatmapTooltip: string;
+    columnLineComboTooltip: string;
+    areaColumnComboTooltip: string;
+    customComboTooltip: string;
+    innerRadius: string;
+    startAngle: string;
+    endAngle: string;
+    reverseDirection: string;
+    seriesPadding: string;
+    tile: string;
+    whisker: string;
+    cap: string;
+    capLengthRatio: string;
+    labelPlacement: string;
+    inside: string;
+    outside: string;
+    noDataToChart: string;
+    pivotChartRequiresPivotMode: string;
+    chartSettingsToolbarTooltip: string;
+    chartLinkToolbarTooltip: string;
+    chartUnlinkToolbarTooltip: string;
+    chartDownloadToolbarTooltip: string;
+    chartMenuToolbarTooltip: string;
+    chartEdit: string;
+    chartAdvancedSettings: string;
+    chartLink: string;
+    chartUnlink: string;
+    chartDownload: string;
+    histogramFrequency: string;
+    seriesChartType: string;
+    secondaryAxis: string;
+    seriesAdd: string;
+    categoryAdd: string;
+    bar: string;
+    column: string;
+    histogram: string;
+    advancedSettings: string;
+    direction: string;
+    horizontal: string;
+    vertical: string;
+    seriesGroupType: string;
+    groupedSeriesGroupType: string;
+    stackedSeriesGroupType: string;
+    normalizedSeriesGroupType: string;
+    legendEnabled: string;
+    invalidColor: string;
+    groupedColumnFull: string;
+    stackedColumnFull: string;
+    normalizedColumnFull: string;
+    groupedBarFull: string;
+    stackedBarFull: string;
+    normalizedBarFull: string;
+    stackedAreaFull: string;
+    normalizedAreaFull: string;
+    customCombo: string;
+    funnel: string;
+    coneFunnel: string;
+    pyramid: string;
+    funnelGroup: string;
+    funnelTooltip: string;
+    coneFunnelTooltip: string;
+    pyramidTooltip: string;
+    dropOff: string;
+    stageLabels: string;
+    reverse: string;
+    ariaAdvancedFilterBuilderItem: string;
+    ariaAdvancedFilterBuilderItemValidation: string;
+    ariaAdvancedFilterBuilderList: string;
+    ariaAdvancedFilterBuilderFilterItem: string;
+    ariaAdvancedFilterBuilderGroupItem: string;
+    ariaAdvancedFilterBuilderColumn: string;
+    ariaAdvancedFilterBuilderOption: string;
+    ariaAdvancedFilterBuilderValueP: string;
+    ariaAdvancedFilterBuilderJoinOperator: string;
+    ariaAdvancedFilterInput: string;
+    ariaChecked: string;
+    ariaColumn: string;
+    ariaColumnGroup: string;
+    ariaColumnFiltered: string;
+    ariaColumnSelectAll: string;
+    ariaDateFilterInput: string;
+    ariaDefaultListName: string;
+    ariaFilterColumnsInput: string;
+    ariaFilterFromValue: string;
+    ariaFilterInput: string;
+    ariaFilterList: string;
+    ariaFilterToValue: string;
+    ariaFilterValue: string;
+    ariaFilterMenuOpen: string;
+    ariaFilteringOperator: string;
+    ariaHidden: string;
+    ariaIndeterminate: string;
+    ariaInputEditor: string;
+    ariaMenuColumn: string;
+    ariaFilterColumn: string;
+    ariaRowDeselect: string;
+    ariaHeaderSelection: string;
+    ariaSelectAllCells: string;
+    ariaRowSelectAll: string;
+    ariaRowToggleSelection: string;
+    ariaRowSelect: string;
+    ariaRowSelectionDisabled: string;
+    ariaSearch: string;
+    ariaSortableColumn: string;
+    ariaToggleVisibility: string;
+    ariaToggleCellValue: string;
+    ariaUnchecked: string;
+    ariaVisible: string;
+    ariaSearchFilterValues: string;
+    ariaPageSizeSelectorLabel: string;
+    ariaChartMenuClose: string;
+    ariaChartSelected: string;
+    ariaSkeletonCellLoadingFailed: string;
+    ariaSkeletonCellLoading: string;
+    ariaRowGroupDropZonePanelLabel: string;
+    ariaValuesDropZonePanelLabel: string;
+    ariaPivotDropZonePanelLabel: string;
+    ariaDropZoneColumnComponentDescription: string;
+    ariaDropZoneColumnValueItemDescription: string;
+    ariaDropZoneColumnGroupItemDescription: string;
+    ariaDropZoneColumnComponentAggFuncSeparator: string;
+    ariaDropZoneColumnComponentSortAscending: string;
+    ariaDropZoneColumnComponentSortDescending: string;
+    ariaLabelDialog: string;
+    ariaLabelColumnMenu: string;
+    ariaLabelColumnFilter: string;
+    ariaLabelCellEditor: string;
+    ariaLabelSelectField: string;
+    ariaLabelLoadingContextMenu: string;
+    ariaLabelRichSelectField: string;
+    ariaLabelRichSelectToggleSelection: string;
+    ariaLabelRichSelectDeselectAllItems: string;
+    ariaLabelRichSelectDeleteSelection: string;
+    ariaLabelTooltip: string;
+    ariaLabelContextMenu: string;
+    ariaLabelSubMenu: string;
+    ariaLabelAggregationFunction: string;
+    ariaLabelAdvancedFilterAutocomplete: string;
+    ariaLabelAdvancedFilterBuilderAddField: string;
+    ariaLabelAdvancedFilterBuilderColumnSelectField: string;
+    ariaLabelAdvancedFilterBuilderOptionSelectField: string;
+    ariaLabelAdvancedFilterBuilderJoinSelectField: string;
+    ariaColumnPanelList: string;
+    ariaFilterPanelList: string;
+    thousandSeparator: string;
+    decimalSeparator: string;
+    true: string;
+    false: string;
+    invalidDate: string;
+    invalidNumber: string;
+    january: string;
+    february: string;
+    march: string;
+    april: string;
+    may: string;
+    june: string;
+    july: string;
+    august: string;
+    september: string;
+    october: string;
+    november: string;
+    december: string;
+    timeFormatSlashesDDMMYYYY: string;
+    timeFormatSlashesMMDDYYYY: string;
+    timeFormatSlashesDDMMYY: string;
+    timeFormatSlashesMMDDYY: string;
+    timeFormatDotsDDMYY: string;
+    timeFormatDotsMDDYY: string;
+    timeFormatDashesYYYYMMDD: string;
+    timeFormatSpacesDDMMMMYYYY: string;
+    timeFormatHHMMSS: string;
+    timeFormatHHMMSSAmPm: string;
 };

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

@@ -1,4 +1,13 @@
-export var localeText = {
+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); }
+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; }
+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); }
+import { AG_GRID_LOCALE_CN } from '@ag-grid-community/locale';
+
+/** QC_UI 在完整 AG Grid 中文包上覆写公司约定用语。@author nokecy */
+var localeTextOverrides = {
   // for filter panel
   page: '页',
   more: '更多',
@@ -148,7 +157,7 @@ export var localeText = {
   toolPanelButton: '工具面板按钮',
   noRowsToShow: '暂无数据',
   valueAggregation: '值聚合',
-  autosizeThiscolumn: '自动调整此列',
+  autosizeThisColumn: '自动调整此列',
   autosizeAllColumns: '自动调整所有列',
   groupBy: '按此列分组',
   ungroupBy: '取消此列分组',
@@ -169,4 +178,7 @@ export var localeText = {
   totalAndFilteredRows: '行',
   and: '和',
   or: '或'
-};
+};
+
+/** 包含 AG Grid 全部中文词条，避免组件局部配置覆盖宿主语言包后菜单回退英文。@author nokecy */
+export var localeText = _objectSpread(_objectSpread({}, AG_GRID_LOCALE_CN), localeTextOverrides);

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

@@ -5,6 +5,8 @@ declare const FormRender: (props: {
     className?: any;
     gridApi?: GridApi<any> | undefined;
     colDefs: ColDef[];
+    /** 与表格同轮渲染的生效列定义快照。@author nokecy */
+    effectiveColDefs?: ColDef<any, any>[] | undefined;
     columnStates: ColumnState[];
     defaultExpand?: Boolean | undefined;
     defaultRows?: number | undefined;

package/dist/esm/ag-grid-plus/queryForm/index.js

@@ -12,26 +12,28 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DatePicker, FormButtonGroup, FormGrid, FormItem, Form, Input, Select, Submit } from '@formily/antd-v5'; // @author nokecy
 import { createForm } from '@formily/core';
-import { onFieldInit } from '@formily/core';
 import { createSchemaField } from '@formily/react';
 import { Button, theme } from 'antd';
 import classNames from 'classnames';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import QueryForm from "./queryForm";
 import { queryFormSchemaKey } from "./schemaKey";
+import { resolveQueryColumns } from "./queryColumns";
 import BoolSelect from "../_utils/boolSelect";
 import "./index.less";
 var FormRender = function FormRender(props) {
   var className = props.className,
-    gridApi = props.gridApi,
     colDefs = props.colDefs,
+    _props$effectiveColDe = props.effectiveColDefs,
+    effectiveColDefs = _props$effectiveColDe === void 0 ? colDefs : _props$effectiveColDe,
     columnStates = props.columnStates,
     onQuery = props.onQuery,
     _props$defaultRows = props.defaultRows,
     defaultRows = _props$defaultRows === void 0 ? 1 : _props$defaultRows;
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token; // 筛选区跟随宿主主题。@author nokecy
-
+  var queryColumns = resolveQueryColumns(colDefs, effectiveColDefs, columnStates);
+  var schemaKey = queryFormSchemaKey(undefined, queryColumns);
   var _useState = useState({
       type: 'object',
       properties: {}
@@ -39,25 +41,11 @@ var FormRender = function FormRender(props) {
     _useState2 = _slicedToArray(_useState, 2),
     schema = _useState2[0],
     setSchema = _useState2[1];
+
+  // 表单与 SchemaField 实例保持稳定，元数据更新不清空已输入的查询值。@author nokecy
   var form = useMemo(function () {
-    return createForm({
-      effects: function effects() {
-        return [onFieldInit('queryForm', function (field) {
-          field.query('queryForm').take(function (node) {
-            node.setComponentProps({
-              onReset: onReset,
-              defaultExpand: props.defaultExpand
-            });
-          });
-        })];
-      }
-    });
+    return createForm();
   }, []);
-
-  // 【修复】移除此处的 onInit 调用
-  // 原因：此时 schema 尚未设置，form.values 为空，默认值还未应用
-  // 改为在下方 schema 设置完成后调用 onInit
-
   var SchemaField = useMemo(function () {
     return createSchemaField({
       components: {
@@ -73,7 +61,7 @@ var FormRender = function FormRender(props) {
         BoolSelect: BoolSelect
       }
     });
-  }, [schema]);
+  }, []);
   var onSubmit = function onSubmit() {
     onQuery && onQuery(form.values);
   };
@@ -113,47 +101,31 @@ var FormRender = function FormRender(props) {
       return component ? component : "Input";
     }
   };
-  var getSchema = function getSchema(reset) {
-    var _columns, _columns2;
+  var getSchema = function getSchema() {
     var rootSchema = {
       type: 'object',
       properties: {}
     };
-    if (!columnStates) {
-      return rootSchema;
-    }
     var gridSchema = {
       type: 'void',
       "name": 'queryForm',
       "x-component": 'QueryForm',
       properties: {},
       "x-component-props": {
-        defaultRows: defaultRows // 在这里添加defaultRows参数
+        defaultRows: defaultRows,
+        defaultExpand: props.defaultExpand,
+        onReset: onReset
       }
     };
-    var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
-      var _searchComponentProps;
-      var state = columnStates.find(function (x) {
-        return x.colId == colDef.field;
-      });
-      var columnDefs = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(colDef.field);
-      // 查询组件属性（下拉选项）以本次传入的列为准：AG Grid 在本副作用之后才应用新 columnDefs，此刻取到的还是上一版。@author nokecy
-      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colDef), columnDefs), state), {}, {
-        searchComponentProps: (_searchComponentProps = colDef.searchComponentProps) !== null && _searchComponentProps !== void 0 ? _searchComponentProps : columnDefs === null || columnDefs === void 0 ? void 0 : columnDefs.searchComponentProps
-      });
-    });
-    columns = columns ? (_columns = columns) === null || _columns === void 0 ? void 0 : _columns.filter(function (i) {
-      return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);
-    }) : [];
-    columns.map(function (col) {
-      var _colDef$queryField;
+    queryColumns.forEach(function (col) {
+      var _colDef$queryField, _colDef$searchTitle;
       var colDef = col;
       var name = (_colDef$queryField = colDef.queryField) !== null && _colDef$queryField !== void 0 ? _colDef$queryField : colDef.field;
-      var headerName = colDef.headerName;
+      var headerName = (_colDef$searchTitle = colDef.searchTitle) !== null && _colDef$searchTitle !== void 0 ? _colDef$searchTitle : colDef.headerName;
       //表单自定义组件
       var component = getComponent(colDef);
       if (colDef.filter != false) {
-        var _colDef$searchCompone, _colDef$searchCompone2, _colDef$searchCompone3;
+        var _colDef$searchCompone, _colDef$searchCompone2, _colDef$searchCompone3, _colDef$searchCompone4;
         // 为多选下拉框添加maxTagCount配置
         var componentProps = _objectSpread({
           placeholder: "\u8BF7\u8F93\u5165".concat(headerName),
@@ -175,7 +147,7 @@ var FormRender = function FormRender(props) {
           type: 'string',
           title: headerName,
           required: (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.required) || false,
-          default: (colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default) || (colDef === null || colDef === void 0 || (_colDef$searchCompone3 = colDef.searchComponentProps) === null || _colDef$searchCompone3 === void 0 ? void 0 : _colDef$searchCompone3.defaultValue),
+          default: (_colDef$searchCompone2 = colDef === null || colDef === void 0 || (_colDef$searchCompone3 = colDef.searchComponentProps) === null || _colDef$searchCompone3 === void 0 ? void 0 : _colDef$searchCompone3.default) !== null && _colDef$searchCompone2 !== void 0 ? _colDef$searchCompone2 : colDef === null || colDef === void 0 || (_colDef$searchCompone4 = colDef.searchComponentProps) === null || _colDef$searchCompone4 === void 0 ? void 0 : _colDef$searchCompone4.defaultValue,
           enum: colDef === null || colDef === void 0 ? void 0 : colDef.enum,
           "x-component": component,
           "x-component-props": componentProps,
@@ -190,7 +162,7 @@ var FormRender = function FormRender(props) {
     });
     ///@ts-ignore
     rootSchema.properties["queryForm"] = gridSchema;
-    if (!((_columns2 = columns) !== null && _columns2 !== void 0 && _columns2.length)) {
+    if (!queryColumns.length) {
       ///@ts-ignore
       delete rootSchema.properties["queryForm"];
     }
@@ -199,18 +171,40 @@ var FormRender = function FormRender(props) {
 
   // 【新增】用于追踪是否已完成首次初始化
   var initializedRef = useRef(false);
+  var previousFieldsRef = useRef([]);
   useEffect(function () {
     var _new_schema$propertie, _new_schema$propertie2;
-    var new_schema = getSchema(onReset);
+    var new_schema = getSchema();
+    var fieldSchemas = (_new_schema$propertie = (_new_schema$propertie2 = new_schema.properties) === null || _new_schema$propertie2 === void 0 || (_new_schema$propertie2 = _new_schema$propertie2.queryForm) === null || _new_schema$propertie2 === void 0 ? void 0 : _new_schema$propertie2.properties) !== null && _new_schema$propertie !== void 0 ? _new_schema$propertie : {};
+    // 移除失效查询项的字段图和值，避免界面已经移除却仍提交旧筛选。@author nokecy
+    previousFieldsRef.current.filter(function (name) {
+      return !(name in fieldSchemas);
+    }).forEach(function (name) {
+      form.clearFormGraph(name);
+      form.deleteValuesIn(name);
+      form.deleteInitialValuesIn(name);
+    });
+    previousFieldsRef.current = Object.keys(fieldSchemas);
     setSchema(new_schema);
-    // Formily 只在字段首次创建时读取 schema：已有查询项要把新标题、组件属性（如下拉选项）写回字段。@author nokecy
-    Object.entries((_new_schema$propertie = (_new_schema$propertie2 = new_schema.properties) === null || _new_schema$propertie2 === void 0 || (_new_schema$propertie2 = _new_schema$propertie2.queryForm) === null || _new_schema$propertie2 === void 0 ? void 0 : _new_schema$propertie2.properties) !== null && _new_schema$propertie !== void 0 ? _new_schema$propertie : {}).forEach(function (_ref) {
+    // 已有字段同步元数据，不触碰仍有效字段的查询值，也不触发查询。@author nokecy
+    Object.entries(fieldSchemas).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
         name = _ref2[0],
         fieldSchema = _ref2[1];
       form.query(name).take(function (field) {
+        var _fieldSchema$enum;
         field.title = fieldSchema.title;
-        field.setComponentProps(fieldSchema['x-component-props']);
+        field.required = fieldSchema.required;
+        // Select 会把 dataSource 映射为 options；仅配置 options 时也同步该数据源。@author nokecy
+        field.dataSource = (_fieldSchema$enum = fieldSchema.enum) !== null && _fieldSchema$enum !== void 0 ? _fieldSchema$enum : fieldSchema['x-component-props'].options;
+        field.component = [fieldSchema['x-component'], fieldSchema['x-component-props']];
+      });
+    });
+    form.query('queryForm').take(function (field) {
+      return field.setComponentProps({
+        defaultRows: defaultRows,
+        defaultExpand: props.defaultExpand,
+        onReset: onReset
       });
     });
 
@@ -225,7 +219,7 @@ var FormRender = function FormRender(props) {
         }, 0);
       });
     }
-  }, [queryFormSchemaKey(columnStates, colDefs)]);
+  }, [schemaKey, defaultRows, props.defaultExpand]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, "ag-grid-table-search ag-grid-table-search-query-filter"),
     style: {
@@ -234,6 +228,7 @@ var FormRender = function FormRender(props) {
   }, /*#__PURE__*/React.createElement(Form, {
     form: form,
     labelWidth: 100,
+    labelWrap: true,
     feedbackLayout: "none",
     onAutoSubmit: onSubmit
   }, /*#__PURE__*/React.createElement(SchemaField, {

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

@@ -0,0 +1,8 @@
+import type { ColumnState } from 'ag-grid-community';
+import type { ExtendedColDef } from '../types';
+/**
+ * 从同一轮渲染的列定义快照派生查询项，不在副作用中读取 AG Grid 的上一轮定义。
+ * 表头名称跟随生效列方案；查询专用元数据和独立标题由页面声明。
+ * @author nokecy
+ */
+export declare const resolveQueryColumns: (sourceColumns: readonly ExtendedColDef[], effectiveColumns: readonly ExtendedColDef[], columnStates: readonly ColumnState[]) => ExtendedColDef[];