@nokecy/qc-ui 1.0.90 → 1.0.93

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (226) hide show
  1. package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.d.ts +2 -1
  2. package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.js +6 -5
  3. package/dist/cjs/ag-grid-plus/ag-gridPlus.js +69 -35
  4. package/dist/cjs/ag-grid-plus/context/gridContext.d.ts +5 -0
  5. package/dist/cjs/ag-grid-plus/index.d.ts +0 -1
  6. package/dist/cjs/ag-grid-plus/index.js +0 -1
  7. package/dist/cjs/ag-grid-plus/setting/ColumnConfigTable.js +2 -104
  8. package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js +59 -102
  9. package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.d.ts +5 -1
  10. package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.js +64 -1
  11. package/dist/cjs/ag-grid-plus/theme.d.ts +5 -0
  12. package/dist/cjs/ag-grid-plus/theme.js +78 -0
  13. package/dist/esm/ag-grid-plus/_utils/processColumnGroups.d.ts +2 -1
  14. package/dist/esm/ag-grid-plus/_utils/processColumnGroups.js +6 -5
  15. package/dist/esm/ag-grid-plus/ag-gridPlus.js +68 -35
  16. package/dist/esm/ag-grid-plus/context/gridContext.d.ts +5 -0
  17. package/dist/esm/ag-grid-plus/index.d.ts +0 -1
  18. package/dist/esm/ag-grid-plus/index.js +0 -1
  19. package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.js +2 -104
  20. package/dist/esm/ag-grid-plus/setting/ColumnSetting.js +60 -103
  21. package/dist/esm/ag-grid-plus/setting/columnGroupUtils.d.ts +5 -1
  22. package/dist/esm/ag-grid-plus/setting/columnGroupUtils.js +64 -1
  23. package/dist/esm/ag-grid-plus/theme.d.ts +5 -0
  24. package/dist/esm/ag-grid-plus/theme.js +72 -0
  25. package/dist/esm/standardFormDialog/useStandardFormSchema.d.ts +1 -1
  26. package/dist/umd/qc-ui.min.css +1 -1
  27. package/dist/umd/qc-ui.min.js +1 -1
  28. package/package.json +1 -1
  29. package/dist/cjs/ag-grid-plus/setting/ColumnConfigTable.d.ts.map +0 -1
  30. package/dist/esm/ConfirmPro/index.d.ts.map +0 -1
  31. package/dist/esm/RuleBuilder/LogicSelector.d.ts.map +0 -1
  32. package/dist/esm/RuleBuilder/RuleBuilderContainer.d.ts.map +0 -1
  33. package/dist/esm/RuleBuilder/RuleCard.d.ts.map +0 -1
  34. package/dist/esm/RuleBuilder/RuleGroupEditor.d.ts.map +0 -1
  35. package/dist/esm/RuleBuilder/constants/operators.d.ts.map +0 -1
  36. package/dist/esm/RuleBuilder/context/RuleBuilderContext.d.ts.map +0 -1
  37. package/dist/esm/RuleBuilder/index.d.ts.map +0 -1
  38. package/dist/esm/RuleBuilder/inputs/BetweenValueInput.d.ts.map +0 -1
  39. package/dist/esm/RuleBuilder/inputs/MultiValueInput.d.ts.map +0 -1
  40. package/dist/esm/RuleBuilder/inputs/SingleValueInput.d.ts.map +0 -1
  41. package/dist/esm/RuleBuilder/inputs/ValueInput.d.ts.map +0 -1
  42. package/dist/esm/RuleBuilder/selectors/FieldSelector.d.ts.map +0 -1
  43. package/dist/esm/RuleBuilder/selectors/OperatorSelector.d.ts.map +0 -1
  44. package/dist/esm/RuleBuilder/types/index.d.ts.map +0 -1
  45. package/dist/esm/RuleBuilder/utils/pathHelpers.d.ts.map +0 -1
  46. package/dist/esm/RuleBuilder/utils/ruleHelpers.d.ts.map +0 -1
  47. package/dist/esm/RuleBuilder/utils/validation.d.ts.map +0 -1
  48. package/dist/esm/ag-grid-plus/_utils/boolSelect.d.ts.map +0 -1
  49. package/dist/esm/ag-grid-plus/_utils/customGroupCellRenderer.d.ts.map +0 -1
  50. package/dist/esm/ag-grid-plus/_utils/processColumnGroups.d.ts.map +0 -1
  51. package/dist/esm/ag-grid-plus/_utils/processFormColumnState.d.ts.map +0 -1
  52. package/dist/esm/ag-grid-plus/ag-gridPlus.d.ts.map +0 -1
  53. package/dist/esm/ag-grid-plus/context/gridContext.d.ts.map +0 -1
  54. package/dist/esm/ag-grid-plus/errors/ErrorBoundary.d.ts.map +0 -1
  55. package/dist/esm/ag-grid-plus/errors/index.d.ts.map +0 -1
  56. package/dist/esm/ag-grid-plus/errors/types.d.ts.map +0 -1
  57. package/dist/esm/ag-grid-plus/hooks/index.d.ts.map +0 -1
  58. package/dist/esm/ag-grid-plus/hooks/useAgGridCalculation.d.ts.map +0 -1
  59. package/dist/esm/ag-grid-plus/hooks/useAgGridData.d.ts.map +0 -1
  60. package/dist/esm/ag-grid-plus/hooks/useGridPlusColumnState.d.ts.map +0 -1
  61. package/dist/esm/ag-grid-plus/hooks/useGridState.d.ts.map +0 -1
  62. package/dist/esm/ag-grid-plus/index.d.ts.map +0 -1
  63. package/dist/esm/ag-grid-plus/interface.d.ts.map +0 -1
  64. package/dist/esm/ag-grid-plus/locale.d.ts.map +0 -1
  65. package/dist/esm/ag-grid-plus/queryForm/index.d.ts.map +0 -1
  66. package/dist/esm/ag-grid-plus/queryForm/queryForm.d.ts.map +0 -1
  67. package/dist/esm/ag-grid-plus/querySchemes/components/QuerySchemesManager.d.ts.map +0 -1
  68. package/dist/esm/ag-grid-plus/querySchemes/components/index.d.ts.map +0 -1
  69. package/dist/esm/ag-grid-plus/querySchemes/constants.d.ts.map +0 -1
  70. package/dist/esm/ag-grid-plus/querySchemes/hooks/useQueryOrderManager.d.ts.map +0 -1
  71. package/dist/esm/ag-grid-plus/querySchemes/hooks/useQuerySchemes.d.ts.map +0 -1
  72. package/dist/esm/ag-grid-plus/querySchemes/index.d.ts.map +0 -1
  73. package/dist/esm/ag-grid-plus/querySchemes/storage/localStorageAdapter.d.ts.map +0 -1
  74. package/dist/esm/ag-grid-plus/querySchemes/types.d.ts.map +0 -1
  75. package/dist/esm/ag-grid-plus/querySchemes/utils/validator.d.ts.map +0 -1
  76. package/dist/esm/ag-grid-plus/schemes/components/SchemeManager.d.ts.map +0 -1
  77. package/dist/esm/ag-grid-plus/schemes/components/SchemeSelector.d.ts.map +0 -1
  78. package/dist/esm/ag-grid-plus/schemes/components/index.d.ts.map +0 -1
  79. package/dist/esm/ag-grid-plus/schemes/constants.d.ts.map +0 -1
  80. package/dist/esm/ag-grid-plus/schemes/hooks/useColumnSchemes.d.ts.map +0 -1
  81. package/dist/esm/ag-grid-plus/schemes/index.d.ts.map +0 -1
  82. package/dist/esm/ag-grid-plus/schemes/storage/localStorageAdapter.d.ts.map +0 -1
  83. package/dist/esm/ag-grid-plus/schemes/types.d.ts.map +0 -1
  84. package/dist/esm/ag-grid-plus/schemes/utils/validator.d.ts.map +0 -1
  85. package/dist/esm/ag-grid-plus/setting/ColumnConfigForm.d.ts.map +0 -1
  86. package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.d.ts.map +0 -1
  87. package/dist/esm/ag-grid-plus/setting/ColumnSetting.d.ts.map +0 -1
  88. package/dist/esm/ag-grid-plus/setting/MoveNodeModal.d.ts.map +0 -1
  89. package/dist/esm/ag-grid-plus/setting/NameColumnRenderer.d.ts.map +0 -1
  90. package/dist/esm/ag-grid-plus/setting/columnGroupTypes.d.ts.map +0 -1
  91. package/dist/esm/ag-grid-plus/setting/columnGroupUtils.d.ts.map +0 -1
  92. package/dist/esm/ag-grid-plus/setting/index.d.ts.map +0 -1
  93. package/dist/esm/ag-grid-plus/settingItem/index.d.ts.map +0 -1
  94. package/dist/esm/ag-grid-plus/shared/hooks/useSchemeManager.d.ts.map +0 -1
  95. package/dist/esm/ag-grid-plus/storage/MemoryStorageAdapter.d.ts.map +0 -1
  96. package/dist/esm/ag-grid-plus/storage/SchemeSyncManager.d.ts.map +0 -1
  97. package/dist/esm/ag-grid-plus/storage/globalSyncManager.d.ts.map +0 -1
  98. package/dist/esm/ag-grid-plus/storage/index.d.ts.map +0 -1
  99. package/dist/esm/ag-grid-plus/storage/types.d.ts.map +0 -1
  100. package/dist/esm/ag-grid-plus/toolBar/index.d.ts.map +0 -1
  101. package/dist/esm/ag-grid-plus/toolBar/style.d.ts.map +0 -1
  102. package/dist/esm/ag-grid-plus/types.d.ts.map +0 -1
  103. package/dist/esm/ag-grid-plus/utils/columnProcessors.d.ts.map +0 -1
  104. package/dist/esm/ag-grid-plus/utils/constants.d.ts.map +0 -1
  105. package/dist/esm/ag-grid-plus/utils/logger.d.ts.map +0 -1
  106. package/dist/esm/ag-grid-plus/utils/sanitize.d.ts.map +0 -1
  107. package/dist/esm/ag-grid-plus/utils.d.ts.map +0 -1
  108. package/dist/esm/array-table/arrayAddBtn.d.ts.map +0 -1
  109. package/dist/esm/array-table/arrayBase.d.ts.map +0 -1
  110. package/dist/esm/array-table/columnHelper.d.ts.map +0 -1
  111. package/dist/esm/array-table/hooks.d.ts.map +0 -1
  112. package/dist/esm/array-table/index.d.ts.map +0 -1
  113. package/dist/esm/array-table/interface.d.ts.map +0 -1
  114. package/dist/esm/array-table/preview.d.ts.map +0 -1
  115. package/dist/esm/array-table/utils.d.ts.map +0 -1
  116. package/dist/esm/array-table-index/index.d.ts.map +0 -1
  117. package/dist/esm/card/index.d.ts.map +0 -1
  118. package/dist/esm/components/RegexEditor/core/RegexEditor.d.ts.map +0 -1
  119. package/dist/esm/components/RegexEditor/core/extensions/errorMarker.d.ts.map +0 -1
  120. package/dist/esm/components/RegexEditor/core/types.d.ts.map +0 -1
  121. package/dist/esm/components/RegexEditor/hooks/index.d.ts.map +0 -1
  122. package/dist/esm/components/RegexEditor/hooks/useRegexTester.d.ts.map +0 -1
  123. package/dist/esm/components/RegexEditor/hooks/useRegexValidation.d.ts.map +0 -1
  124. package/dist/esm/components/RegexEditor/hooks/useTemplateManager.d.ts.map +0 -1
  125. package/dist/esm/components/RegexEditor/index.d.ts.map +0 -1
  126. package/dist/esm/components/RegexEditor/templates/TemplateSelector.d.ts.map +0 -1
  127. package/dist/esm/components/RegexEditor/templates/builtinTemplates.d.ts.map +0 -1
  128. package/dist/esm/components/RegexEditor/templates/index.d.ts.map +0 -1
  129. package/dist/esm/components/RegexEditor/templates/storage.d.ts.map +0 -1
  130. package/dist/esm/components/RegexEditor/templates/templateManager.d.ts.map +0 -1
  131. package/dist/esm/components/RegexEditor/templates/types.d.ts.map +0 -1
  132. package/dist/esm/components/RegexEditor/testing/types.d.ts.map +0 -1
  133. package/dist/esm/components/RegexEditor/validation/complexity.d.ts.map +0 -1
  134. package/dist/esm/components/RegexEditor/validation/parser.d.ts.map +0 -1
  135. package/dist/esm/components/RegexEditor/validation/types.d.ts.map +0 -1
  136. package/dist/esm/components/RegexEditor/validation/validator.d.ts.map +0 -1
  137. package/dist/esm/components/RegexEditor/visualizer/FlagsSelector.d.ts.map +0 -1
  138. package/dist/esm/components/RegexEditor/visualizer/MatchItem.d.ts.map +0 -1
  139. package/dist/esm/components/RegexEditor/visualizer/RegexRailroadDiagram.d.ts.map +0 -1
  140. package/dist/esm/components/RegexEditor/visualizer/RegexTester.d.ts.map +0 -1
  141. package/dist/esm/components/RegexEditor/visualizer/astToRailroad.d.ts.map +0 -1
  142. package/dist/esm/components/RegexEditor/visualizer/index.d.ts.map +0 -1
  143. package/dist/esm/components/RegexEditor/visualizer/types.d.ts.map +0 -1
  144. package/dist/esm/components/RegexEditor/visualizer/utils.d.ts.map +0 -1
  145. package/dist/esm/dashboard/dashboard/components/index.d.ts.map +0 -1
  146. package/dist/esm/dashboard/dashboard/components/modal/index.d.ts.map +0 -1
  147. package/dist/esm/dashboard/dashboard/components/toolbar/index.d.ts.map +0 -1
  148. package/dist/esm/dashboard/dashboard/components/toolbar/style/index.d.ts.map +0 -1
  149. package/dist/esm/dashboard/dashboard/index.d.ts.map +0 -1
  150. package/dist/esm/dashboard/dashboard/service.d.ts.map +0 -1
  151. package/dist/esm/dashboard/dashboard/utils.d.ts.map +0 -1
  152. package/dist/esm/dashboard/index.d.ts.map +0 -1
  153. package/dist/esm/dashboard/utils.d.ts.map +0 -1
  154. package/dist/esm/dashboard/widget/index.d.ts.map +0 -1
  155. package/dist/esm/dashboard/widget/selector/index.d.ts.map +0 -1
  156. package/dist/esm/dashboard/widget/utils.d.ts.map +0 -1
  157. package/dist/esm/deleteConfirm/index.d.ts.map +0 -1
  158. package/dist/esm/dialogSelect/index.d.ts.map +0 -1
  159. package/dist/esm/draggableModal/index.d.ts.map +0 -1
  160. package/dist/esm/editable/index.d.ts.map +0 -1
  161. package/dist/esm/editable/style.d.ts.map +0 -1
  162. package/dist/esm/extensible-grid/index.d.ts.map +0 -1
  163. package/dist/esm/extensible-grid/interface.d.ts.map +0 -1
  164. package/dist/esm/formDesigner/FormDesigner.d.ts.map +0 -1
  165. package/dist/esm/formDesigner/ProCard/index.d.ts.map +0 -1
  166. package/dist/esm/formDesigner/arrayTable/arrayTableSchema.d.ts.map +0 -1
  167. package/dist/esm/formDesigner/arrayTable/index.d.ts.map +0 -1
  168. package/dist/esm/formDesigner/arrayTable/preview.d.ts.map +0 -1
  169. package/dist/esm/formDesigner/index.d.ts.map +0 -1
  170. package/dist/esm/formDesigner/preWidgets/arrayTableIndex/index.d.ts.map +0 -1
  171. package/dist/esm/formDesigner/preWidgets/arrayTableIndex/preview.d.ts.map +0 -1
  172. package/dist/esm/formDesigner/preWidgets/card/index.d.ts.map +0 -1
  173. package/dist/esm/formDesigner/preWidgets/card/preview.d.ts.map +0 -1
  174. package/dist/esm/formDesigner/preWidgets/index.d.ts.map +0 -1
  175. package/dist/esm/formDesigner/preWidgets/preDefineProperty1/index.d.ts.map +0 -1
  176. package/dist/esm/formDesigner/preWidgets/preDefineProperty1/preview.d.ts.map +0 -1
  177. package/dist/esm/formDesigner/preWidgets/preDefineProperty10/index.d.ts.map +0 -1
  178. package/dist/esm/formDesigner/preWidgets/preDefineProperty10/preview.d.ts.map +0 -1
  179. package/dist/esm/formDesigner/preWidgets/preDefineProperty2/index.d.ts.map +0 -1
  180. package/dist/esm/formDesigner/preWidgets/preDefineProperty2/preview.d.ts.map +0 -1
  181. package/dist/esm/formDesigner/preWidgets/preDefineProperty3/index.d.ts.map +0 -1
  182. package/dist/esm/formDesigner/preWidgets/preDefineProperty3/preview.d.ts.map +0 -1
  183. package/dist/esm/formDesigner/preWidgets/preDefineProperty4/index.d.ts.map +0 -1
  184. package/dist/esm/formDesigner/preWidgets/preDefineProperty4/preview.d.ts.map +0 -1
  185. package/dist/esm/formDesigner/preWidgets/preDefineProperty5/index.d.ts.map +0 -1
  186. package/dist/esm/formDesigner/preWidgets/preDefineProperty5/preview.d.ts.map +0 -1
  187. package/dist/esm/formDesigner/preWidgets/preDefineProperty6/index.d.ts.map +0 -1
  188. package/dist/esm/formDesigner/preWidgets/preDefineProperty6/preview.d.ts.map +0 -1
  189. package/dist/esm/formDesigner/preWidgets/preDefineProperty7/index.d.ts.map +0 -1
  190. package/dist/esm/formDesigner/preWidgets/preDefineProperty7/preview.d.ts.map +0 -1
  191. package/dist/esm/formDesigner/preWidgets/preDefineProperty8/index.d.ts.map +0 -1
  192. package/dist/esm/formDesigner/preWidgets/preDefineProperty8/preview.d.ts.map +0 -1
  193. package/dist/esm/formDesigner/preWidgets/preDefineProperty9/index.d.ts.map +0 -1
  194. package/dist/esm/formDesigner/preWidgets/preDefineProperty9/preview.d.ts.map +0 -1
  195. package/dist/esm/formDesigner/preWidgets/utils.d.ts.map +0 -1
  196. package/dist/esm/formDesigner/widgets/ActionsWidget.d.ts.map +0 -1
  197. package/dist/esm/formDesigner/widgets/LogoWidget.d.ts.map +0 -1
  198. package/dist/esm/formDesigner/widgets/PreviewWidget.d.ts.map +0 -1
  199. package/dist/esm/formDesigner/widgets/SchemaEditorWidget.d.ts.map +0 -1
  200. package/dist/esm/formDesigner/widgets/index.d.ts.map +0 -1
  201. package/dist/esm/formPro/context/formProContext.d.ts.map +0 -1
  202. package/dist/esm/formPro/formLayoutPro.d.ts.map +0 -1
  203. package/dist/esm/formPro/index.d.ts.map +0 -1
  204. package/dist/esm/fullScreenAlert/index.d.ts.map +0 -1
  205. package/dist/esm/generatedListPage/ConfigurableToolbar.d.ts.map +0 -1
  206. package/dist/esm/generatedListPage/GeneratedListPage.d.ts.map +0 -1
  207. package/dist/esm/generatedListPage/OptionsColumn.d.ts.map +0 -1
  208. package/dist/esm/generatedListPage/PerformanceMonitor.d.ts.map +0 -1
  209. package/dist/esm/generatedListPage/RequestManager.d.ts.map +0 -1
  210. package/dist/esm/generatedListPage/_utils/AccessWrapper.d.ts.map +0 -1
  211. package/dist/esm/generatedListPage/_utils/defaultHandlers.d.ts.map +0 -1
  212. package/dist/esm/generatedListPage/index.d.ts.map +0 -1
  213. package/dist/esm/generatedListPage/types.d.ts.map +0 -1
  214. package/dist/esm/generatedListPage/usePermissionCheck.d.ts.map +0 -1
  215. package/dist/esm/generatedListPage/useRequestManager.d.ts.map +0 -1
  216. package/dist/esm/importModal/index.d.ts.map +0 -1
  217. package/dist/esm/index.d.ts.map +0 -1
  218. package/dist/esm/queryBuilder/index.d.ts.map +0 -1
  219. package/dist/esm/standardFormDialog/FormValidation.d.ts.map +0 -1
  220. package/dist/esm/standardFormDialog/PortalManager.d.ts.map +0 -1
  221. package/dist/esm/standardFormDialog/StandardFormDialog.d.ts.map +0 -1
  222. package/dist/esm/standardFormDialog/index.d.ts.map +0 -1
  223. package/dist/esm/standardFormDialog/types.d.ts.map +0 -1
  224. package/dist/esm/standardFormDialog/useStandardFormSchema.d.ts.map +0 -1
  225. package/dist/esm/standardFormDialog/withStandardForm.d.ts.map +0 -1
  226. package/dist/esm/toolBar/index.d.ts.map +0 -1
