@nokecy/qc-ui 1.1.27 → 1.1.29

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

@@ -174,39 +174,45 @@ function AgGridPlus(props) {
     _useState2 = _slicedToArray(_useState, 2),
     ready = _useState2[0],
     setReady = _useState2[1];
-  var _useState3 = (0, _react.useState)(loadingProps ? loadingProps : false),
+  // 【修复】追踪搜索表单是否已完成初始化（包含默认值）
+  // 只有当 search !== false 时才需要等待表单初始化
+  var _useState3 = (0, _react.useState)(search === false),
     _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
-  var _useState5 = (0, _react.useState)(),
+    formInitialized = _useState4[0],
+    setFormInitialized = _useState4[1];
+  var _useState5 = (0, _react.useState)(loadingProps ? loadingProps : false),
     _useState6 = _slicedToArray(_useState5, 2),
-    columnState = _useState6[0],
-    setColumnState = _useState6[1];
-  var _useState7 = (0, _react.useState)({}),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = (0, _react.useState)(),
     _useState8 = _slicedToArray(_useState7, 2),
-    columnCellClass = _useState8[0],
-    setColumnCellClass = _useState8[1];
-  var _useState9 = (0, _react.useState)([]),
+    columnState = _useState8[0],
+    setColumnState = _useState8[1];
+  var _useState9 = (0, _react.useState)({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    rowData = _useState10[0],
-    setRowData = _useState10[1];
-  var _useState11 = (0, _react.useState)({}),
+    columnCellClass = _useState10[0],
+    setColumnCellClass = _useState10[1];
+  var _useState11 = (0, _react.useState)([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    queryFilter = _useState12[0],
-    setQueryFilter = _useState12[1];
-  var _useState13 = (0, _react.useState)(),
+    rowData = _useState12[0],
+    setRowData = _useState12[1];
+  var _useState13 = (0, _react.useState)({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    sortColumn = _useState14[0],
-    setSortColumn = _useState14[1];
+    queryFilter = _useState14[0],
+    setQueryFilter = _useState14[1];
+  var _useState15 = (0, _react.useState)(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    sortColumn = _useState16[0],
+    setSortColumn = _useState16[1];
   // 初始化分页参数，支持外部传入的pageSize
-  var _useState15 = (0, _react.useState)({
+  var _useState17 = (0, _react.useState)({
       pageSize: props.pageSize !== undefined ? props.pageSize : props.hidePagination ? 10000 : 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    pagination = _useState16[0],
-    setPagination = _useState16[1];
+    _useState18 = _slicedToArray(_useState17, 2),
+    pagination = _useState18[0],
+    setPagination = _useState18[1];
 
   // ============ 方案管理 - 使用集中式 Context ============
   var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
@@ -225,16 +231,16 @@ function AgGridPlus(props) {
     getColumnSchemes = _useGridSchemes.getColumnSchemes,
     getQuerySchemes = _useGridSchemes.getQuerySchemes,
     getCurrentScheme = _useGridSchemes.getCurrentScheme;
-  var _useState17 = (0, _react.useState)([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    queryItemsOrder = _useState18[0],
-    setQueryItemsOrder = _useState18[1];
+  var _useState19 = (0, _react.useState)([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    queryItemsOrder = _useState20[0],
+    setQueryItemsOrder = _useState20[1];
 
   // 高级查询状态
-  var _useState19 = (0, _react.useState)(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    advancedPopoverOpen = _useState20[0],
-    setAdvancedPopoverOpen = _useState20[1];
+  var _useState21 = (0, _react.useState)(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    advancedPopoverOpen = _useState22[0],
+    setAdvancedPopoverOpen = _useState22[1];
   var createEmptyRuleGroup = function createEmptyRuleGroup() {
     return {
       id: (0, _uuid.v4)(),
@@ -242,10 +248,10 @@ function AgGridPlus(props) {
       children: []
     };
   };
-  var _useState21 = (0, _react.useState)(createEmptyRuleGroup),
-    _useState22 = _slicedToArray(_useState21, 2),
-    advancedQueryRules = _useState22[0],
-    setAdvancedQueryRules = _useState22[1];
+  var _useState23 = (0, _react.useState)(createEmptyRuleGroup),
+    _useState24 = _slicedToArray(_useState23, 2),
+    advancedQueryRules = _useState24[0],
+    setAdvancedQueryRules = _useState24[1];
 
   /**
    * 【P1 架构优化】使用单向数据流架构
@@ -819,9 +825,10 @@ function AgGridPlus(props) {
       paginationPageSize: pagination.pageSize,
       stableSortColumn: stableSortColumn
     };
-    if (ready && requestRef.current) {
+    if (ready && formInitialized && requestRef.current) {
       _logger.logger.debug('useEffect 触发数据请求', {
         ready: ready,
+        formInitialized: formInitialized,
         hasRequest: !!requestRef.current,
         queryFilter: stableQueryFilter,
         stableGridParams: stableGridParams,
@@ -832,7 +839,7 @@ function AgGridPlus(props) {
       });
       onRequest(stableQueryFilter);
     }
-  }, [ready, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
+  }, [ready, formInitialized, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
   var handelgridPlusColumnState = function handelgridPlusColumnState(columnState) {
     var cellMap = {};
     if ((0, _isArray2.default)(columnState)) {
@@ -1257,7 +1264,10 @@ function AgGridPlus(props) {
       onRequest && onRequest(formValues);
     },
     onInit: function onInit(defaultValues) {
+      // 【修复】先设置 queryFilter，再标记表单已初始化
+      // 这样确保首次请求时 queryFilter 已包含默认值
       setQueryFilter(defaultValues);
+      setFormInitialized(true);
     }
   }), /*#__PURE__*/_react.default.createElement(_antd.Card, {
     bordered: false,

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

@@ -57,9 +57,11 @@ var FormRender = function FormRender(props) {
       }
     });
   }, []);
-  (0, _react2.useEffect)(function () {
-    props.onInit && props.onInit(form.values);
-  }, []);
+
+  // 【修复】移除此处的 onInit 调用
+  // 原因：此时 schema 尚未设置，form.values 为空，默认值还未应用
+  // 改为在下方 schema 设置完成后调用 onInit
+
   var SchemaField = (0, _react2.useMemo)(function () {
     return (0, _react.createSchemaField)({
       components: {
@@ -193,9 +195,24 @@ var FormRender = function FormRender(props) {
     }
     return rootSchema;
   };
+
+  // 【新增】用于追踪是否已完成首次初始化
+  var initializedRef = (0, _react2.useRef)(false);
   (0, _react2.useEffect)(function () {
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
+
+    // 【修复】在 schema 设置完成后调用 onInit
+    // 使用 setTimeout 确保 Formily 有时间处理 schema 并应用默认值
+    if (!initializedRef.current) {
+      initializedRef.current = true;
+      // 使用 requestAnimationFrame + setTimeout 确保默认值已应用
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          props.onInit && props.onInit(form.values);
+        }, 0);
+      });
+    }
   }, [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (c) {
     return c.colId;
   }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (c) {

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

@@ -28,6 +28,10 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+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 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; }
@@ -170,7 +174,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
   /**
    * 合并代码中新增的列到配置中
    * 场景：用户保存列配置后，开发者在代码中新增了列，这些列应该显示在配置表格中
-   * 【增强】按照原始定义的顺序插入新增列，保留原始位置
+   * 【修复】只检测并追加新增列到末尾，不改变已保存配置的顺序
    */
   var mergeNewColumns = (0, _react.useCallback)(function (config, originalDefs) {
     if (!originalDefs || originalDefs.length === 0) {
@@ -178,93 +182,75 @@ var ColumnSetting = function ColumnSetting(_ref) {
     }
 
     // 创建 field -> config item 的映射（用于快速查找已保存的列配置）
-    var configByField = new Map();
+    var existingFields = new Set();
     config.filter(function (item) {
       return item.type === 'column' && item.field;
     }).forEach(function (item) {
-      configByField.set(item.field, item);
+      existingFields.add(item.field);
     });
 
     // 创建 groupId -> config item 的映射（用于快速查找已保存的分组配置）
-    var configByGroupId = new Map();
+    var existingGroupIds = new Set();
     config.filter(function (item) {
       return item.type === 'group' && item.groupId;
     }).forEach(function (item) {
-      configByGroupId.set(item.groupId, item);
+      existingGroupIds.add(item.groupId);
     });
-    var result = [];
-    var order = 0;
-    var hasNewColumns = false;
+
+    // 收集新增的列（在 originalDefs 中存在但 config 中不存在）
+    var newItems = [];
+    var maxOrder = Math.max.apply(Math, _toConsumableArray(config.map(function (item) {
+      return item.order;
+    })).concat([-1]));
 
     /**
-     * 递归处理列定义，按原始顺序构建结果
-     * @param defs 列定义数组
-     * @param level 当前层级
-     * @param parentId 父节点 ID（如果有）
+     * 递归处理列定义，查找新增的列和分组
      */
-    var processDefsInOrder = function processDefsInOrder(defs, level, parentId) {
+    var findNewColumns = function findNewColumns(defs, level, parentId) {
       var _iterator2 = _createForOfIteratorHelper(defs),
         _step2;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _loop = function _loop() {
           var def = _step2.value;
           // 检查是否是分组
           if ('children' in def && def.children && def.children.length > 0) {
             var groupDef = def;
             var groupIdValue = groupDef.groupId || groupDef.field || (0, _columnGroupUtils.generateId)();
-
-            // 查找已保存的分组配置
-            var existingGroup = configByGroupId.get(groupIdValue);
-            var groupItem = void 0;
-            if (existingGroup) {
-              // 使用已保存的分组配置，但更新 order 和 parentId
-              groupItem = _objectSpread(_objectSpread({}, existingGroup), {}, {
-                order: order++,
-                parentId: parentId,
-                level: level
-              });
-            } else {
+            if (!existingGroupIds.has(groupIdValue)) {
               // 新分组
-              hasNewColumns = true;
-              groupItem = {
-                id: (0, _columnGroupUtils.generateId)(),
+              var newGroupId = (0, _columnGroupUtils.generateId)();
+              newItems.push({
+                id: newGroupId,
                 type: 'group',
                 parentId: parentId,
                 level: level,
-                order: order++,
+                order: ++maxOrder,
                 headerName: groupDef.headerName || '未命名分组',
                 originalHeaderName: groupDef.headerName || '未命名分组',
                 groupId: groupIdValue,
                 marryChildren: groupDef.marryChildren
-              };
+              });
+              // 递归处理子节点（新分组的子节点也都是新的）
+              findNewColumns(groupDef.children, level + 1, newGroupId);
+            } else {
+              // 已存在的分组，但要检查子节点是否有新增
+              var existingGroup = config.find(function (item) {
+                return item.type === 'group' && item.groupId === groupIdValue;
+              });
+              findNewColumns(groupDef.children, level + 1, existingGroup === null || existingGroup === void 0 ? void 0 : existingGroup.id);
             }
-            result.push(groupItem);
-
-            // 递归处理子节点
-            processDefsInOrder(groupDef.children, level + 1, groupItem.id);
           } else {
             // 普通列
             var colDef = def;
-            if (!colDef.field) continue;
-
-            // 查找已保存的列配置
-            var existingCol = configByField.get(colDef.field);
-            if (existingCol) {
-              // 使用已保存的列配置，但更新 order 和 parentId
-              result.push(_objectSpread(_objectSpread({}, existingCol), {}, {
-                order: order++,
-                parentId: parentId,
-                level: level
-              }));
-            } else {
-              // 新列
-              hasNewColumns = true;
-              result.push({
+            if (!colDef.field) return 1; // continue
+            if (!existingFields.has(colDef.field)) {
+              // 新列 - 追加到末尾
+              newItems.push({
                 id: (0, _columnGroupUtils.generateId)(),
                 type: 'column',
                 parentId: parentId,
                 level: level,
-                order: order++,
+                order: ++maxOrder,
                 field: colDef.field,
                 headerName: colDef.headerName || colDef.field || '未命名列',
                 originalHeaderName: colDef.headerName || colDef.field || '未命名列',
@@ -277,6 +263,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
               });
             }
           }
+        };
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          if (_loop()) continue;
         }
       } catch (err) {
         _iterator2.e(err);
@@ -285,10 +274,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
       }
     };
 
-    // 从根级别开始处理
-    processDefsInOrder(originalDefs, 0);
-    if (hasNewColumns) {}
-    return result;
+    // 从根级别开始查找新增列
+    findNewColumns(originalDefs, 0);
+    if (newItems.length > 0) {
+      return [].concat(_toConsumableArray(config), newItems);
+    }
+    return config;
   }, []);
 
   /**
@@ -302,6 +293,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
       var config = fixOriginalHeaderName(currentScheme.columnConfig);
       // 【修复】检测并追加代码中新增的列到配置末尾
       config = mergeNewColumns(config, originalColumnDefs);
+      // 【修复】按 order 字段排序，确保配置弹窗显示的列顺序与保存时一致
+      config = _toConsumableArray(config).sort(function (a, b) {
+        return a.order - b.order;
+      });
       return config;
     }
 

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

@@ -166,39 +166,45 @@ function AgGridPlus(props) {
     _useState2 = _slicedToArray(_useState, 2),
     ready = _useState2[0],
     setReady = _useState2[1];
-  var _useState3 = useState(loadingProps ? loadingProps : false),
+  // 【修复】追踪搜索表单是否已完成初始化（包含默认值）
+  // 只有当 search !== false 时才需要等待表单初始化
+  var _useState3 = useState(search === false),
     _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
-  var _useState5 = useState(),
+    formInitialized = _useState4[0],
+    setFormInitialized = _useState4[1];
+  var _useState5 = useState(loadingProps ? loadingProps : false),
     _useState6 = _slicedToArray(_useState5, 2),
-    columnState = _useState6[0],
-    setColumnState = _useState6[1];
-  var _useState7 = useState({}),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    columnCellClass = _useState8[0],
-    setColumnCellClass = _useState8[1];
-  var _useState9 = useState([]),
+    columnState = _useState8[0],
+    setColumnState = _useState8[1];
+  var _useState9 = useState({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    rowData = _useState10[0],
-    setRowData = _useState10[1];
-  var _useState11 = useState({}),
+    columnCellClass = _useState10[0],
+    setColumnCellClass = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    queryFilter = _useState12[0],
-    setQueryFilter = _useState12[1];
-  var _useState13 = useState(),
+    rowData = _useState12[0],
+    setRowData = _useState12[1];
+  var _useState13 = useState({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    sortColumn = _useState14[0],
-    setSortColumn = _useState14[1];
+    queryFilter = _useState14[0],
+    setQueryFilter = _useState14[1];
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    sortColumn = _useState16[0],
+    setSortColumn = _useState16[1];
   // 初始化分页参数，支持外部传入的pageSize
-  var _useState15 = useState({
+  var _useState17 = useState({
       pageSize: props.pageSize !== undefined ? props.pageSize : props.hidePagination ? 10000 : 200,
       current: 1,
       total: dataSource ? dataSource.length : 0
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    pagination = _useState16[0],
-    setPagination = _useState16[1];
+    _useState18 = _slicedToArray(_useState17, 2),
+    pagination = _useState18[0],
+    setPagination = _useState18[1];
 
   // ============ 方案管理 - 使用集中式 Context ============
   var _useGridSchemes = useGridSchemes(),
@@ -217,16 +223,16 @@ function AgGridPlus(props) {
     getColumnSchemes = _useGridSchemes.getColumnSchemes,
     getQuerySchemes = _useGridSchemes.getQuerySchemes,
     getCurrentScheme = _useGridSchemes.getCurrentScheme;
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    queryItemsOrder = _useState18[0],
-    setQueryItemsOrder = _useState18[1];
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    queryItemsOrder = _useState20[0],
+    setQueryItemsOrder = _useState20[1];
 
   // 高级查询状态
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    advancedPopoverOpen = _useState20[0],
-    setAdvancedPopoverOpen = _useState20[1];
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    advancedPopoverOpen = _useState22[0],
+    setAdvancedPopoverOpen = _useState22[1];
   var createEmptyRuleGroup = function createEmptyRuleGroup() {
     return {
       id: uuidv4(),
@@ -234,10 +240,10 @@ function AgGridPlus(props) {
       children: []
     };
   };
-  var _useState21 = useState(createEmptyRuleGroup),
-    _useState22 = _slicedToArray(_useState21, 2),
-    advancedQueryRules = _useState22[0],
-    setAdvancedQueryRules = _useState22[1];
+  var _useState23 = useState(createEmptyRuleGroup),
+    _useState24 = _slicedToArray(_useState23, 2),
+    advancedQueryRules = _useState24[0],
+    setAdvancedQueryRules = _useState24[1];
 
   /**
    * 【P1 架构优化】使用单向数据流架构
@@ -811,9 +817,10 @@ function AgGridPlus(props) {
       paginationPageSize: pagination.pageSize,
       stableSortColumn: stableSortColumn
     };
-    if (ready && requestRef.current) {
+    if (ready && formInitialized && requestRef.current) {
       logger.debug('useEffect 触发数据请求', {
         ready: ready,
+        formInitialized: formInitialized,
         hasRequest: !!requestRef.current,
         queryFilter: stableQueryFilter,
         stableGridParams: stableGridParams,
@@ -824,7 +831,7 @@ function AgGridPlus(props) {
       });
       onRequest(stableQueryFilter);
     }
-  }, [ready, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
+  }, [ready, formInitialized, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
   var handelgridPlusColumnState = function handelgridPlusColumnState(columnState) {
     var cellMap = {};
     if (_isArray(columnState)) {
@@ -1249,7 +1256,10 @@ function AgGridPlus(props) {
       onRequest && onRequest(formValues);
     },
     onInit: function onInit(defaultValues) {
+      // 【修复】先设置 queryFilter，再标记表单已初始化
+      // 这样确保首次请求时 queryFilter 已包含默认值
       setQueryFilter(defaultValues);
+      setFormInitialized(true);
     }
   }), /*#__PURE__*/React.createElement(Card, {
     bordered: false,

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

@@ -16,7 +16,7 @@ import { onFieldInit } from '@formily/core';
 import { createSchemaField } from '@formily/react';
 import { Button } from 'antd';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import QueryForm from "./queryForm";
 import BoolSelect from "../_utils/boolSelect";
 import "./index.less";
@@ -49,9 +49,11 @@ var FormRender = function FormRender(props) {
       }
     });
   }, []);
-  useEffect(function () {
-    props.onInit && props.onInit(form.values);
-  }, []);
+
+  // 【修复】移除此处的 onInit 调用
+  // 原因：此时 schema 尚未设置，form.values 为空，默认值还未应用
+  // 改为在下方 schema 设置完成后调用 onInit
+
   var SchemaField = useMemo(function () {
     return createSchemaField({
       components: {
@@ -185,9 +187,24 @@ var FormRender = function FormRender(props) {
     }
     return rootSchema;
   };
+
+  // 【新增】用于追踪是否已完成首次初始化
+  var initializedRef = useRef(false);
   useEffect(function () {
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
+
+    // 【修复】在 schema 设置完成后调用 onInit
+    // 使用 setTimeout 确保 Formily 有时间处理 schema 并应用默认值
+    if (!initializedRef.current) {
+      initializedRef.current = true;
+      // 使用 requestAnimationFrame + setTimeout 确保默认值已应用
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          props.onInit && props.onInit(form.values);
+        }, 0);
+      });
+    }
   }, [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (c) {
     return c.colId;
   }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (c) {