@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
@@ -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;
@@ -24,9 +24,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
24
24
  * 2. 旧格式:{ groupName: string } (简单的分组名称)
25
25
  *
26
26
  * @param columns 列配置数组
27
+ * @param originalColumnDefs 原始列定义数组(可选),用于保留自定义属性
27
28
  * @returns AG-Grid 列定义
28
29
  */
29
- var processColumnGroups = function processColumnGroups(columns) {
30
+ var processColumnGroups = function processColumnGroups(columns, originalColumnDefs) {
30
31
  // 如果是空数组,直接返回
31
32
  if (!columns || columns.length === 0) {
32
33
  return [];
@@ -49,16 +50,16 @@ var processColumnGroups = function processColumnGroups(columns) {
49
50
  return col.id !== undefined && col.level !== undefined && col.order !== undefined && (col.type === 'group' || col.type === 'column');
50
51
  });
51
52
  if (isNewFormat) {
52
- // 新格式:使用 flatConfigToGridState 转换
53
- return (0, _columnGroupUtils.flatConfigToGridState)(columns);
53
+ // 新格式:使用 flatConfigToGridState 转换,传入原始列定义以保留自定义属性
54
+ return (0, _columnGroupUtils.flatConfigToGridState)(columns, originalColumnDefs);
54
55
  }
55
56
 
56
57
  // 旧格式:使用旧的处理逻辑
57
58
  // 检查是否需要迁移
58
59
  if ((0, _columnGroupUtils.isOldSchemeData)(columns)) {
59
- // 先迁移到新格式,再转换
60
+ // 先迁移到新格式,再转换,传入原始列定义
60
61
  var migrated = (0, _columnGroupUtils.migrateOldScheme)(columns);
61
- return (0, _columnGroupUtils.flatConfigToGridState)(migrated);
62
+ return (0, _columnGroupUtils.flatConfigToGridState)(migrated, originalColumnDefs);
62
63
  }
63
64
 
64
65
  // 兼容最原始的格式(groupName)
@@ -12,6 +12,7 @@ var _agGridReact = require("ag-grid-react");
12
12
  var _antd = require("antd");
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _agGridEnterprise = require("ag-grid-enterprise");
15
+ var _theme = require("./theme");
15
16
  require("./index.less");
16
17
  var _queryForm = _interopRequireDefault(require("./queryForm"));
17
18
  var _toolBar = _interopRequireDefault(require("./toolBar"));
@@ -53,6 +54,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
53
54
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
54
55
  // AG-Grid v33+ 需要显式注册模块
55
56
  _agGridCommunity.ModuleRegistry.registerModules([_agGridEnterprise.AllEnterpriseModule]);
57
+
58
+ // 导入 AG-Grid v33 主题
59
+
56
60
  var Text = _antd.Typography.Text;
57
61
  var getSort = function getSort(columnState) {
58
62
  return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
@@ -249,12 +253,44 @@ function AgGridPlus(props) {
249
253
  // 只在首次有数据时保存
250
254
  if (!firstRowDataRef.current && rowData.length > 0) {
251
255
  firstRowDataRef.current = rowData[0];
252
- console.log('[AgGridPlus] 保存首行数据用于类型推断:', firstRowDataRef.current);
253
256
  }
254
257
  }, [rowData]);
255
258
 
256
- // 测试列数据
257
- // const restData = [{"id":"47","field":"code","headerName":"编码","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"code","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"48","field":"name","headerName":"名称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"name","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"49","field":"abbName","headerName":"简称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"abbName","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"50","field":"address","headerName":"地址","width":662,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"address","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":1},{"id":"51","field":"creator","headerName":"创建人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creator","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"52","field":"creationTime","headerName":"创建时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"53","field":"lastModifier","headerName":"最后修改人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModifier","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"54","field":"lastModificationTime","headerName":"最后修改时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModificationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"55","field":"","headerName":"操作","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"0","pinned":"right","sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null}]
259
+ // 【修复】加载列方案时,合并原始列定义和方案配置
260
+ // 确保保留 cellRenderer、valueFormatter、valueEnum 等自定义属性
261
+ (0, _react.useEffect)(function () {
262
+ if (!gridKey || !apiRef.current) return;
263
+ var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
264
+
265
+ // 只有当有 columnConfig 时才应用方案
266
+ if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
267
+ var _require = require("./setting/columnGroupUtils"),
268
+ flatConfigToGridState = _require.flatConfigToGridState;
269
+
270
+ // 【关键】使用 flatConfigToGridState 合并原始列定义和方案配置
271
+ // 这样可以保留原始列定义中的 cellRenderer、valueFormatter、valueEnum 等属性
272
+ var mergedColumnDefs = flatConfigToGridState(currentScheme.columnConfig, allColDefsRef.current // 传入原始完整的列定义
273
+ );
274
+
275
+ // 应用合并后的列定义
276
+ apiRef.current.setGridOption("columnDefs", mergedColumnDefs);
277
+
278
+ // 设置列样式
279
+ var _require2 = require("./setting/columnGroupUtils"),
280
+ flatConfigToColumnState = _require2.flatConfigToColumnState;
281
+ var _columnState = flatConfigToColumnState(currentScheme.columnConfig);
282
+ setColumnCellClass(handelgridPlusColumnState(_columnState));
283
+ }
284
+
285
+ // 应用过滤器状态
286
+ if (currentScheme !== null && currentScheme !== void 0 && currentScheme.filterModel) {
287
+ setTimeout(function () {
288
+ if (apiRef.current) {
289
+ apiRef.current.setFilterModel(currentScheme.filterModel);
290
+ }
291
+ }, 50);
292
+ }
293
+ }, [gridKey, apiRef.current, columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, allColDefsRef.current]);
258
294
 
259
295
  // 加载列方案
260
296
  // 仅用于设置列样式,不改变列结构
@@ -265,16 +301,10 @@ function AgGridPlus(props) {
265
301
 
266
302
  // 只有当有 columnConfig 时才设置列样式
267
303
  if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
268
- var _require = require("./setting/columnGroupUtils"),
269
- flatConfigToColumnState = _require.flatConfigToColumnState;
270
- var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
271
- console.log('[AgGridPlus] useEffect #1: 设置列样式', {
272
- gridKey: gridKey,
273
- schemeId: columnSchemeManager.currentScheme.id,
274
- schemeName: columnSchemeManager.currentScheme.name,
275
- columnCount: _columnState.length
276
- });
277
- setColumnCellClass(handelgridPlusColumnState(_columnState));
304
+ var _require3 = require("./setting/columnGroupUtils"),
305
+ flatConfigToColumnState = _require3.flatConfigToColumnState;
306
+ var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
307
+ setColumnCellClass(handelgridPlusColumnState(_columnState2));
278
308
 
279
309
  // 【重要】不再调用 applyColumnState
280
310
  // 原因:
@@ -286,6 +316,7 @@ function AgGridPlus(props) {
286
316
 
287
317
  // 【修复】使用 applyColumnState 来应用列的顺序、宽度、隐藏等状态
288
318
  // applyColumnState 是 AG-Grid 推荐的方式,专门用于控制列状态
319
+ // 【重要】使用 defaultState: false 确保只更新方案中保存的属性,保留其他原始列属性
289
320
  (0, _react.useEffect)(function () {
290
321
  var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
291
322
  if (!apiRef.current || !currentScheme) {
@@ -294,15 +325,18 @@ function AgGridPlus(props) {
294
325
 
295
326
  // 如果有 columnConfig,使用 applyColumnState 应用列状态
296
327
  if (currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
297
- var _require2 = require("./setting/columnGroupUtils"),
298
- flatConfigToColumnState = _require2.flatConfigToColumnState;
299
- var _columnState2 = flatConfigToColumnState(currentScheme.columnConfig);
328
+ var _require4 = require("./setting/columnGroupUtils"),
329
+ flatConfigToColumnState = _require4.flatConfigToColumnState;
330
+ var _columnState3 = flatConfigToColumnState(currentScheme.columnConfig);
300
331
 
301
332
  // 使用 applyColumnState 应用列状态
302
- // applyOrder: true 表示按照 state 数组的顺序重新排列列
333
+ // applyOrder: true - 按照 state 数组的顺序重新排列列
334
+ // defaultState: undefined - 【关键】不提供默认状态,只更新方案中指定的属性,保留其他原始列属性
303
335
  apiRef.current.applyColumnState({
304
- state: _columnState2,
336
+ state: _columnState3,
305
337
  applyOrder: true
338
+ // 不设置 defaultState,这样只会更新 state 中指定的属性
339
+ // 保留列定义中的 cellRenderer、valueFormatter、headerName 等属性
306
340
  });
307
341
  }
308
342
 
@@ -481,14 +515,6 @@ function AgGridPlus(props) {
481
515
  var cols = getTableColumns([dataForTypeInference]);
482
516
  allColDefsRef.current = cols; // 同步更新 ref
483
517
 
484
- console.log('[AgGridPlus] allColDefs 重新计算:', {
485
- childrenCount: _react.default.Children.count(children),
486
- hasPropsColumnDefs: !!props.columnDefs,
487
- extensibleColumnsCount: Object.keys(extensibleColumns || {}).length,
488
- gridKey: gridKey,
489
- colsCount: cols.length,
490
- usingCachedData: !!firstRowDataRef.current
491
- });
492
518
  return cols;
493
519
  }, [_react.default.Children.count(children), props.columnDefs, extensibleColumns, gridKey]);
494
520
 
@@ -899,10 +925,12 @@ function AgGridPlus(props) {
899
925
  var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
900
926
 
901
927
  // 【修复】优先使用方案的 columnConfig,避免被默认逻辑覆盖
928
+ // 【关键修复】传入 allColDefsRef.current 以保留 cellRenderer、valueEnum 等属性
902
929
  if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
903
- var _require3 = require("./setting/columnGroupUtils"),
904
- flatConfigToGridState = _require3.flatConfigToGridState;
905
- var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
930
+ var _require5 = require("./setting/columnGroupUtils"),
931
+ flatConfigToGridState = _require5.flatConfigToGridState;
932
+ var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig, allColDefsRef.current // 传入原始完整的列定义
933
+ );
906
934
  return gridColumnDefs;
907
935
  }
908
936
 
@@ -943,7 +971,8 @@ function AgGridPlus(props) {
943
971
  });
944
972
  var processedColumns = (0, _processColumnGroups.default)(columnDefs);
945
973
  return processedColumns;
946
- }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, _react.default.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
974
+ }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, _react.default.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, allColDefsRef.current // 添加到依赖项
975
+ ]);
947
976
 
