@nokecy/qc-ui 1.0.39 → 1.0.41

package/dist/esm/ag-grid-plus/setting/diySetting/index.js

@@ -44,21 +44,35 @@ var DiySetting = function DiySetting(props) {
   var getColumnData = function getColumnData() {
     var columnStates = gridApi.getColumnState();
     var columnRowData = [];
-    columnStates.forEach(function (columnState) {
-      var colDef = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+    var columnDefs = (gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDefs()) || [];
 
-      // 将列信息和 cellClass 一并加入到 columnRowData 中
-      columnRowData.push(_objectSpread({
-        id: _uniqueId(),
-        field: colDef.field,
-        headerName: colDef.headerName,
-        width: columnState.width,
-        hide: columnState.hide,
-        cellClass: colDef.cellClass,
-        // 添加 cellClass
-        suppressHeaderFilterButton: !colDef.suppressHeaderFilterButton
-      }, columnState));
-    });
+    // 递归处理列定义
+    var processColumns = function processColumns(columns, parentGroup) {
+      columns.forEach(function (column) {
+        if (column.children && column.children.length > 0) {
+          // 处理子列，将当前headerName作为分组名传递下去
+          processColumns(column.children, column.headerName);
+        } else {
+          // 找到对应的columnState
+          var columnState = columnStates.find(function (state) {
+            return state.colId === column.field;
+          });
+          if (columnState) {
+            columnRowData.push(_objectSpread({
+              id: _uniqueId(),
+              field: column.field,
+              headerName: column.headerName,
+              width: columnState.width,
+              hide: columnState.hide,
+              cellClass: column.cellClass,
+              suppressHeaderFilterButton: !column.suppressHeaderFilterButton,
+              groupName: parentGroup
+            }, columnState));
+          }
+        }
+      });
+    };
+    processColumns(columnDefs);
     return columnRowData;
   };
   var portalId = "workProcedure".concat(_uniqueId());
@@ -111,7 +125,7 @@ var DiySetting = function DiySetting(props) {
               })), /*#__PURE__*/React.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
-                  width: 280,
+                  width: 180,
                   title: "列名"
                 }
               }, /*#__PURE__*/React.createElement(SchemaField.String, {
@@ -119,6 +133,16 @@ var DiySetting = function DiySetting(props) {
                 "x-decorator": "FormItem",
                 "x-component": "Input",
                 "x-read-pretty": true
+              })), /*#__PURE__*/React.createElement(SchemaField.Void, {
+                "x-component": "ArrayTable.Column",
+                "x-component-props": {
+                  width: 120,
+                  title: "分组名称"
+                }
+              }, /*#__PURE__*/React.createElement(SchemaField.String, {
+                name: "groupName",
+                "x-decorator": "FormItem",
+                "x-component": "Input"
               })), /*#__PURE__*/React.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
