@nokecy/qc-ui 0.2.10 → 0.3.1

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

@@ -243,9 +243,7 @@ function AgGridPlus(props) {
     });
   };
 
-  var actionDom = (0, _react.useMemo)(function () {
-    return toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter), queryFilter);
-  }, []);
+  var actionDom = toolBarRender && toolBarRender(apiRef.current, (0, _utils.convertFilterModel)(queryFilter), queryFilter);
 
   var sortChanged = function sortChanged(columnApi) {
     var sortedColumn = columnApi.getColumnState().find(function (col) {
@@ -279,6 +277,11 @@ function AgGridPlus(props) {
       return !x.hideInTable;
     });
   }, []);
+  var allColDefs = (0, _react.useMemo)(function () {
+    return _react.default.Children.map(children, function (child, index) {
+      return child.props;
+    });
+  }, []);
   var rowDataMemo = (0, _react.useMemo)(function () {
     return props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData), treeParentName) : rowData;
   }, [rowData, props.treeData]);
@@ -294,6 +297,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/_react.default.createElement(_queryForm.default, {
+    colDefs: allColDefs,
     columnStates: columnState || [],
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
@@ -348,6 +352,18 @@ function AgGridPlus(props) {
     },
     onSelectionChanged: onRowChanged,
     onRowSelected: onRowSelected,
+    onDragStopped: function onDragStopped(e) {
+      if (columnsRef.current) {
+        var _columnsRef$current2;
+
+        setColumnState((_columnsRef$current2 = columnsRef.current) === null || _columnsRef$current2 === void 0 ? void 0 : _columnsRef$current2.getColumnState());
+      }
+    } // onColumnMoved={() => {
+    //     if (columnsRef.current) {
+    //         setColumnState(columnsRef.current?.getColumnState());
+    //     }
+    // }}
+    ,
     columnTypes: columnTypes,
     animateRows: true //停用默认分页组件
     ,

package/dist/cjs/ag-grid-plus/queryForm/index.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="react" />
-import { ColumnState, GridApi } from 'ag-grid-community';
+import { ColDef, ColumnState, GridApi } from 'ag-grid-community';
 import './index.less';
 declare const FormRender: (props: {
     className?: any;
     gridApi?: GridApi<any> | undefined;
+    colDefs: ColDef[];
     columnStates: ColumnState[];
     onQuery: (formValue: any) => void;
 }) => JSX.Element;

package/dist/cjs/ag-grid-plus/queryForm/index.js

@@ -58,6 +58,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var FormRender = function FormRender(props) {
   var className = props.className,
       gridApi = props.gridApi,
+      colDefs = props.colDefs,
       columnStates = props.columnStates,
       onQuery = props.onQuery;
 
@@ -166,13 +167,15 @@ var FormRender = function FormRender(props) {
       },
       properties: {}
     };
-    var columns = columnStates.filter(function (x) {
-      return !x.hide;
-    }).map(function (columnState) {
-      return gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+    var columns = colDefs.map(function (colDef) {
+      var state = columnStates.find(function (x) {
+        return x.colId == colDef.field;
+      });
+      console.log("state", state);
+      return _objectSpread(_objectSpread({}, colDef), state);
     });
     columns = columns.filter(function (i) {
-      return (i === null || i === void 0 ? void 0 : i.visible) != false && !i.hideInSearch || i.hideInTable;
+      return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);
     });
     columns.map(function (col) {
       var _colDef$queryField;

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

@@ -216,9 +216,7 @@ function AgGridPlus(props) {
     });
   };
 
-  var actionDom = useMemo(function () {
-    return toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter), queryFilter);
-  }, []);
+  var actionDom = toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter), queryFilter);
 
   var sortChanged = function sortChanged(columnApi) {
     var sortedColumn = columnApi.getColumnState().find(function (col) {
@@ -252,6 +250,11 @@ function AgGridPlus(props) {
       return !x.hideInTable;
     });
   }, []);
+  var allColDefs = useMemo(function () {
+    return React.Children.map(children, function (child, index) {
+      return child.props;
+    });
+  }, []);
   var rowDataMemo = useMemo(function () {
     return props.treeData ? flatten(toTree(rowData), treeParentName) : rowData;
   }, [rowData, props.treeData]);
@@ -267,6 +270,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
+    colDefs: allColDefs,
     columnStates: columnState || [],
     gridApi: apiRef.current,
     onQuery: function onQuery(formValues) {
@@ -321,6 +325,18 @@ function AgGridPlus(props) {
     },
     onSelectionChanged: onRowChanged,
     onRowSelected: onRowSelected,
+    onDragStopped: function onDragStopped(e) {
+      if (columnsRef.current) {
+        var _columnsRef$current2;
+
+        setColumnState((_columnsRef$current2 = columnsRef.current) === null || _columnsRef$current2 === void 0 ? void 0 : _columnsRef$current2.getColumnState());
+      }
+    } // onColumnMoved={() => {
+    //     if (columnsRef.current) {
+    //         setColumnState(columnsRef.current?.getColumnState());
+    //     }
+    // }}
+    ,
     columnTypes: columnTypes,
     animateRows: true //停用默认分页组件
     ,

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

@@ -1,9 +1,10 @@
 /// <reference types="react" />
-import { ColumnState, GridApi } from 'ag-grid-community';
+import { ColDef, ColumnState, GridApi } from 'ag-grid-community';
 import './index.less';
 declare const FormRender: (props: {
     className?: any;
     gridApi?: GridApi<any> | undefined;
+    colDefs: ColDef[];
     columnStates: ColumnState[];
     onQuery: (formValue: any) => void;
 }) => JSX.Element;

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

@@ -37,6 +37,7 @@ import "./index.less";
 var FormRender = function FormRender(props) {
   var className = props.className,
       gridApi = props.gridApi,
+      colDefs = props.colDefs,
       columnStates = props.columnStates,
       onQuery = props.onQuery;
 
@@ -145,13 +146,15 @@ var FormRender = function FormRender(props) {
       },
       properties: {}
     };
-    var columns = columnStates.filter(function (x) {
-      return !x.hide;
-    }).map(function (columnState) {
-      return gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+    var columns = colDefs.map(function (colDef) {
+      var state = columnStates.find(function (x) {
+        return x.colId == colDef.field;
+      });
+      console.log("state", state);
+      return _objectSpread(_objectSpread({}, colDef), state);
     });
     columns = columns.filter(function (i) {
-      return (i === null || i === void 0 ? void 0 : i.visible) != false && !i.hideInSearch || i.hideInTable;
+      return (i === null || i === void 0 ? void 0 : i.visible) != false && !(i !== null && i !== void 0 && i.hide) && !(i !== null && i !== void 0 && i.hideInSearch) || (i === null || i === void 0 ? void 0 : i.hideInTable);
     });
     columns.map(function (col) {
       var _colDef$queryField;