948
977
  // 构建查询表单项(带 order 属性)
949
978
  var queryFormItems = (0, _react.useMemo)(function () {
@@ -988,6 +1017,8 @@ function AgGridPlus(props) {
988
1017
  return {
989
1018
  extensibleColumns: extensibleColumns,
990
1019
  columnState: gridPlusColumnState,
1020
+ allColDefs: allColDefsRef.current,
1021
+ // 【修复】传入原始完整的列定义
991
1022
  onSaveColumnState: onSaveColumnState,
992
1023
  applyToGlobal: applyToGlobal,
993
1024
  resetCurrent: resetCurrent,
@@ -998,7 +1029,9 @@ function AgGridPlus(props) {
998
1029
  updateQueryOrder: setQueryItemsOrder,
999
1030
  queryFormItems: queryFormItems
1000
1031
  };
1001
- }, [extensibleColumns, gridPlusColumnState, onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
1032
+ }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
1033
+ // 【修复】添加到依赖数组
1034
+ onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
1002
1035
  return /*#__PURE__*/_react.default.createElement(_gridContext.GridPlusContext.Provider, {
1003
1036
  value: gridPlusContextValue
1004
1037
  }, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
@@ -1068,12 +1101,13 @@ function AgGridPlus(props) {
1068
1101
  onSaveColumnState: onColumnStateChanged
1069
1102
  })]
1070
1103
  }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({
1071
- className: "ag-theme-custom"
1104
+ theme: _theme.agGridTheme
1072
1105
  }, rest, {
1073
1106
  localeText: _locale.localeText,
1074
1107
  gridOptions: {
1075
1108
  enableCellTextSelection: true,
1076
- ensureDomOrder: true
1109
+ ensureDomOrder: true,
1110
+ columnHoverHighlight: true
1077
1111
  },
1078
1112
  overlayNoRowsTemplate: (0, _sanitize.createSafeHtmlTemplate)(overlayNoRowsTemplateText || '没有找到数据,试试调整筛选条件吧!'),
1079
1113
  enableRangeSelection: true,
@@ -1101,8 +1135,8 @@ function AgGridPlus(props) {
1101
1135
  onDragStopped: function onDragStopped(e) {
1102
1136
  if (apiRef.current) {
1103
1137
  var _apiRef$current5;
1104
- var _columnState3 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
1105
- setColumnState(_columnState3);
1138
+ var _columnState4 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
1139
+ setColumnState(_columnState4);
1106
1140
 
1107
1141
  // onColumnStateChanged && onColumnStateChanged(columnState)
1108
1142
  }
@@ -10,6 +10,11 @@ export interface GridPlusContextValue {
10
10
  * 当前表格的列状态信息,包括列的显示/隐藏、顺序、宽度等
11
11
  */
12
12
  columnState: any;
13
+ /**
14
+ * 原始完整的列定义,包含所有自定义属性(cellRenderer、valueFormatter、valueEnum 等)
15
+ * 用于列方案应用时保留这些属性
16
+ */
17
+ allColDefs?: any[];
13
18
  /**
14
19
  * 保存当前表格的列状态到服务器(仅保存当前表格)
15
20
  * @param gridKey 表格唯一标识
@@ -2,7 +2,6 @@ import AgGridPlus from "./ag-gridPlus";
2
2
  import { AgGridColumn } from "./interface";
3
3
  import { GridPlusContext } from "./context/gridContext";
4
4
  import { useGridPlusColumnState } from "./hooks/useGridPlusColumnState";
5
- import "./ag-grid-theme-builder.css";
6
5
  export { AgGridPlus, AgGridColumn, GridPlusContext, useGridPlusColumnState };
7
6
  export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";
8
7
  export { useColumnSchemes, LocalStorageAdapter, defaultStorageAdapter, validateScheme, validateSchemeName, validateSchemeDescription, checkDuplicateName, generateUniqueName, STORAGE_PREFIX, DEFAULT_SCHEME_NAME, MAX_SCHEMES_PER_GRID, MAX_SCHEME_NAME_LENGTH, SchemeSelector, SchemeManager } from "./schemes";
@@ -241,7 +241,6 @@ var _agGridPlus = _interopRequireDefault(require("./ag-gridPlus"));
241
241
  var _interface = require("./interface");
242
242
  var _gridContext = require("./context/gridContext");
243
243
  var _useGridPlusColumnState = require("./hooks/useGridPlusColumnState");
244
- require("./ag-grid-theme-builder.css");
245
244
  var _utils = require("./utils");
246
245
  var _schemes = require("./schemes");
247
246
  var _storage = require("./storage");
@@ -200,20 +200,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
200
200
  var updateItems = (0, _react.useCallback)(function (newItems) {
201
201
  // 重新计算 order
202
202
  (0, _columnGroupUtils.reorderItems)(newItems);
203
- console.log('[ColumnConfigTable] updateItems 调用,重新计算 order 后:', {
204
- itemsCount: newItems.length,
205
- items: newItems.map(function (item, idx) {
206
- return {
207
- index: idx,
208
- id: item.id,
209
- type: item.type,
210
- headerName: item.headerName,
211
- field: item.field,
212
- order: item.order,
213
- parentId: item.parentId
214
- };
215
- })
216
- });
217
203
  setLocalItems(_toConsumableArray(newItems));
218
204
  onChange(_toConsumableArray(newItems));
219
205
  }, [onChange]);
@@ -260,10 +246,10 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
260
246
 
261
247
  // 计算表格可用高度 = Modal Content 高度 - Header - Footer - 容器之前的内容高度 - 底部留白
262
248
  var contentBeforeTable = containerRect.top - modalContentRect.top - headerHeight;
263
- var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable - 20;
249
+ var availableHeight = modalContentRect.height - headerHeight - footerHeight - contentBeforeTable - 55;
264
250
 
265
251
  // 设置最小高度为300px
266
- var finalHeight = Math.max(100, availableHeight);
252
+ var finalHeight = Math.max(600, availableHeight);
267
253
  setTableHeight(finalHeight);
268
254
  }
269
255
  }
@@ -401,24 +387,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
401
387
  * 打开移动节点弹窗
402
388
  */
403
389
  var handleOpenMoveModal = (0, _react.useCallback)(function (node) {
404
- console.log('[ColumnConfigTable] 打开移动弹窗:', {
405
- node: {
406
- id: node.id,
407
- headerName: node.headerName,
408
- type: node.type,
409
- parentId: node.parentId,
410
- level: node.level
411
- },
412
- allItems: localItems.map(function (n) {
413
- return {
414
- id: n.id,
415
- headerName: n.headerName,
416
- type: n.type,
417
- parentId: n.parentId,
418
- level: n.level
419
- };
420
- })
421
- });
422
390
  setCurrentMoveNode(node);
423
391
  setMoveModalVisible(true);
424
392
  }, [localItems]);
@@ -480,18 +448,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
480
448
  });
481
449
  };
482
450
  collectNodes(nodeId);
483
- console.log('[ColumnConfigTable] 移动节点:', {
484
- nodeId: nodeId,
485
- targetParentId: targetParentId,
486
- nodesToMoveCount: nodesToMove.length,
487
- nodesToMove: nodesToMove.map(function (n) {
488
- return {
489
- id: n.id,
490
- headerName: n.headerName,
491
- parentId: n.parentId
492
- };
493
- })
494
- });
495
451
 
496
452
  // 3.2 从原位置移除这些节点
497
453
  var remainingItems = newItems.filter(function (item) {
@@ -524,37 +480,12 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
524
480
  // 插入到根级别的末尾
525
481
  insertIndex = remainingItems.length;
526
482
  }
527
- console.log('[ColumnConfigTable] 插入位置:', {
528
- insertIndex: insertIndex,
529
- targetParentId: targetParentId,
530
- remainingItemsCount: remainingItems.length,
531
- updatedNodesToMove: updatedNodesToMove.map(function (n) {
532
- return {
533
- id: n.id,
534
- headerName: n.headerName,
535
- parentId: n.parentId,
536
- level: n.level
537
- };
538
- })
539
- });
540
483
 
541
484
  // 3.6 插入节点
542
485
  remainingItems.splice.apply(remainingItems, [insertIndex, 0].concat(_toConsumableArray(updatedNodesToMove)));
543
486
 
544
487
  // 3.7 重新计算 order
545
488
  (0, _columnGroupUtils.reorderItems)(remainingItems);
546
- console.log('[ColumnConfigTable] 移动完成后的数组:', {
547
- totalCount: remainingItems.length,
548
- items: remainingItems.map(function (n) {
549
- return {
550
- id: n.id,
551
- headerName: n.headerName,
552
- parentId: n.parentId,
553
- level: n.level,
554
- order: n.order
555
- };
556
- })
557
- });
558
489
  updateItems(remainingItems);
559
490
  _antd.message.success("\u5DF2\u5C06\"".concat(currentMoveNode.headerName, "\"\u79FB\u52A8\u5230\u65B0\u4F4D\u7F6E"));
560
491
  handleCloseMoveModal();
@@ -670,25 +601,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
670
601
  };
671
602
  collectDescendants(draggedItem.id);
672
603
  }
673
- console.log('[ColumnConfigTable] 拖动排序:', {
674
- dragIndex: dragIndex,
675
- hoverIndex: hoverIndex,
676
- realDragIndex: realDragIndex,
677
- realHoverIndex: realHoverIndex,
678
- draggedItem: {
679
- id: draggedItem.id,
680
- headerName: draggedItem.headerName,
681
- type: draggedItem.type
682
- },
683
- nodesToMoveCount: nodesToMove.length,
684
- nodesToMove: nodesToMove.map(function (n) {
685
- return {
686
- id: n.id,
687
- headerName: n.headerName,
688
- parentId: n.parentId
689
- };
690
- })
691
- });
692
604
 
693
605
  // 从原数组中移除所有要移动的节点
694
606
  var remainingItems = newItems.filter(function (item) {
@@ -707,20 +619,6 @@ var ColumnConfigTable = function ColumnConfigTable(_ref3) {
707
619
 
708
620
  // 在新位置插入所有节点
709
621
  remainingItems.splice.apply(remainingItems, [adjustedHoverIndex, 0].concat(nodesToMove));
710
- console.log('[ColumnConfigTable] 拖动完成,准备更新:', {
711
- remainingItemsCount: remainingItems.length,
712
- items: remainingItems.map(function (item, idx) {
713
- return {
714
- index: idx,
715
- id: item.id,
716
- type: item.type,
717
- headerName: item.headerName,
718
- field: item.field,
719
- order: item.order,
720
- parentId: item.parentId
721
- };
722
- })
723
- });
724
622
 
725
623
  // 使用 updateItems 来同时更新本地状态和通知父组件
726
624
  updateItems(remainingItems);