@@ -207,24 +231,15 @@ var DiySetting = function DiySetting(props) {
                 name: "hide",
                 "x-decorator": "FormItem",
                 "x-component": "Switch"
-              })), /*#__PURE__*/React.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 180,
-                  title: "分组名称"
-                }
-              }, /*#__PURE__*/React.createElement(SchemaField.String, {
-                name: "groupName",
-                "x-decorator": "FormItem",
-                "x-component": "Input"
               })))))));
             });
             formDialog.forConfirm(function (payload, next) {
               var values = payload.values;
               onSaveColumnState && onSaveColumnState(values.items);
               var processedColumns = processColumnGroups(values.items);
-              console.log('record1', processedColumns);
-              gridApi.setGridOption("columnDefs", processedColumns);
+              if (props.type !== 'formArrayTable') {
+                gridApi.setGridOption("columnDefs", processedColumns);
+              }
               setTimeout(function () {
                 gridApi.applyColumnState({
                   state: processedColumns,

package/dist/esm/ag-grid-plus/setting/index.d.ts

@@ -4,6 +4,7 @@ declare const Setting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
     gridApiState?: GridApi<any> | undefined;
+    type?: string | undefined;
     onSaveColumnState: (state: any) => void;
 }) => React.JSX.Element | null;
 export default Setting;

package/dist/esm/ag-grid-plus/setting/index.js

@@ -23,6 +23,7 @@ var Setting = function Setting(props) {
     gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
   var _useGridPlusColumnSta = useGridPlusColumnState(),
+    extensibleColumns = _useGridPlusColumnSta.extensibleColumns,
     applyToGlobal = _useGridPlusColumnSta.applyToGlobal,
     resetCurrent = _useGridPlusColumnSta.resetCurrent,
     resetAll = _useGridPlusColumnSta.resetAll;
@@ -80,7 +81,8 @@ var Setting = function Setting(props) {
     label: /*#__PURE__*/React.createElement(DiySetting, {
       gridKey: gridKey,
       gridApi: gridApi,
-      onSaveColumnState: onSaveColumnState
+      onSaveColumnState: onSaveColumnState,
+      type: props.type
     })
   }, {
     key: '2',

package/dist/esm/array-table/index.js

@@ -55,13 +55,74 @@ var ArrayTable = observer(function (props) {
     gridPlusColumnState = _useGridPlusColumnSta.columnState,
     extensibleColumns = _useGridPlusColumnSta.extensibleColumns;
   // const teststyle = '[{\"id\":\"18\",\"field\":\"xdxcp47tycp\",\"headerName\":\"A1\",\"width\":800,\"hide\":false,\"colId\":\"a1\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null},{\"id\":\"19\",\"field\":\"nvhezzkyak9\",\"headerName\":\"Operations\",\"width\":60,\"hide\":false,\"colId\":\"nvhezzkyak9\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null}]'
+  // const teststyle = [
+  //   {
+  //     "id": "5",
+  //     "field": "NO_NAME_FIELD_$1",
+  //     "headerName": "Index",
+  //     "width": 80,
+  //     "hide": false,
+  //     "cellClass": "custom-cell-left",
+  //     "suppressHeaderFilterButton": true,
+  //     "colId": "NO_NAME_FIELD_$1",
+  //     "pinned": null,
+  //     "sort": null,
+  //     "sortIndex": null,
+  //     "aggFunc": null,
+  //     "rowGroup": false,
+  //     "rowGroupIndex": null,
+  //     "pivot": false,
+  //     "pivotIndex": null,
+  //     "flex": null
+  //   },
+  //   {
+  //     "id": "6",
+  //     "field": "a1",
+  //     "headerName": "A1",
+  //     "width": 1200,
+  //     "hide": false,
+  //     "cellClass": "custom-cell-left",
+  //     "suppressHeaderFilterButton": true,
+  //     "colId": "a1",
+  //     "pinned": null,
+  //     "sort": null,
+  //     "sortIndex": null,
+  //     "aggFunc": null,
+  //     "rowGroup": false,
+  //     "rowGroupIndex": null,
+  //     "pivot": false,
+  //     "pivotIndex": null,
+  //     "flex": null
+  //   },
+  //   {
+  //     "id": "7",
+  //     "field": "operations",
+  //     "headerName": "Operations",
+  //     "width": 80,
+  //     "hide": false,
+  //     "cellClass": "custom-cell-left",
+  //     "suppressHeaderFilterButton": true,
+  //     "colId": "operations",
+  //     "pinned": "right",
+  //     "sort": null,
+  //     "sortIndex": null,
+  //     "aggFunc": null,
+  //     "rowGroup": false,
+  //     "rowGroupIndex": null,
+  //     "pivot": false,
+  //     "pivotIndex": null,
+  //     "flex": null
+  //   }
+  // ]
 
   useEffect(function () {
     if (props.gridKey && gridPlusColumnState && gridPlusColumnState[props.gridKey] && apiRef.current) {
-      apiRef.current.applyColumnState({
-        state: gridPlusColumnState[props.gridKey],
-        applyOrder: true
-      });
+      setTimeout(function () {
+        apiRef.current.applyColumnState({
+          state: gridPlusColumnState[props.gridKey],
+          applyOrder: true
+        });
+      }, 10);
     }
   }, [gridPlusColumnState, apiRef.current, dataSource]);
 
@@ -132,6 +193,7 @@ var ArrayTable = observer(function (props) {
     gridKey: props.gridKey,
     gridApi: apiRef.current,
     gridApiState: gridApiState,
+    type: 'formArrayTable',
     onSaveColumnState: onColumnStateChanged
   })), /*#__PURE__*/React.createElement(AgGridReact, {
     onGridReady: function onGridReady(params) {