@@ -13,6 +13,7 @@ var _columnGroupUtils = require("./columnGroupUtils");
13
13
  var _ColumnConfigTable = _interopRequireDefault(require("./ColumnConfigTable"));
14
14
  var _processColumnGroups = _interopRequireDefault(require("../_utils/processColumnGroups"));
15
15
  var _draggableModal = _interopRequireDefault(require("../../draggableModal"));
16
+ var _gridContext = require("../context/gridContext");
16
17
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
18
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
18
19
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -84,11 +85,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
84
85
  viewMode = _useState18[0],
85
86
  setViewMode = _useState18[1];
86
87
 
87
- // 保存原始列定义,用于取消时恢复
88
+ // 【修复】从 Context 获取原始完整的列定义
89
+ var gridPlusContext = (0, _react.useContext)(_gridContext.GridPlusContext);
90
+ var originalColumnDefs = (gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.allColDefs) || undefined;
91
+
92
+ // 【修复】保存快照用于取消时恢复(改名避免与Context的originalColumnDefs冲突)
88
93
  var _useState19 = (0, _react.useState)(null),
89
94
  _useState20 = _slicedToArray(_useState19, 2),
90
- originalColumnDefs = _useState20[0],
91
- setOriginalColumnDefs = _useState20[1];
95
+ snapshotColumnDefs = _useState20[0],
96
+ setSnapshotColumnDefs = _useState20[1];
92
97
 
