npm - @nokecy/qc-ui - Versions diffs - 1.0.85 → 1.0.86 - Mend

@nokecy/qc-ui 1.0.85 → 1.0.86

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 (200) hide show

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

@@ -251,14 +251,34 @@ function AgGridPlus(props) {
     // 优先使用方案中的 columnConfig（用户在列配置界面调整后的数据）
     if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
-      var _require = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require.flatConfigToColumnState;
-      var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
-      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      // 【关键修复】检查是否包含分组结构
+      var hasGroups = columnSchemeManager.currentScheme.columnConfig.some(function (item) {
+        return item.type === 'group';
+      });
+      // 如果包含分组结构,跳过 applyColumnState
+      // 原因: 分组结构由下面的 useEffect #2 通过 setGridOption("columnDefs") 处理
+      // applyColumnState 只能设置列属性,会把分组子列当作独立列,破坏分组结构
+      if (hasGroups) {
+        console.log('[AgGridPlus] useEffect #1: 检测到分组结构,跳过 applyColumnState');
+        // 仍然需要设置列样式
+        var _require = require("./setting/columnGroupUtils"),
+          _flatConfigToColumnState = _require.flatConfigToColumnState;
+        var _columnState = _flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+        setColumnCellClass(handelgridPlusColumnState(_columnState));
+        return;
+      }
+      // 没有分组时,使用 applyColumnState 应用列配置
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState2));
       var timer = setTimeout(function () {
         var _apiRef$current;
         (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
-          state: _columnState,
+          state: _columnState2,
           applyOrder: true
         });
       }, 10);
@@ -305,8 +325,8 @@ function AgGridPlus(props) {
     var timer = setTimeout(function () {
       // 优先使用 columnConfig(包含完整的分组结构)
       if (currentScheme.columnConfig) {
-        var _require2 = require("./setting/columnGroupUtils"),
-          flatConfigToGridState = _require2.flatConfigToGridState;
+        var _require3 = require("./setting/columnGroupUtils"),
+          flatConfigToGridState = _require3.flatConfigToGridState;
         var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
         console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
           columnConfig: currentScheme.columnConfig,
@@ -1122,8 +1142,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current7;
-        var _columnState2 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
-        setColumnState(_columnState2);
+        var _columnState3 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
+        setColumnState(_columnState3);
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }

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

@@ -244,14 +244,34 @@ function AgGridPlus(props) {
     // 优先使用方案中的 columnConfig（用户在列配置界面调整后的数据）
     if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
-      var _require = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require.flatConfigToColumnState;
-      var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
-      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      // 【关键修复】检查是否包含分组结构
+      var hasGroups = columnSchemeManager.currentScheme.columnConfig.some(function (item) {
+        return item.type === 'group';
+      });
+      // 如果包含分组结构,跳过 applyColumnState
+      // 原因: 分组结构由下面的 useEffect #2 通过 setGridOption("columnDefs") 处理
+      // applyColumnState 只能设置列属性,会把分组子列当作独立列,破坏分组结构
+      if (hasGroups) {
+        console.log('[AgGridPlus] useEffect #1: 检测到分组结构,跳过 applyColumnState');
+        // 仍然需要设置列样式
+        var _require = require("./setting/columnGroupUtils"),
+          _flatConfigToColumnState = _require.flatConfigToColumnState;
+        var _columnState = _flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+        setColumnCellClass(handelgridPlusColumnState(_columnState));
+        return;
+      }
+      // 没有分组时,使用 applyColumnState 应用列配置
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState2));
       var timer = setTimeout(function () {
         var _apiRef$current;
         (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || _apiRef$current.applyColumnState({
-          state: _columnState,
+          state: _columnState2,
           applyOrder: true
         });
       }, 10);
@@ -298,8 +318,8 @@ function AgGridPlus(props) {
     var timer = setTimeout(function () {
       // 优先使用 columnConfig(包含完整的分组结构)
       if (currentScheme.columnConfig) {
-        var _require2 = require("./setting/columnGroupUtils"),
-          flatConfigToGridState = _require2.flatConfigToGridState;
+        var _require3 = require("./setting/columnGroupUtils"),
+          flatConfigToGridState = _require3.flatConfigToGridState;
         var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
         console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
           columnConfig: currentScheme.columnConfig,
@@ -1115,8 +1135,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current7;
-        var _columnState2 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
-        setColumnState(_columnState2);
+        var _columnState3 = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
+        setColumnState(_columnState3);
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }