@nokecy/qc-ui 1.1.38 → 1.1.39

package/dist/cjs/formDesigner/FormDesigner.js

@@ -62,7 +62,7 @@ var FormDesigner = function FormDesigner(props) {
   }, [name]);
   var getComponents = function getComponents() {
     var components = {};
-    businessComponents.map(function (x) {
+    businessComponents.forEach(function (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;
@@ -72,7 +72,7 @@ var FormDesigner = function FormDesigner(props) {
   };
   var getComponentGroups = function getComponentGroups() {
     var groups = {};
-    businessComponents.map(function (x) {
+    businessComponents.forEach(function (x) {
       if (groups[x.GroupName ? x.GroupName : '其他']) {
         groups[x.GroupName ? x.GroupName : '其他'].push(x);
       } else {
@@ -122,6 +122,7 @@ var FormDesigner = function FormDesigner(props) {
     sources: [_preWidgets.PreDefineProperty1, _preWidgets.PreDefineProperty2, _preWidgets.PreDefineProperty3, _preWidgets.PreDefineProperty4, _preWidgets.PreDefineProperty5, _preWidgets.PreDefineProperty6, _preWidgets.PreDefineProperty7, _preWidgets.PreDefineProperty8, _preWidgets.PreDefineProperty9, _preWidgets.PreDefineProperty10]
   }), Object.keys(groupComponents).map(function (x) {
     return /*#__PURE__*/_react.default.createElement(_designableReact.ResourceWidget, {
+      key: x,
       title: x,
       sources: groupComponents[x]
     });

package/dist/cjs/formDesigner/preWidgets/index.d.ts

@@ -1,12 +1,3 @@
-export * from './preDefineProperty1';
-export * from './preDefineProperty2';
-export * from './preDefineProperty3';
-export * from './preDefineProperty4';
-export * from './preDefineProperty5';
-export * from './preDefineProperty6';
-export * from './preDefineProperty7';
-export * from './preDefineProperty8';
-export * from './preDefineProperty9';
-export * from './preDefineProperty10';
+export * from './preDefineProperty';
 export * from './arrayTableIndex';
 export * from './card';

package/dist/cjs/formDesigner/preWidgets/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _preDefineProperty = require("./preDefineProperty1");
+var _preDefineProperty = require("./preDefineProperty");
 Object.keys(_preDefineProperty).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _preDefineProperty[key]) return;
@@ -14,105 +14,6 @@ Object.keys(_preDefineProperty).forEach(function (key) {
     }
   });
 });
-var _preDefineProperty2 = require("./preDefineProperty2");
-Object.keys(_preDefineProperty2).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty2[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty2[key];
-    }
-  });
-});
-var _preDefineProperty3 = require("./preDefineProperty3");
-Object.keys(_preDefineProperty3).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty3[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty3[key];
-    }
-  });
-});
-var _preDefineProperty4 = require("./preDefineProperty4");
-Object.keys(_preDefineProperty4).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty4[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty4[key];
-    }
-  });
-});
-var _preDefineProperty5 = require("./preDefineProperty5");
-Object.keys(_preDefineProperty5).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty5[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty5[key];
-    }
-  });
-});
-var _preDefineProperty6 = require("./preDefineProperty6");
-Object.keys(_preDefineProperty6).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty6[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty6[key];
-    }
-  });
-});
-var _preDefineProperty7 = require("./preDefineProperty7");
-Object.keys(_preDefineProperty7).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty7[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty7[key];
-    }
-  });
-});
-var _preDefineProperty8 = require("./preDefineProperty8");
-Object.keys(_preDefineProperty8).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty8[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty8[key];
-    }
-  });
-});
-var _preDefineProperty9 = require("./preDefineProperty9");
-Object.keys(_preDefineProperty9).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty9[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty9[key];
-    }
-  });
-});
-var _preDefineProperty10 = require("./preDefineProperty10");
-Object.keys(_preDefineProperty10).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _preDefineProperty10[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _preDefineProperty10[key];
-    }
-  });
-});
 var _arrayTableIndex = require("./arrayTableIndex");
 Object.keys(_arrayTableIndex).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/cjs/formDesigner/preWidgets/preDefineProperty.d.ts

@@ -0,0 +1,11 @@
+import { DnFC } from '@nokecy/designable-react';
+export declare const PreDefineProperty1: DnFC<any>;
+export declare const PreDefineProperty2: DnFC<any>;
+export declare const PreDefineProperty3: DnFC<any>;
+export declare const PreDefineProperty4: DnFC<any>;
+export declare const PreDefineProperty5: DnFC<any>;
+export declare const PreDefineProperty6: DnFC<any>;
+export declare const PreDefineProperty7: DnFC<any>;
+export declare const PreDefineProperty8: DnFC<any>;
+export declare const PreDefineProperty9: DnFC<any>;
+export declare const PreDefineProperty10: DnFC<any>;

package/dist/cjs/formDesigner/preWidgets/preDefineProperty.js

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PreDefineProperty9 = exports.PreDefineProperty8 = exports.PreDefineProperty7 = exports.PreDefineProperty6 = exports.PreDefineProperty5 = exports.PreDefineProperty4 = exports.PreDefineProperty3 = exports.PreDefineProperty2 = exports.PreDefineProperty10 = exports.PreDefineProperty1 = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _antdV = require("@formily/antd-v5");
+var _designableCore = require("@nokecy/designable-core");
+var _designableFormilyAntd = require("@nokecy/designable-formily-antd");
+var _utils = require("./utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
+var FormilyInput = function FormilyInput(props) {
+  return /*#__PURE__*/_react.default.createElement(_antdV.Input, props);
+};
+
+// 10 个预定义字段仅编号不同,用工厂统一生成,替代原 preDefineProperty1~10 十份机械复制 @author nokecy
+var createPreDefineProperty = function createPreDefineProperty(n) {
+  var fieldName = "preDefineProperty".concat(n);
+  var componentName = "PreDefineProperty".concat(n);
+  var title = "\u9884\u5B9A\u4E49\u5B57\u6BB5".concat(n);
+  var component = function component(props) {
+    return /*#__PURE__*/_react.default.createElement(FormilyInput, props);
+  };
+  component.Behavior = (0, _designableCore.createBehavior)({
+    name: componentName,
+    extends: ['Field'],
+    selector: function selector(node) {
+      return node.props['x-component'] === 'Input' && node.props['name'] === fieldName;
+    },
+    designerProps: {
+      propsSchema: (0, _utils.createFieldSchema)(_designableFormilyAntd.AllSchemas.Input)
+    },
+    designerLocales: _objectSpread(_objectSpread({}, _designableFormilyAntd.AllLocales.Input), {}, {
+      'zh-CN': _objectSpread(_objectSpread({}, _designableFormilyAntd.AllLocales.Input['zh-CN']), {}, {
+        title: title
+      })
+    })
+  });
+  component.Resource = (0, _designableCore.createResource)({
+    icon: 'InputSource',
+    elements: [{
+      componentName: 'Field',
+      props: {
+        type: 'string',
+        name: fieldName,
+        title: title,
+        'x-decorator': 'FormItem',
+        'x-component': 'Input'
+      }
+    }]
+  });
+  return component;
+};
+var PreDefineProperty1 = exports.PreDefineProperty1 = createPreDefineProperty(1);
+var PreDefineProperty2 = exports.PreDefineProperty2 = createPreDefineProperty(2);
+var PreDefineProperty3 = exports.PreDefineProperty3 = createPreDefineProperty(3);
+var PreDefineProperty4 = exports.PreDefineProperty4 = createPreDefineProperty(4);
+var PreDefineProperty5 = exports.PreDefineProperty5 = createPreDefineProperty(5);
+var PreDefineProperty6 = exports.PreDefineProperty6 = createPreDefineProperty(6);
+var PreDefineProperty7 = exports.PreDefineProperty7 = createPreDefineProperty(7);
+var PreDefineProperty8 = exports.PreDefineProperty8 = createPreDefineProperty(8);
+var PreDefineProperty9 = exports.PreDefineProperty9 = createPreDefineProperty(9);
+var PreDefineProperty10 = exports.PreDefineProperty10 = createPreDefineProperty(10);

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

@@ -1,4 +1,5 @@
 import _sumBy from "lodash/sumBy";
+import _isEqual from "lodash/isEqual";
 import _uniqueId from "lodash/uniqueId";
 import _isArray from "lodash/isArray";
 var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection", "useNativeTreeFilter", "entityType"];
@@ -60,6 +61,16 @@ var Text = Typography.Text;
 var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
 };
+
+// 深比较稳定引用:内容不变时返回同一引用。替代 JSON.stringify 作 memo 依赖——
+// 避免每次渲染序列化大对象,且 isEqual 差异早退、对 Date/undefined 比较语义正确 @author nokecy
+function useDeepCompareStable(value) {
+  var ref = useRef(value);
+  if (!_isEqual(ref.current, value)) {
+    ref.current = value;
+  }
+  return ref.current;
+}
 function AgGridPlus(props) {
   var style = props.style,
     loadingProps = props.loading,
@@ -103,6 +114,8 @@ function AgGridPlus(props) {
   var gridRef = useRef();
   var apiRef = useRef();
   var allColDefsRef = useRef([]);
+  // 请求序号:只接受最新一次请求的响应,防止快速翻页/连续查询时慢请求乱序覆盖新结果 @author nokecy
+  var requestSeqRef = useRef(0);
 
   // 【新增】缓存初始的 columnDefs，用于保留原始 headerName
   // 这个值在组件生命周期中保持不变，不会被列方案修改
@@ -601,7 +614,7 @@ function AgGridPlus(props) {
     columnDefs = columnDefs.map(function (col) {
       return processColumnDefRecursively(col);
     });
-    extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].map(function (column) {
+    extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].forEach(function (column) {
       columnDefs.push({
         field: column.name,
         headerName: column.displayName,
@@ -663,16 +676,10 @@ function AgGridPlus(props) {
     return cols;
   }, [React.Children.count(children), props.columnDefs, extensibleColumns, gridKey, entityType, hostEntityExtensions]);
 
-  // 稳定化 gridParams 和 sortColumn 的引用
-  var stableGridParams = useMemo(function () {
-    return gridParams;
-  }, [JSON.stringify(gridParams)]);
-  var stableSortColumn = useMemo(function () {
-    return sortColumn;
-  }, [JSON.stringify(sortColumn)]);
-  var stableQueryFilter = useMemo(function () {
-    return queryFilter;
-  }, [JSON.stringify(queryFilter)]);
+  // 稳定化 gridParams 和 sortColumn 的引用(深比较,内容不变即复用旧引用)
+  var stableGridParams = useDeepCompareStable(gridParams);
+  var stableSortColumn = useDeepCompareStable(sortColumn);
+  var stableQueryFilter = useDeepCompareStable(queryFilter);
 
   // AG-Grid v33+ 行选择配置（使用对象 API）
   var rowSelectionConfig = useMemo(function () {
@@ -756,8 +763,12 @@ function AgGridPlus(props) {
         maxResultCount: pagination.pageSize,
         sorter: getSort(stableSortColumn)
       });
+      var requestSeq = ++requestSeqRef.current;
       requestRef.current(params, undefined, queryFilter).then(function (response) {
         var _apiRef$current2;
+        // 过期响应(期间已发起更新的请求),直接丢弃 @author nokecy
+        if (requestSeq !== requestSeqRef.current) return;
+
         // 验证响应数据格式
         if (!response || _typeof(response) !== 'object') {
           throw new GridPlusError('服务器返回数据格式错误', ErrorType.DATA_FORMAT_ERROR, ErrorSeverity.HIGH, {
@@ -833,6 +844,8 @@ function AgGridPlus(props) {
           });
         }
       }).catch(function (error) {
+        // 过期请求的失败不再提示/改状态,避免干扰最新请求 @author nokecy
+        if (requestSeq !== requestSeqRef.current) return;
         setLoading(false);
 
         // 包装错误为 GridPlusError
@@ -1172,7 +1185,9 @@ function AgGridPlus(props) {
     return processedColumns;
   }, [
   // 【关键】优先依赖派生状态
-  derivedColumnDefs, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, allColDefsRef.current]);
+  derivedColumnDefs, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass,
+  // ref.current 变更不触发重渲染,作依赖无效;改依赖真正的数据源 allColDefs(memo 值) @author nokecy
+  allColDefs]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = useMemo(function () {
@@ -1250,10 +1265,10 @@ function AgGridPlus(props) {
     return {
       extensibleColumns: extensibleColumns,
       columnState: gridPlusColumnState,
-      allColDefs: allColDefsRef.current,
-      // 【修复】传入原始完整的列定义
+      allColDefs: allColDefs,
+      // 直接用 memo 值(与 ref 同源,引用变化能正确触发 memo 更新) @author nokecy
       initialColumnDefs: initialColumnDefsRef.current,
-      // 【新增】传入初始列定义（用于获取原始 headerName）
+      // 初始列定义在 allColDefs 首次计算时填充,之后不变（用于获取原始 headerName）
       onSaveColumnState: onSaveColumnState,
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
@@ -1288,11 +1303,9 @@ function AgGridPlus(props) {
       // ========== 实体扩展字段配置 @author nokecy ==========
       hostEntityExtensions: hostEntityExtensions
     };
-  }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
-  // 【修复】添加到依赖数组
-  initialColumnDefsRef.current,
-  // 【新增】添加初始列定义到依赖数组
-  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme, queryItemsOrder, queryFormItems,
+  }, [extensibleColumns, gridPlusColumnState,
+  // ref.current 作依赖无效(变更不触发重渲染);依赖数据源 allColDefs,initialColumnDefs 随其首次计算填充 @author nokecy
+  allColDefs, onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme, queryItemsOrder, queryFormItems,
   // 方案管理依赖
   columnSchemes, querySchemes, currentSchemes, schemesLoading, lastSyncTime, saveColumnScheme, deleteColumnScheme, saveQueryScheme, deleteQueryScheme, setCurrentColumnScheme, setCurrentQueryScheme, refreshSchemes, getColumnSchemes, getQuerySchemes, getCurrentScheme,
   // 全局配置依赖

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

@@ -5,6 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { useMemo } from 'react';
+import { logger } from "../utils/logger";
 
 /**
  * 【P1 架构优化】单向数据流 Hook
@@ -36,7 +37,7 @@ export function useSchemeSource(gridKey, schemeData) {
     querySchemes = schemeData.querySchemes,
     currentSchemes = schemeData.currentSchemes;
   return useMemo(function () {
-    var _currentSchemes$gridK, _currentSchemes$gridK2;
+    var _currentSchemes$gridK, _currentSchemes$gridK2, _currentColumnScheme;
     var schemes = (columnSchemes === null || columnSchemes === void 0 ? void 0 : columnSchemes[gridKey]) || [];
     var currentColumnSchemeId = currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK = currentSchemes[gridKey]) === null || _currentSchemes$gridK === void 0 ? void 0 : _currentSchemes$gridK.columnSchemeId;
 
@@ -104,6 +105,15 @@ export function useSchemeSource(gridKey, schemeData) {
         isUsingGlobalQueryFallback = true;
       }
     }
+    logger.debug('[useSchemeSource] 方案数据源:', {
+      gridKey: gridKey,
+      schemes: schemes,
+      currentColumnSchemeId: currentColumnSchemeId,
+      currentColumnScheme: currentColumnScheme,
+      hasCurrentScheme: !!currentColumnScheme,
+      isUsingGlobalFallback: isUsingGlobalFallback,
+      columnConfigLength: (_currentColumnScheme = currentColumnScheme) === null || _currentColumnScheme === void 0 || (_currentColumnScheme = _currentColumnScheme.columnConfig) === null || _currentColumnScheme === void 0 ? void 0 : _currentColumnScheme.length
+    });
     return {
       // 列方案
       columnSchemes: schemes,
@@ -130,15 +140,32 @@ export function useSchemeSource(gridKey, schemeData) {
  */
 export function useDerivedGridState(currentScheme, allColDefs) {
   return useMemo(function () {
+    var _currentScheme$column;
+    logger.debug('[useDerivedGridState] 输入参数:', {
+      hasScheme: !!currentScheme,
+      schemeId: currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.id,
+      configLength: currentScheme === null || currentScheme === void 0 || (_currentScheme$column = currentScheme.columnConfig) === null || _currentScheme$column === void 0 ? void 0 : _currentScheme$column.length,
+      allColDefsLength: allColDefs === null || allColDefs === void 0 ? void 0 : allColDefs.length
+    });
     if (!(currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) || !allColDefs || allColDefs.length === 0) {
+      logger.debug('[useDerivedGridState] 返回 null (缺少必要数据)');
       return null;
     }
     try {
+      var _result$;
       var _require = require("../setting/columnGroupUtils"),
         flatConfigToGridState = _require.flatConfigToGridState;
 
       // 转换并缓存结果
       var result = flatConfigToGridState(currentScheme.columnConfig, allColDefs);
+      logger.debug('[useDerivedGridState] 转换成功:', {
+        resultLength: result === null || result === void 0 ? void 0 : result.length,
+        columnOrder: result === null || result === void 0 ? void 0 : result.map(function (col) {
+          return col.field;
+        }),
+        firstColumn: result === null || result === void 0 || (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.field,
+        fullResult: result
+      });
       return result;
     } catch (error) {
       console.error('[useDerivedGridState] 转换失败:', error);
@@ -166,6 +193,15 @@ export function useDerivedColumnState(currentScheme, allColDefs) {
 
       // 转换列状态，传入原始列定义以检测新增列
       var result = flatConfigToColumnState(currentScheme.columnConfig, allColDefs);
+      logger.debug('[useDerivedColumnState] 转换结果:', {
+        schemeId: currentScheme.id,
+        columnConfigLength: currentScheme.columnConfig.length,
+        resultLength: result === null || result === void 0 ? void 0 : result.length,
+        columnOrder: result === null || result === void 0 ? void 0 : result.map(function (r) {
+          return r.colId;
+        }),
+        fullResult: result
+      });
       return result;
     } catch (error) {
       console.error('[useDerivedColumnState] 转换失败:', error);