@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.
- package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.d.ts +2 -1
- package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.js +6 -5
- package/dist/cjs/ag-grid-plus/ag-gridPlus.js +69 -35
- package/dist/cjs/ag-grid-plus/context/gridContext.d.ts +5 -0
- package/dist/cjs/ag-grid-plus/index.d.ts +0 -1
- package/dist/cjs/ag-grid-plus/index.js +0 -1
- package/dist/cjs/ag-grid-plus/setting/ColumnConfigTable.js +2 -104
- package/dist/cjs/ag-grid-plus/setting/ColumnSetting.js +59 -102
- package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.d.ts +5 -1
- package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.js +64 -1
- package/dist/cjs/ag-grid-plus/theme.d.ts +5 -0
- package/dist/cjs/ag-grid-plus/theme.js +78 -0
- package/dist/esm/ag-grid-plus/_utils/processColumnGroups.d.ts +2 -1
- package/dist/esm/ag-grid-plus/_utils/processColumnGroups.js +6 -5
- package/dist/esm/ag-grid-plus/ag-gridPlus.js +68 -35
- package/dist/esm/ag-grid-plus/context/gridContext.d.ts +5 -0
- package/dist/esm/ag-grid-plus/index.d.ts +0 -1
- package/dist/esm/ag-grid-plus/index.js +0 -1
- package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.js +2 -104
- package/dist/esm/ag-grid-plus/setting/ColumnSetting.js +60 -103
- package/dist/esm/ag-grid-plus/setting/columnGroupUtils.d.ts +5 -1
- package/dist/esm/ag-grid-plus/setting/columnGroupUtils.js +64 -1
- package/dist/esm/ag-grid-plus/theme.d.ts +5 -0
- package/dist/esm/ag-grid-plus/theme.js +72 -0
- package/dist/esm/standardFormDialog/useStandardFormSchema.d.ts +1 -1
- package/dist/umd/qc-ui.min.css +1 -1
- package/dist/umd/qc-ui.min.js +1 -1
- package/package.json +1 -1
- package/dist/cjs/ag-grid-plus/setting/ColumnConfigTable.d.ts.map +0 -1
- package/dist/esm/ConfirmPro/index.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/LogicSelector.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/RuleBuilderContainer.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/RuleCard.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/RuleGroupEditor.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/constants/operators.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/context/RuleBuilderContext.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/index.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/inputs/BetweenValueInput.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/inputs/MultiValueInput.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/inputs/SingleValueInput.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/inputs/ValueInput.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/selectors/FieldSelector.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/selectors/OperatorSelector.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/types/index.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/utils/pathHelpers.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/utils/ruleHelpers.d.ts.map +0 -1
- package/dist/esm/RuleBuilder/utils/validation.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/_utils/boolSelect.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/_utils/customGroupCellRenderer.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/_utils/processColumnGroups.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/_utils/processFormColumnState.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/ag-gridPlus.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/context/gridContext.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/errors/ErrorBoundary.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/errors/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/errors/types.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/hooks/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/hooks/useAgGridCalculation.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/hooks/useAgGridData.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/hooks/useGridPlusColumnState.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/hooks/useGridState.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/interface.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/locale.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/queryForm/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/queryForm/queryForm.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/components/QuerySchemesManager.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/components/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/constants.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/hooks/useQueryOrderManager.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/hooks/useQuerySchemes.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/storage/localStorageAdapter.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/types.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/querySchemes/utils/validator.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/components/SchemeManager.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/components/SchemeSelector.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/components/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/constants.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/hooks/useColumnSchemes.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/storage/localStorageAdapter.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/types.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/schemes/utils/validator.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/ColumnConfigForm.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/ColumnSetting.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/MoveNodeModal.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/NameColumnRenderer.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/columnGroupTypes.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/columnGroupUtils.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/setting/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/settingItem/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/shared/hooks/useSchemeManager.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/storage/MemoryStorageAdapter.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/storage/SchemeSyncManager.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/storage/globalSyncManager.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/storage/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/storage/types.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/toolBar/index.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/toolBar/style.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/types.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/utils/columnProcessors.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/utils/constants.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/utils/logger.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/utils/sanitize.d.ts.map +0 -1
- package/dist/esm/ag-grid-plus/utils.d.ts.map +0 -1
- package/dist/esm/array-table/arrayAddBtn.d.ts.map +0 -1
- package/dist/esm/array-table/arrayBase.d.ts.map +0 -1
- package/dist/esm/array-table/columnHelper.d.ts.map +0 -1
- package/dist/esm/array-table/hooks.d.ts.map +0 -1
- package/dist/esm/array-table/index.d.ts.map +0 -1
- package/dist/esm/array-table/interface.d.ts.map +0 -1
- package/dist/esm/array-table/preview.d.ts.map +0 -1
- package/dist/esm/array-table/utils.d.ts.map +0 -1
- package/dist/esm/array-table-index/index.d.ts.map +0 -1
- package/dist/esm/card/index.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/core/RegexEditor.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/core/extensions/errorMarker.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/core/types.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/hooks/index.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/hooks/useRegexTester.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/hooks/useRegexValidation.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/hooks/useTemplateManager.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/index.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/templates/TemplateSelector.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/templates/builtinTemplates.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/templates/index.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/templates/storage.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/templates/templateManager.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/templates/types.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/testing/types.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/validation/complexity.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/validation/parser.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/validation/types.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/validation/validator.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/FlagsSelector.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/MatchItem.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/RegexRailroadDiagram.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/RegexTester.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/astToRailroad.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/index.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/types.d.ts.map +0 -1
- package/dist/esm/components/RegexEditor/visualizer/utils.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/components/index.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/components/modal/index.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/components/toolbar/index.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/components/toolbar/style/index.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/index.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/service.d.ts.map +0 -1
- package/dist/esm/dashboard/dashboard/utils.d.ts.map +0 -1
- package/dist/esm/dashboard/index.d.ts.map +0 -1
- package/dist/esm/dashboard/utils.d.ts.map +0 -1
- package/dist/esm/dashboard/widget/index.d.ts.map +0 -1
- package/dist/esm/dashboard/widget/selector/index.d.ts.map +0 -1
- package/dist/esm/dashboard/widget/utils.d.ts.map +0 -1
- package/dist/esm/deleteConfirm/index.d.ts.map +0 -1
- package/dist/esm/dialogSelect/index.d.ts.map +0 -1
- package/dist/esm/draggableModal/index.d.ts.map +0 -1
- package/dist/esm/editable/index.d.ts.map +0 -1
- package/dist/esm/editable/style.d.ts.map +0 -1
- package/dist/esm/extensible-grid/index.d.ts.map +0 -1
- package/dist/esm/extensible-grid/interface.d.ts.map +0 -1
- package/dist/esm/formDesigner/FormDesigner.d.ts.map +0 -1
- package/dist/esm/formDesigner/ProCard/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/arrayTable/arrayTableSchema.d.ts.map +0 -1
- package/dist/esm/formDesigner/arrayTable/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/arrayTable/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/arrayTableIndex/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/arrayTableIndex/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/card/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/card/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty1/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty1/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty10/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty10/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty2/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty2/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty3/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty3/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty4/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty4/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty5/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty5/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty6/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty6/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty7/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty7/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty8/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty8/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty9/index.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/preDefineProperty9/preview.d.ts.map +0 -1
- package/dist/esm/formDesigner/preWidgets/utils.d.ts.map +0 -1
- package/dist/esm/formDesigner/widgets/ActionsWidget.d.ts.map +0 -1
- package/dist/esm/formDesigner/widgets/LogoWidget.d.ts.map +0 -1
- package/dist/esm/formDesigner/widgets/PreviewWidget.d.ts.map +0 -1
- package/dist/esm/formDesigner/widgets/SchemaEditorWidget.d.ts.map +0 -1
- package/dist/esm/formDesigner/widgets/index.d.ts.map +0 -1
- package/dist/esm/formPro/context/formProContext.d.ts.map +0 -1
- package/dist/esm/formPro/formLayoutPro.d.ts.map +0 -1
- package/dist/esm/formPro/index.d.ts.map +0 -1
- package/dist/esm/fullScreenAlert/index.d.ts.map +0 -1
- package/dist/esm/generatedListPage/ConfigurableToolbar.d.ts.map +0 -1
- package/dist/esm/generatedListPage/GeneratedListPage.d.ts.map +0 -1
- package/dist/esm/generatedListPage/OptionsColumn.d.ts.map +0 -1
- package/dist/esm/generatedListPage/PerformanceMonitor.d.ts.map +0 -1
- package/dist/esm/generatedListPage/RequestManager.d.ts.map +0 -1
- package/dist/esm/generatedListPage/_utils/AccessWrapper.d.ts.map +0 -1
- package/dist/esm/generatedListPage/_utils/defaultHandlers.d.ts.map +0 -1
- package/dist/esm/generatedListPage/index.d.ts.map +0 -1
- package/dist/esm/generatedListPage/types.d.ts.map +0 -1
- package/dist/esm/generatedListPage/usePermissionCheck.d.ts.map +0 -1
- package/dist/esm/generatedListPage/useRequestManager.d.ts.map +0 -1
- package/dist/esm/importModal/index.d.ts.map +0 -1
- package/dist/esm/index.d.ts.map +0 -1
- package/dist/esm/queryBuilder/index.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/FormValidation.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/PortalManager.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/StandardFormDialog.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/index.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/types.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/useStandardFormSchema.d.ts.map +0 -1
- package/dist/esm/standardFormDialog/withStandardForm.d.ts.map +0 -1
- package/dist/esm/toolBar/index.d.ts.map +0 -1
|
@@ -13,7 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
13
13
|
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; }
|
|
14
14
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
15
15
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
16
|
-
import React, { useState, useCallback, useMemo, useEffect } from 'react';
|
|
16
|
+
import React, { useState, useCallback, useMemo, useEffect, useContext } from 'react';
|
|
17
17
|
import { Modal, Tabs, Space, Button, Input, message, Popconfirm, Table, Tag, Tooltip, Card, Row, Col, Empty, Radio } from 'antd';
|
|
18
18
|
import { SaveOutlined, ReloadOutlined, EditOutlined, DeleteOutlined, StarOutlined, StarFilled, AppstoreOutlined, UnorderedListOutlined, SearchOutlined } from '@ant-design/icons';
|
|
19
19
|
import { createForm, onFormInit } from '@formily/core';
|
|
@@ -21,6 +21,7 @@ import { gridStateToFlatConfig, flatConfigToGridState, isOldSchemeData, migrateO
|
|
|
21
21
|
import ColumnConfigTable from "./ColumnConfigTable";
|
|
22
22
|
import processColumnGroups from "../_utils/processColumnGroups";
|
|
23
23
|
import DraggableModal from "../../draggableModal";
|
|
24
|
+
import { GridPlusContext } from "../context/gridContext";
|
|
24
25
|
var TabPane = Tabs.TabPane;
|
|
25
26
|
var TextArea = Input.TextArea;
|
|
26
27
|
/**
|
|
@@ -75,11 +76,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
75
76
|
viewMode = _useState18[0],
|
|
76
77
|
setViewMode = _useState18[1];
|
|
77
78
|
|
|
78
|
-
//
|
|
79
|
+
// 【修复】从 Context 获取原始完整的列定义
|
|
80
|
+
var gridPlusContext = useContext(GridPlusContext);
|
|
81
|
+
var originalColumnDefs = (gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.allColDefs) || undefined;
|
|
82
|
+
|
|
83
|
+
// 【修复】保存快照用于取消时恢复(改名避免与Context的originalColumnDefs冲突)
|
|
79
84
|
var _useState19 = useState(null),
|
|
80
85
|
_useState20 = _slicedToArray(_useState19, 2),
|
|
81
|
-
|
|
82
|
-
|
|
86
|
+
snapshotColumnDefs = _useState20[0],
|
|
87
|
+
setSnapshotColumnDefs = _useState20[1];
|
|
83
88
|
|
|
84
89
|
/**
|
|
85
90
|
* 获取列数据 - 将 Grid 的列定义转换为扁平化配置
|
|
@@ -89,17 +94,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
89
94
|
var _schemeManager$curren;
|
|
90
95
|
// 优先使用当前方案中保存的完整列配置(包含分组结构)
|
|
91
96
|
if (schemeManager !== null && schemeManager !== void 0 && (_schemeManager$curren = schemeManager.currentScheme) !== null && _schemeManager$curren !== void 0 && _schemeManager$curren.columnConfig) {
|
|
92
|
-
console.log('[ColumnSetting] 使用方案中保存的 columnConfig:', schemeManager.currentScheme.columnConfig);
|
|
93
97
|
return schemeManager.currentScheme.columnConfig;
|
|
94
98
|
}
|
|
95
99
|
|
|
96
100
|
// 如果方案中没有 columnConfig,则从 Grid 读取
|
|
97
101
|
var columnDefs = gridApi.getColumnDefs() || [];
|
|
98
102
|
var columnStates = gridApi.getColumnState();
|
|
99
|
-
console.log('[ColumnSetting] 从 Grid 读取列配置:', {
|
|
100
|
-
columnDefs: columnDefs,
|
|
101
|
-
columnStates: columnStates
|
|
102
|
-
});
|
|
103
103
|
|
|
104
104
|
// 将 Grid 状态转换为扁平化配置
|
|
105
105
|
var flatConfig = gridStateToFlatConfig(columnDefs);
|
|
@@ -157,11 +157,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
157
157
|
}
|
|
158
158
|
}, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme, visible, form, getColumnData]);
|
|
159
159
|
|
|
160
|
-
//
|
|
160
|
+
// 【修复】弹窗打开时保存快照,用于取消时恢复
|
|
161
161
|
useEffect(function () {
|
|
162
162
|
if (visible) {
|
|
163
163
|
var currentDefs = gridApi.getColumnDefs();
|
|
164
|
-
|
|
164
|
+
setSnapshotColumnDefs(currentDefs);
|
|
165
165
|
}
|
|
166
166
|
}, [visible, gridApi]);
|
|
167
167
|
|
|
@@ -175,31 +175,31 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
175
175
|
items: newItems
|
|
176
176
|
});
|
|
177
177
|
|
|
178
|
-
// 2.
|
|
179
|
-
var gridColumnDefs = flatConfigToGridState(newItems);
|
|
178
|
+
// 2. 【修复】转换为 AG-Grid 列定义,传入原始列定义以保留自定义属性
|
|
179
|
+
var gridColumnDefs = flatConfigToGridState(newItems, originalColumnDefs);
|
|
180
180
|
|
|
181
181
|
// 3. 立即应用到 Grid(实时预览,不保存到方案)
|
|
182
182
|
if (type !== 'formArrayTable') {
|
|
183
183
|
gridApi.setGridOption("columnDefs", gridColumnDefs);
|
|
184
184
|
}
|
|
185
|
-
}, [form, gridApi, type]);
|
|
185
|
+
}, [form, gridApi, type, originalColumnDefs]);
|
|
186
186
|
|
|
187
187
|
/**
|
|
188
188
|
* 关闭弹窗处理 - 取消时恢复原始状态
|
|
189
189
|
* 如果用户取消操作,恢复到打开弹窗前的列定义状态
|
|
190
190
|
*/
|
|
191
191
|
var handleClose = useCallback(function () {
|
|
192
|
-
//
|
|
193
|
-
if (
|
|
194
|
-
gridApi.setGridOption("columnDefs",
|
|
192
|
+
// 【修复】如果有保存的快照,恢复它
|
|
193
|
+
if (snapshotColumnDefs && type !== 'formArrayTable') {
|
|
194
|
+
gridApi.setGridOption("columnDefs", snapshotColumnDefs);
|
|
195
195
|
}
|
|
196
196
|
|
|
197
|
-
//
|
|
198
|
-
|
|
197
|
+
// 清空快照
|
|
198
|
+
setSnapshotColumnDefs(null);
|
|
199
199
|
|
|
200
200
|
// 调用父组件的 onClose
|
|
201
201
|
onClose();
|
|
202
|
-
}, [
|
|
202
|
+
}, [snapshotColumnDefs, gridApi, type, onClose]);
|
|
203
203
|
|
|
204
204
|
/**
|
|
205
205
|
* 保存列配置
|
|
@@ -224,14 +224,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
224
224
|
message.info('检测到旧版本配置,已自动迁移到新格式');
|
|
225
225
|
}
|
|
226
226
|
|
|
227
|
-
//
|
|
228
|
-
gridColumnDefs = flatConfigToGridState(configToSave);
|
|
229
|
-
console.log('[ColumnSetting] 保存列配置:', {
|
|
230
|
-
flatConfig: configToSave,
|
|
231
|
-
gridColumnDefs: gridColumnDefs
|
|
232
|
-
});
|
|
233
|
-
|
|
234
|
-
// 先应用列配置到 Grid
|
|
227
|
+
// 【修复】转换为 AG-Grid 的列定义,传入原始列定义以保留自定义属性
|
|
228
|
+
gridColumnDefs = flatConfigToGridState(configToSave, originalColumnDefs); // 先应用列配置到 Grid
|
|
235
229
|
if (type !== 'formArrayTable') {
|
|
236
230
|
gridApi.setGridOption("columnDefs", gridColumnDefs);
|
|
237
231
|
}
|
|
@@ -240,69 +234,54 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
240
234
|
|
|
241
235
|
// 等待 Grid 状态更新完成后再保存到方案
|
|
242
236
|
setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
243
|
-
var updatedState, filterModel, defaultScheme,
|
|
237
|
+
var updatedState, filterModel, defaultScheme, newScheme;
|
|
244
238
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
245
239
|
while (1) switch (_context.prev = _context.next) {
|
|
246
240
|
case 0:
|
|
247
241
|
if (!(schemeManager && gridKey)) {
|
|
248
|
-
_context.next =
|
|
242
|
+
_context.next = 25;
|
|
249
243
|
break;
|
|
250
244
|
}
|
|
251
245
|
_context.prev = 1;
|
|
252
246
|
// 从 Grid 获取应用后的最新列状态和过滤器状态
|
|
253
247
|
updatedState = gridApi.getColumnState();
|
|
254
248
|
filterModel = gridApi.getFilterModel();
|
|
255
|
-
console.log('[ColumnSetting] 准备保存到方案:', {
|
|
256
|
-
columnConfig: configToSave,
|
|
257
|
-
columnConfigLength: configToSave.length,
|
|
258
|
-
columnConfigDetail: configToSave.map(function (item, idx) {
|
|
259
|
-
return {
|
|
260
|
-
index: idx,
|
|
261
|
-
type: item.type,
|
|
262
|
-
headerName: item.headerName,
|
|
263
|
-
field: item.field,
|
|
264
|
-
order: item.order,
|
|
265
|
-
parentId: item.parentId
|
|
266
|
-
};
|
|
267
|
-
}),
|
|
268
|
-
filterModel: filterModel
|
|
269
|
-
});
|
|
270
249
|
if (!schemeManager.currentScheme) {
|
|
271
|
-
_context.next =
|
|
250
|
+
_context.next = 9;
|
|
272
251
|
break;
|
|
273
252
|
}
|
|
274
|
-
_context.next =
|
|
253
|
+
_context.next = 7;
|
|
275
254
|
return schemeManager.saveScheme({
|
|
276
255
|
columnConfig: configToSave,
|
|
277
256
|
// 保存完整的列配置(包含分组结构)
|
|
278
257
|
filterModel: filterModel
|
|
279
258
|
});
|
|
280
|
-
case
|
|
281
|
-
_context.next =
|
|
259
|
+
case 7:
|
|
260
|
+
_context.next = 20;
|
|
282
261
|
break;
|
|
283
|
-
case
|
|
262
|
+
case 9:
|
|
284
263
|
// 如果没有激活的方案,查找或创建"默认配置"方案
|
|
285
264
|
defaultScheme = schemeManager.schemes.find(function (s) {
|
|
286
265
|
return s.isDefault;
|
|
287
266
|
});
|
|
288
267
|
if (!defaultScheme) {
|
|
289
|
-
_context.next =
|
|
268
|
+
_context.next = 17;
|
|
290
269
|
break;
|
|
291
270
|
}
|
|
292
|
-
_context.next =
|
|
271
|
+
_context.next = 13;
|
|
293
272
|
return schemeManager.loadScheme(defaultScheme.id);
|
|
294
|
-
case
|
|
295
|
-
_context.next =
|
|
273
|
+
case 13:
|
|
274
|
+
_context.next = 15;
|
|
296
275
|
return schemeManager.saveScheme({
|
|
297
276
|
columnConfig: configToSave,
|
|
298
277
|
// 保存完整的列配置(包含分组结构)
|
|
299
278
|
filterModel: filterModel
|
|
300
279
|
});
|
|
301
|
-
case
|
|
302
|
-
_context.next = 22;
|
|
303
|
-
break;
|
|
304
|
-
case 18:
|
|
280
|
+
case 15:
|
|
305
281
|
_context.next = 20;
|
|
282
|
+
break;
|
|
283
|
+
case 17:
|
|
284
|
+
_context.next = 19;
|
|
306
285
|
return schemeManager.createScheme('默认配置', configToSave,
|
|
307
286
|
// 使用 columnConfig 而不是 columnState
|
|
308
287
|
{
|
|
@@ -311,38 +290,32 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
311
290
|
filterModel: filterModel,
|
|
312
291
|
activate: true // 立即激活该方案
|
|
313
292
|
});
|
|
314
|
-
case
|
|
293
|
+
case 19:
|
|
315
294
|
newScheme = _context.sent;
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
schemeName: newScheme.name,
|
|
319
|
-
hasColumnConfig: !!newScheme.columnConfig,
|
|
320
|
-
columnConfigLength: ((_newScheme$columnConf = newScheme.columnConfig) === null || _newScheme$columnConf === void 0 ? void 0 : _newScheme$columnConf.length) || 0
|
|
321
|
-
});
|
|
322
|
-
case 22:
|
|
323
|
-
_context.next = 27;
|
|
295
|
+
case 20:
|
|
296
|
+
_context.next = 25;
|
|
324
297
|
break;
|
|
325
|
-
case
|
|
326
|
-
_context.prev =
|
|
298
|
+
case 22:
|
|
299
|
+
_context.prev = 22;
|
|
327
300
|
_context.t0 = _context["catch"](1);
|
|
328
|
-
console.error('
|
|
329
|
-
case
|
|
301
|
+
console.error('保存列配置到方案失败:', _context.t0);
|
|
302
|
+
case 25:
|
|
330
303
|
case "end":
|
|
331
304
|
return _context.stop();
|
|
332
305
|
}
|
|
333
|
-
}, _callee, null, [[1,
|
|
306
|
+
}, _callee, null, [[1, 22]]);
|
|
334
307
|
})), 50);
|
|
335
308
|
|
|
336
|
-
//
|
|
337
|
-
|
|
309
|
+
// 【修复】保存成功后清除快照
|
|
310
|
+
setSnapshotColumnDefs(null);
|
|
338
311
|
message.success('列配置已保存');
|
|
339
312
|
onClose();
|
|
340
|
-
case
|
|
313
|
+
case 12:
|
|
341
314
|
case "end":
|
|
342
315
|
return _context2.stop();
|
|
343
316
|
}
|
|
344
317
|
}, _callee2);
|
|
345
|
-
})), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey]);
|
|
318
|
+
})), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey, originalColumnDefs]);
|
|
346
319
|
|
|
347
320
|
// 保存为新方案
|
|
348
321
|
var handleSaveScheme = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
|
@@ -364,7 +337,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
364
337
|
}
|
|
365
338
|
values = form.values;
|
|
366
339
|
columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
|
|
367
|
-
|
|
340
|
+
// 【修复】传入原始列定义以保留自定义属性
|
|
341
|
+
processedColumns = processColumnGroups(values.items, originalColumnDefs); // 先应用到 Grid
|
|
368
342
|
if (type !== 'formArrayTable') {
|
|
369
343
|
gridApi.setGridOption("columnDefs", processedColumns);
|
|
370
344
|
}
|
|
@@ -667,7 +641,14 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
667
641
|
}
|
|
668
642
|
}];
|
|
669
643
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DraggableModal, {
|
|
670
|
-
title: "\u5217\u65B9\u6848\u7BA1\u7406",
|
|
644
|
+
title: /*#__PURE__*/React.createElement("span", null, "\u5217\u65B9\u6848\u7BA1\u7406", (schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme) && /*#__PURE__*/React.createElement("span", {
|
|
645
|
+
style: {
|
|
646
|
+
marginLeft: 16,
|
|
647
|
+
fontSize: 14,
|
|
648
|
+
fontWeight: 'normal',
|
|
649
|
+
color: '#1890ff'
|
|
650
|
+
}
|
|
651
|
+
}, "- \u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name)),
|
|
671
652
|
open: visible,
|
|
672
653
|
onCancel: handleClose,
|
|
673
654
|
width: 1100,
|
|
@@ -696,31 +677,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
|
|
|
696
677
|
}, /*#__PURE__*/React.createElement(TabPane, {
|
|
697
678
|
tab: "\u5217\u914D\u7F6E",
|
|
698
679
|
key: "columns"
|
|
699
|
-
},
|
|
700
|
-
style: {
|
|
701
|
-
marginBottom: 16,
|
|
702
|
-
padding: '12px 16px',
|
|
703
|
-
background: schemeManager.currentScheme ? '#e6f7ff' : '#f5f5f5',
|
|
704
|
-
borderRadius: 4,
|
|
705
|
-
border: '1px solid',
|
|
706
|
-
borderColor: schemeManager.currentScheme ? '#91d5ff' : '#d9d9d9'
|
|
707
|
-
}
|
|
708
|
-
}, schemeManager.currentScheme ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
|
|
709
|
-
style: {
|
|
710
|
-
fontWeight: 600,
|
|
711
|
-
marginBottom: 4,
|
|
712
|
-
color: '#1890ff'
|
|
713
|
-
}
|
|
714
|
-
}, "\u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name), schemeManager.currentScheme.description && /*#__PURE__*/React.createElement("div", {
|
|
715
|
-
style: {
|
|
716
|
-
fontSize: 12,
|
|
717
|
-
color: '#666'
|
|
718
|
-
}
|
|
719
|
-
}, schemeManager.currentScheme.description)) : /*#__PURE__*/React.createElement("div", {
|
|
720
|
-
style: {
|
|
721
|
-
color: '#666'
|
|
722
|
-
}
|
|
723
|
-
}, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E")), /*#__PURE__*/React.createElement(ColumnConfigTable, {
|
|
680
|
+
}, /*#__PURE__*/React.createElement(ColumnConfigTable, {
|
|
724
681
|
items: form.values.items || [],
|
|
725
682
|
onChange: handleColumnChange,
|
|
726
683
|
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,8 +1,17 @@
|
|
|
1
|
+
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); }
|
|
1
2
|
import _uniqueId from "lodash/uniqueId";
|
|
2
3
|
/**
|
|
3
4
|
* 表头分组配置工具函数
|
|
4
5
|
* 负责 Grid State 与扁平化配置之间的转换
|
|
5
6
|
*/
|
|
7
|
+
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; }
|
|
8
|
+
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; }
|
|
9
|
+
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; }
|
|
10
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
11
|
+
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); }
|
|
12
|
+
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; } } }; }
|
|
13
|
+
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); }
|
|
14
|
+
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; }
|
|
6
15
|
/**
|
|
7
16
|
* 生成唯一 ID
|
|
8
17
|
*/
|
|
@@ -69,10 +78,45 @@ export function gridStateToFlatConfig(columnDefs) {
|
|
|
69
78
|
* 扁平化配置 → Grid State
|
|
70
79
|
* 将扁平化数组重建为 AG-Grid 的树形结构
|
|
71
80
|
*
|
|
81
|
+
* 【重要】如果提供了 originalColumnDefs,会合并原始列定义中的所有属性
|
|
82
|
+
* 这样可以保留 cellRenderer、valueFormatter、valueEnum 等自定义渲染属性
|
|
83
|
+
*
|
|
72
84
|
* @param flatConfig 扁平化配置数组
|
|
85
|
+
* @param originalColumnDefs 原始列定义数组(可选),用于保留自定义属性
|
|
73
86
|
* @returns AG-Grid 列定义数组
|
|
74
87
|
*/
|
|
75
|
-
export function flatConfigToGridState(flatConfig) {
|
|
88
|
+
export function flatConfigToGridState(flatConfig, originalColumnDefs) {
|
|
89
|
+
/**
|
|
90
|
+
* 从原始列定义中查找指定字段的列定义(支持递归查找分组内的列)
|
|
91
|
+
*/
|
|
92
|
+
function findOriginalColDef(field, defs) {
|
|
93
|
+
if (!defs) return undefined;
|
|
94
|
+
var _iterator = _createForOfIteratorHelper(defs),
|
|
95
|
+
_step;
|
|
96
|
+
try {
|
|
97
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
98
|
+
var def = _step.value;
|
|
99
|
+
// 检查是否是分组
|
|
100
|
+
if ('children' in def && def.children) {
|
|
101
|
+
// 递归查找分组内的列
|
|
102
|
+
var found = findOriginalColDef(field, def.children);
|
|
103
|
+
if (found) return found;
|
|
104
|
+
} else {
|
|
105
|
+
// 检查是否是目标列(使用类型守卫)
|
|
106
|
+
var colDef = def;
|
|
107
|
+
if (colDef.field === field) {
|
|
108
|
+
return colDef;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
} catch (err) {
|
|
113
|
+
_iterator.e(err);
|
|
114
|
+
} finally {
|
|
115
|
+
_iterator.f();
|
|
116
|
+
}
|
|
117
|
+
return undefined;
|
|
118
|
+
}
|
|
119
|
+
|
|
76
120
|
/**
|
|
77
121
|
* 递归构建树形结构
|
|
78
122
|
*/
|
|
@@ -95,6 +139,25 @@ export function flatConfigToGridState(flatConfig) {
|
|
|
95
139
|
};
|
|
96
140
|
} else {
|
|
97
141
|
// 构建列节点
|
|
142
|
+
// 查找原始列定义
|
|
143
|
+
var originalDef = item.field ? findOriginalColDef(item.field, originalColumnDefs) : undefined;
|
|
144
|
+
|
|
145
|
+
// 如果找到原始列定义,合并所有属性
|
|
146
|
+
if (originalDef) {
|
|
147
|
+
return _objectSpread(_objectSpread({}, originalDef), {}, {
|
|
148
|
+
// 保留所有原始属性(cellRenderer、valueFormatter、valueEnum 等)
|
|
149
|
+
// 只覆盖方案中保存的属性
|
|
150
|
+
headerName: item.headerName,
|
|
151
|
+
width: item.width,
|
|
152
|
+
hide: item.hide,
|
|
153
|
+
pinned: item.pinned === 'notPinned' ? null : item.pinned,
|
|
154
|
+
cellClass: item.cellClass,
|
|
155
|
+
flex: item.flex,
|
|
156
|
+
suppressHeaderFilterButton: item.suppressHeaderFilterButton
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
// 如果没有找到原始定义,使用基本属性
|
|
98
161
|
return {
|
|
99
162
|
field: item.field,
|
|
100
163
|
headerName: item.headerName,
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AG-Grid v33 主题配置
|
|
3
|
+
* 使用 themeQuartz API 替代 CSS 变量方式
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { themeQuartz } from 'ag-grid-community';
|
|
7
|
+
export var agGridTheme = themeQuartz.withParams({
|
|
8
|
+
// 基础颜色
|
|
9
|
+
backgroundColor: '#FFFFFF',
|
|
10
|
+
foregroundColor: '#555B62',
|
|
11
|
+
accentColor: '#087AD1',
|
|
12
|
+
invalidColor: '#e02525',
|
|
13
|
+
borderColor: '#F0F0F0',
|
|
14
|
+
// 浏览器配置
|
|
15
|
+
browserColorScheme: 'light',
|
|
16
|
+
// 边框配置
|
|
17
|
+
wrapperBorder: true,
|
|
18
|
+
rowBorder: true,
|
|
19
|
+
columnBorder: true,
|
|
20
|
+
// 表头配置
|
|
21
|
+
headerBackgroundColor: '#FAFAFA',
|
|
22
|
+
headerFontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
|
|
23
|
+
headerFontWeight: 600,
|
|
24
|
+
headerFontSize: 12,
|
|
25
|
+
headerHeight: 25,
|
|
26
|
+
headerTextColor: '#000000E1',
|
|
27
|
+
headerColumnBorder: true,
|
|
28
|
+
headerColumnBorderHeight: '100%',
|
|
29
|
+
headerVerticalPaddingScale: 0.8,
|
|
30
|
+
// 字体配置
|
|
31
|
+
fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
|
|
32
|
+
fontSize: 12,
|
|
33
|
+
// 单元格配置
|
|
34
|
+
cellTextColor: '#000000E1',
|
|
35
|
+
cellHorizontalPaddingScale: 0.7,
|
|
36
|
+
// 行配置
|
|
37
|
+
rowVerticalPaddingScale: 0.8,
|
|
38
|
+
rowHoverColor: 'color-mix(in srgb, transparent, #087AD1 12%)',
|
|
39
|
+
selectedRowBackgroundColor: 'color-mix(in srgb, transparent, #087AD1 8%)',
|
|
40
|
+
oddRowBackgroundColor: '#FFFFFF',
|
|
41
|
+
// 列 hover 配置
|
|
42
|
+
columnHoverColor: 'color-mix(in srgb, transparent, #087AD1 8%)',
|
|
43
|
+
// 图标尺寸
|
|
44
|
+
iconSize: 14,
|
|
45
|
+
// 边角配置
|
|
46
|
+
borderRadius: 2,
|
|
47
|
+
wrapperBorderRadius: 2,
|
|
48
|
+
// 范围选择
|
|
49
|
+
rangeSelectionBorderStyle: 'solid',
|
|
50
|
+
rangeSelectionBorderColor: '#087AD1',
|
|
51
|
+
rangeSelectionBackgroundColor: 'color-mix(in srgb, transparent, #087AD1 20%)',
|
|
52
|
+
// 弹窗阴影
|
|
53
|
+
popupShadow: '0 0 16px 0 #00000026',
|
|
54
|
+
dropdownShadow: '0 1px 4px 1px #babfc766',
|
|
55
|
+
// 拖拽配置
|
|
56
|
+
dragAndDropImageBackgroundColor: '#FFFFFF',
|
|
57
|
+
dragAndDropImageBorder: true,
|
|
58
|
+
// 焦点阴影
|
|
59
|
+
focusShadow: '0 0 0 3px color-mix(in srgb, transparent, #087AD1 50%)',
|
|
60
|
+
// 复选框配置
|
|
61
|
+
checkboxBorderWidth: 1,
|
|
62
|
+
checkboxUncheckedBackgroundColor: '#FFFFFF',
|
|
63
|
+
checkboxCheckedBackgroundColor: '#087AD1',
|
|
64
|
+
checkboxCheckedBorderColor: '#087AD1',
|
|
65
|
+
// 切换按钮配置
|
|
66
|
+
toggleButtonWidth: 28,
|
|
67
|
+
toggleButtonHeight: 18,
|
|
68
|
+
toggleButtonOnBackgroundColor: '#087AD1',
|
|
69
|
+
// 侧边栏配置
|
|
70
|
+
sideBarPanelWidth: 250,
|
|
71
|
+
spacing: 6
|
|
72
|
+
});
|
|
@@ -32,7 +32,7 @@ export declare const createSelectField: (title: string, options: Array<{
|
|
|
32
32
|
required?: boolean | undefined;
|
|
33
33
|
placeholder?: string | undefined;
|
|
34
34
|
gridSpan?: number | undefined;
|
|
35
|
-
mode?: "
|
|
35
|
+
mode?: "multiple" | "tags" | undefined;
|
|
36
36
|
} | undefined) => any;
|
|
37
37
|
/**
|
|
38
38
|
* 快速创建常用字段的工具函数集合
|