93
98
  /**
94
99
  * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
@@ -98,17 +103,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
98
103
  var _schemeManager$curren;
99
104
  // 优先使用当前方案中保存的完整列配置(包含分组结构)
100
105
  if (schemeManager !== null && schemeManager !== void 0 && (_schemeManager$curren = schemeManager.currentScheme) !== null && _schemeManager$curren !== void 0 && _schemeManager$curren.columnConfig) {
101
- console.log('[ColumnSetting] 使用方案中保存的 columnConfig:', schemeManager.currentScheme.columnConfig);
102
106
  return schemeManager.currentScheme.columnConfig;
103
107
  }
104
108
 
105
109
  // 如果方案中没有 columnConfig,则从 Grid 读取
106
110
  var columnDefs = gridApi.getColumnDefs() || [];
107
111
  var columnStates = gridApi.getColumnState();
108
- console.log('[ColumnSetting] 从 Grid 读取列配置:', {
109
- columnDefs: columnDefs,
110
- columnStates: columnStates
111
- });
112
112
 
113
113
  // 将 Grid 状态转换为扁平化配置
114
114
  var flatConfig = (0, _columnGroupUtils.gridStateToFlatConfig)(columnDefs);
@@ -166,11 +166,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
166
166
  }
167
167
  }, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme, visible, form, getColumnData]);
168
168
 
169
- // 弹窗打开时保存原始列定义,用于取消时恢复
169
+ // 【修复】弹窗打开时保存快照,用于取消时恢复
170
170
  (0, _react.useEffect)(function () {
171
171
  if (visible) {
172
172
  var currentDefs = gridApi.getColumnDefs();
173
- setOriginalColumnDefs(currentDefs);
173
+ setSnapshotColumnDefs(currentDefs);
174
174
  }
175
175
  }, [visible, gridApi]);
176
176
 
@@ -184,31 +184,31 @@ var ColumnSetting = function ColumnSetting(_ref) {
184
184
  items: newItems
185
185
  });
186
186
 
187
- // 2. 转换为 AG-Grid 列定义
188
- var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems);
187
+ // 2. 【修复】转换为 AG-Grid 列定义,传入原始列定义以保留自定义属性
188
+ var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems, originalColumnDefs);
189
189
 
190
190
  // 3. 立即应用到 Grid(实时预览,不保存到方案)
191
191
  if (type !== 'formArrayTable') {
192
192
  gridApi.setGridOption("columnDefs", gridColumnDefs);
193
193
  }
194
- }, [form, gridApi, type]);
194
+ }, [form, gridApi, type, originalColumnDefs]);
195
195
 
196
196
  /**
197
197
  * 关闭弹窗处理 - 取消时恢复原始状态
198
198
  * 如果用户取消操作,恢复到打开弹窗前的列定义状态
199
199
  */
200
200
  var handleClose = (0, _react.useCallback)(function () {
201
- // 如果有保存的原始状态,恢复它
202
- if (originalColumnDefs && type !== 'formArrayTable') {
203
- gridApi.setGridOption("columnDefs", originalColumnDefs);
201
+ // 【修复】如果有保存的快照,恢复它
202
+ if (snapshotColumnDefs && type !== 'formArrayTable') {
203
+ gridApi.setGridOption("columnDefs", snapshotColumnDefs);
204
204
  }
205
205
 
206
- // 清空备份
207
- setOriginalColumnDefs(null);
206
+ // 清空快照
207
+ setSnapshotColumnDefs(null);
208
208
 
209
209
  // 调用父组件的 onClose
210
210
  onClose();
211
- }, [originalColumnDefs, gridApi, type, onClose]);
211
+ }, [snapshotColumnDefs, gridApi, type, onClose]);
212
212
 
213
213
  /**
214
214
  * 保存列配置
@@ -233,14 +233,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
233
233
  _antd.message.info('检测到旧版本配置,已自动迁移到新格式');
234
234
  }
235
235
 
236
- // 转换为 AG-Grid 的列定义
237
- gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave);
238
- console.log('[ColumnSetting] 保存列配置:', {
239
- flatConfig: configToSave,
240
- gridColumnDefs: gridColumnDefs
241
- });
242
-
243
- // 先应用列配置到 Grid
236
+ // 【修复】转换为 AG-Grid 的列定义,传入原始列定义以保留自定义属性
237
+ gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 先应用列配置到 Grid
244
238
  if (type !== 'formArrayTable') {
245
239
  gridApi.setGridOption("columnDefs", gridColumnDefs);
246
240
  }
@@ -249,69 +243,54 @@ var ColumnSetting = function ColumnSetting(_ref) {
249
243
 
250
244
  // 等待 Grid 状态更新完成后再保存到方案
251
245
  setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
252
- var updatedState, filterModel, defaultScheme, _newScheme$columnConf, newScheme;
246
+ var updatedState, filterModel, defaultScheme, newScheme;
253
247
  return _regeneratorRuntime().wrap(function _callee$(_context) {
254
248
  while (1) switch (_context.prev = _context.next) {
255
249
  case 0:
256
250
  if (!(schemeManager && gridKey)) {
257
- _context.next = 27;
251
+ _context.next = 25;
258
252
  break;
259
253
  }
260
254
  _context.prev = 1;
261
255
  // 从 Grid 获取应用后的最新列状态和过滤器状态
262
256
  updatedState = gridApi.getColumnState();
263
257
  filterModel = gridApi.getFilterModel();
264
- console.log('[ColumnSetting] 准备保存到方案:', {
265
- columnConfig: configToSave,
266
- columnConfigLength: configToSave.length,
267
- columnConfigDetail: configToSave.map(function (item, idx) {
268
- return {
269
- index: idx,
270
- type: item.type,
271
- headerName: item.headerName,
272
- field: item.field,
273
- order: item.order,
274
- parentId: item.parentId
275
- };
276
- }),
277
- filterModel: filterModel
278
- });
279
258
  if (!schemeManager.currentScheme) {
280
- _context.next = 10;
259
+ _context.next = 9;
281
260
  break;
282
261
  }
283
- _context.next = 8;
262
+ _context.next = 7;
284
263
  return schemeManager.saveScheme({
285
264
  columnConfig: configToSave,
286
265
  // 保存完整的列配置(包含分组结构)
287
266
  filterModel: filterModel
288
267
  });
289
- case 8:
290
- _context.next = 22;
268
+ case 7:
269
+ _context.next = 20;
291
270
  break;
292
- case 10:
271
+ case 9:
293
272
  // 如果没有激活的方案,查找或创建"默认配置"方案
294
273
  defaultScheme = schemeManager.schemes.find(function (s) {
295
274
  return s.isDefault;
296
275
  });
297
276
  if (!defaultScheme) {
298
- _context.next = 18;
277
+ _context.next = 17;
299
278
  break;
300
279
  }
301
- _context.next = 14;
280
+ _context.next = 13;
302
281
  return schemeManager.loadScheme(defaultScheme.id);
303
- case 14:
304
- _context.next = 16;
282
+ case 13:
283
+ _context.next = 15;
305
284
  return schemeManager.saveScheme({
306
285
  columnConfig: configToSave,
307
286
  // 保存完整的列配置(包含分组结构)
308
287
  filterModel: filterModel
309
288
  });
310
- case 16:
311
- _context.next = 22;
312
- break;
313
- case 18:
289
+ case 15:
314
290
  _context.next = 20;
291
+ break;
292
+ case 17:
293
+ _context.next = 19;
315
294
  return schemeManager.createScheme('默认配置', configToSave,
316
295
  // 使用 columnConfig 而不是 columnState
317
296
  {
@@ -320,38 +299,32 @@ var ColumnSetting = function ColumnSetting(_ref) {
320
299
  filterModel: filterModel,
321
300
  activate: true // 立即激活该方案
322
301
  });
323
- case 20:
302
+ case 19:
324
303
  newScheme = _context.sent;
325
- console.log('[ColumnSetting] 创建默认方案成功并已激活:', {
326
- schemeId: newScheme.id,
327
- schemeName: newScheme.name,
328
- hasColumnConfig: !!newScheme.columnConfig,
329
- columnConfigLength: ((_newScheme$columnConf = newScheme.columnConfig) === null || _newScheme$columnConf === void 0 ? void 0 : _newScheme$columnConf.length) || 0
330
- });
331
- case 22:
332
- _context.next = 27;
304
+ case 20:
305
+ _context.next = 25;
333
306
  break;
334
- case 24:
335
- _context.prev = 24;
307
+ case 22:
308
+ _context.prev = 22;
336
309
  _context.t0 = _context["catch"](1);
337
- console.error('[ColumnSetting] 保存列配置到方案失败:', _context.t0);
338
- case 27:
310
+ console.error('保存列配置到方案失败:', _context.t0);
311
+ case 25:
339
312
  case "end":
340
313
  return _context.stop();
341
314
  }
342
- }, _callee, null, [[1, 24]]);
315
+ }, _callee, null, [[1, 22]]);
343
316
  })), 50);
344
317
 
345
- // 保存成功后清除备份
346
- setOriginalColumnDefs(null);
318
+ // 【修复】保存成功后清除快照
319
+ setSnapshotColumnDefs(null);
347
320
  _antd.message.success('列配置已保存');
348
321
  onClose();
349
- case 13:
322
+ case 12:
350
323
  case "end":
351
324
  return _context2.stop();
352
325
  }
353
326
  }, _callee2);
354
- })), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey]);
327
+ })), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey, originalColumnDefs]);
355
328
 
356
329
  // 保存为新方案
357
330
  var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -373,7 +346,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
373
346
  }
374
347
  values = form.values;
375
348
  columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
376
- processedColumns = (0, _processColumnGroups.default)(values.items); // 先应用到 Grid
349
+ // 【修复】传入原始列定义以保留自定义属性
350
+ processedColumns = (0, _processColumnGroups.default)(values.items, originalColumnDefs); // 先应用到 Grid
377
351
  if (type !== 'formArrayTable') {
378
352
  gridApi.setGridOption("columnDefs", processedColumns);
379
353
  }
@@ -676,7 +650,14 @@ var ColumnSetting = function ColumnSetting(_ref) {
676
650
  }
677
651
  }];
678
652
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
679
- title: "\u5217\u65B9\u6848\u7BA1\u7406",
653
+ title: /*#__PURE__*/_react.default.createElement("span", null, "\u5217\u65B9\u6848\u7BA1\u7406", (schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme) && /*#__PURE__*/_react.default.createElement("span", {
654
+ style: {
655
+ marginLeft: 16,
656
+ fontSize: 14,
657
+ fontWeight: 'normal',
658
+ color: '#1890ff'
659
+ }
660
+ }, "- \u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name)),
680
661
  open: visible,
681
662
  onCancel: handleClose,
682
663
  width: 1100,
@@ -705,31 +686,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
705
686
  }, /*#__PURE__*/_react.default.createElement(TabPane, {
706
687
  tab: "\u5217\u914D\u7F6E",
707
688
  key: "columns"
708
- }, schemeManager && /*#__PURE__*/_react.default.createElement("div", {
709
- style: {
710
- marginBottom: 16,
711
- padding: '12px 16px',
712
- background: schemeManager.currentScheme ? '#e6f7ff' : '#f5f5f5',
713
- borderRadius: 4,
714
- border: '1px solid',
715
- borderColor: schemeManager.currentScheme ? '#91d5ff' : '#d9d9d9'
716
- }
717
- }, schemeManager.currentScheme ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
718
- style: {
719
- fontWeight: 600,
720
- marginBottom: 4,
721
- color: '#1890ff'
722
- }
723
- }, "\u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name), schemeManager.currentScheme.description && /*#__PURE__*/_react.default.createElement("div", {
724
- style: {
725
- fontSize: 12,
726
- color: '#666'
727
- }
728
- }, schemeManager.currentScheme.description)) : /*#__PURE__*/_react.default.createElement("div", {
729
- style: {
730
- color: '#666'
731
- }
732
- }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E")), /*#__PURE__*/_react.default.createElement(_ColumnConfigTable.default, {
689
+ }, /*#__PURE__*/_react.default.createElement(_ColumnConfigTable.default, {
733
690
  items: form.values.items || [],
734
691
  onChange: handleColumnChange,
735
692
  simple: type === 'formArrayTable'
@@ -20,10 +20,14 @@ export declare function gridStateToFlatConfig(columnDefs: (ColDef | ColGroupDef)
20
20
  * 扁平化配置 → Grid State
21
21
  * 将扁平化数组重建为 AG-Grid 的树形结构
22
22
  *
23
+ * 【重要】如果提供了 originalColumnDefs,会合并原始列定义中的所有属性
24
+ * 这样可以保留 cellRenderer、valueFormatter、valueEnum 等自定义渲染属性
25
+ *
23
26
  * @param flatConfig 扁平化配置数组
27
+ * @param originalColumnDefs 原始列定义数组(可选),用于保留自定义属性
24
28
  * @returns AG-Grid 列定义数组
25
29
  */
26
- export declare function flatConfigToGridState(flatConfig: FlatColumnItem[]): (ColDef | ColGroupDef)[];
30
+ export declare function flatConfigToGridState(flatConfig: FlatColumnItem[], originalColumnDefs?: (ColDef | ColGroupDef)[]): (ColDef | ColGroupDef)[];
27
31
  /**
28
32
  * 旧版本数据迁移
29
33
  * 将旧的 { groupName } 结构迁移为新的树形结构
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
 
3
+ 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); }
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
@@ -14,6 +15,14 @@ exports.migrateOldScheme = migrateOldScheme;
14
15
  exports.reorderItems = reorderItems;
15
16
  var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
16
17
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
18
+ 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; }
19
+ 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; }
20
+ 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; }
21
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
22
+ 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); }
23
+ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
24
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
25
+ 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; }
17
26
  /**
18
27
  * 表头分组配置工具函数
19
28
  * 负责 Grid State 与扁平化配置之间的转换
@@ -85,10 +94,45 @@ function gridStateToFlatConfig(columnDefs) {
85
94
  * 扁平化配置 → Grid State
86
95
  * 将扁平化数组重建为 AG-Grid 的树形结构
87
96
  *
97
+ * 【重要】如果提供了 originalColumnDefs,会合并原始列定义中的所有属性
98
+ * 这样可以保留 cellRenderer、valueFormatter、valueEnum 等自定义渲染属性
99
+ *
88
100
  * @param flatConfig 扁平化配置数组
101
+ * @param originalColumnDefs 原始列定义数组(可选),用于保留自定义属性
89
102
  * @returns AG-Grid 列定义数组
90
103
  */
91
- function flatConfigToGridState(flatConfig) {
104
+ function flatConfigToGridState(flatConfig, originalColumnDefs) {
105
+ /**
106
+ * 从原始列定义中查找指定字段的列定义(支持递归查找分组内的列)
107
+ */
108
+ function findOriginalColDef(field, defs) {
109
+ if (!defs) return undefined;
110
+ var _iterator = _createForOfIteratorHelper(defs),
111
+ _step;
112
+ try {
113
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
114
+ var def = _step.value;
115
+ // 检查是否是分组
116
+ if ('children' in def && def.children) {
117
+ // 递归查找分组内的列
118
+ var found = findOriginalColDef(field, def.children);
119
+ if (found) return found;
120
+ } else {
121
+ // 检查是否是目标列(使用类型守卫)
122
+ var colDef = def;
123
+ if (colDef.field === field) {
124
+ return colDef;
125
+ }
126
+ }
127
+ }
128
+ } catch (err) {
129
+ _iterator.e(err);
130
+ } finally {
131
+ _iterator.f();
132
+ }
133
+ return undefined;
134
+ }
135
+
92
136
  /**
93
137
  * 递归构建树形结构
94
138
  */
@@ -111,6 +155,25 @@ function flatConfigToGridState(flatConfig) {
111
155
  };
112
156
  } else {
113
157
  // 构建列节点
158
+ // 查找原始列定义
159
+ var originalDef = item.field ? findOriginalColDef(item.field, originalColumnDefs) : undefined;
160
+
161
+ // 如果找到原始列定义,合并所有属性
162
+ if (originalDef) {
163
+ return _objectSpread(_objectSpread({}, originalDef), {}, {
164
+ // 保留所有原始属性(cellRenderer、valueFormatter、valueEnum 等)
165
+ // 只覆盖方案中保存的属性
166
+ headerName: item.headerName,
167
+ width: item.width,
168
+ hide: item.hide,
169
+ pinned: item.pinned === 'notPinned' ? null : item.pinned,
170
+ cellClass: item.cellClass,
171
+ flex: item.flex,
172
+ suppressHeaderFilterButton: item.suppressHeaderFilterButton
173
+ });
174
+ }
175
+
176
+ // 如果没有找到原始定义,使用基本属性
114
177
  return {
115
178
  field: item.field,
116
179
  headerName: item.headerName,
@@ -0,0 +1,5 @@
1
+ /**
2
+ * AG-Grid v33 主题配置
3
+ * 使用 themeQuartz API 替代 CSS 变量方式
4
+ */
5
+ export declare const agGridTheme: import("ag-grid-community").Theme<import("ag-grid-community").ThemeDefaultParams>;
@@ -0,0 +1,78 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.agGridTheme = void 0;
7
+ var _agGridCommunity = require("ag-grid-community");
8
+ /**
9
+ * AG-Grid v33 主题配置
10
+ * 使用 themeQuartz API 替代 CSS 变量方式
11
+ */
12
+
13
+ var agGridTheme = exports.agGridTheme = _agGridCommunity.themeQuartz.withParams({
14
+ // 基础颜色
15
+ backgroundColor: '#FFFFFF',
16
+ foregroundColor: '#555B62',
17
+ accentColor: '#087AD1',
18
+ invalidColor: '#e02525',
19
+ borderColor: '#F0F0F0',
20
+ // 浏览器配置
21
+ browserColorScheme: 'light',
22
+ // 边框配置
23
+ wrapperBorder: true,
24
+ rowBorder: true,
25
+ columnBorder: true,
26
+ // 表头配置
27
+ headerBackgroundColor: '#FAFAFA',
28
+ headerFontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
29
+ headerFontWeight: 600,
30
+ headerFontSize: 12,
31
+ headerHeight: 25,
32
+ headerTextColor: '#000000E1',
33
+ headerColumnBorder: true,
34
+ headerColumnBorderHeight: '100%',
35
+ headerVerticalPaddingScale: 0.8,
36
+ // 字体配置
37
+ fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
38
+ fontSize: 12,
39
+ // 单元格配置
40
+ cellTextColor: '#000000E1',
41
+ cellHorizontalPaddingScale: 0.7,
42
+ // 行配置
43
+ rowVerticalPaddingScale: 0.8,
44
+ rowHoverColor: 'color-mix(in srgb, transparent, #087AD1 12%)',
45
+ selectedRowBackgroundColor: 'color-mix(in srgb, transparent, #087AD1 8%)',
46
+ oddRowBackgroundColor: '#FFFFFF',
47
+ // 列 hover 配置
48
+ columnHoverColor: 'color-mix(in srgb, transparent, #087AD1 8%)',
49
+ // 图标尺寸
50
+ iconSize: 14,
51
+ // 边角配置
52
+ borderRadius: 2,
53
+ wrapperBorderRadius: 2,
54
+ // 范围选择
55
+ rangeSelectionBorderStyle: 'solid',
56
+ rangeSelectionBorderColor: '#087AD1',
57
+ rangeSelectionBackgroundColor: 'color-mix(in srgb, transparent, #087AD1 20%)',
58
+ // 弹窗阴影
59
+ popupShadow: '0 0 16px 0 #00000026',
60
+ dropdownShadow: '0 1px 4px 1px #babfc766',
61
+ // 拖拽配置
62
+ dragAndDropImageBackgroundColor: '#FFFFFF',
63
+ dragAndDropImageBorder: true,
64
+ // 焦点阴影
65
+ focusShadow: '0 0 0 3px color-mix(in srgb, transparent, #087AD1 50%)',
66
+ // 复选框配置
67
+ checkboxBorderWidth: 1,
68
+ checkboxUncheckedBackgroundColor: '#FFFFFF',
69
+ checkboxCheckedBackgroundColor: '#087AD1',
70
+ checkboxCheckedBorderColor: '#087AD1',
71
+ // 切换按钮配置
72
+ toggleButtonWidth: 28,
73
+ toggleButtonHeight: 18,
74
+ toggleButtonOnBackgroundColor: '#087AD1',
75
+ // 侧边栏配置
76
+ sideBarPanelWidth: 250,
77
+ spacing: 6
78
+ });
@@ -5,7 +5,8 @@
5
5
  * 2. 旧格式:{ groupName: string } (简单的分组名称)
6
6
  *
7
7
  * @param columns 列配置数组
8
+ * @param originalColumnDefs 原始列定义数组(可选),用于保留自定义属性
8
9
  * @returns AG-Grid 列定义
9
10
  */
10
- declare const processColumnGroups: (columns: any[]) => any;
11
+ declare const processColumnGroups: (columns: any[], originalColumnDefs?: any[]) => any;
11
12
  export default processColumnGroups;
@@ -19,9 +19,10 @@ import { flatConfigToGridState, isOldSchemeData, migrateOldScheme } from "../set
19
19
  * 2. 旧格式:{ groupName: string } (简单的分组名称)
20
20
  *
21
21
  * @param columns 列配置数组
22
+ * @param originalColumnDefs 原始列定义数组(可选),用于保留自定义属性
22
23
  * @returns AG-Grid 列定义
23
24
  */
24
- var processColumnGroups = function processColumnGroups(columns) {
25
+ var processColumnGroups = function processColumnGroups(columns, originalColumnDefs) {
25
26
  // 如果是空数组,直接返回
26
27
  if (!columns || columns.length === 0) {
27
28
  return [];
@@ -44,16 +45,16 @@ var processColumnGroups = function processColumnGroups(columns) {
44
45
  return col.id !== undefined && col.level !== undefined && col.order !== undefined && (col.type === 'group' || col.type === 'column');
45
46
  });
46
47
  if (isNewFormat) {
47
- // 新格式:使用 flatConfigToGridState 转换
48
- return flatConfigToGridState(columns);
48
+ // 新格式:使用 flatConfigToGridState 转换,传入原始列定义以保留自定义属性
49
+ return flatConfigToGridState(columns, originalColumnDefs);
49
50
  }
50
51
 
51
52
  // 旧格式:使用旧的处理逻辑
52
53
  // 检查是否需要迁移
53
54
  if (isOldSchemeData(columns)) {
54
- // 先迁移到新格式,再转换
55
+ // 先迁移到新格式,再转换,传入原始列定义
55
56
  var migrated = migrateOldScheme(columns);
56
- return flatConfigToGridState(migrated);
57
+ return flatConfigToGridState(migrated, originalColumnDefs);
57
58
  }
58
59
 
59
60
  // 兼容最原始的格式(groupName)