@nokecy/qc-ui 0.0.10 → 0.0.12

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

@@ -13,8 +13,6 @@ var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _gridManager = _interopRequireDefault(require("./gridManager"));
-
 require("ag-grid-enterprise");
 
 require("./global.scss");
@@ -33,7 +31,7 @@ var _icons = require("@ant-design/icons");
 
 var _utils = require("./utils");
 
-var _excluded = ["style", "params", "request", "dataSource", "headerTitle", "toolBarRender", "search", "hideRedo", "onGridReady", "gridKey", "gridColumnState", "children"];
+var _excluded = ["style", "params", "request", "dataSource", "gridRef", "headerTitle", "toolBarRender", "search", "hideRedo", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -74,6 +72,7 @@ function AgGridPlus(props) {
       gridParams = props.params,
       request = props.request,
       dataSource = props.dataSource,
+      propsGridRef = props.gridRef,
       headerTitle = props.headerTitle,
       toolBarRender = props.toolBarRender,
       search = props.search,
@@ -84,9 +83,9 @@ function AgGridPlus(props) {
       children = props.children,
       rest = _objectWithoutProperties(props, _excluded);
 
+  var gridRef = (0, _react.useRef)();
   var apiRef = (0, _react.useRef)();
   var columnsRef = (0, _react.useRef)();
-  var gridManager = new _gridManager.default();
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -125,8 +124,11 @@ function AgGridPlus(props) {
   }),
       _useState14 = _slicedToArray(_useState13, 2),
       pagination = _useState14[0],
-      setPagination = _useState14[1]; //默认列属性
+      setPagination = _useState14[1];
 
+  (0, _react.useImperativeHandle)(propsGridRef, function () {
+    return gridRef.current;
+  }); //默认列属性
 
   var defaultColDef = {
     resizable: true,
@@ -148,12 +150,12 @@ function AgGridPlus(props) {
       });
     }
   }, [gridColumnState, columnsRef.current]);
+  (0, _react.useEffect)(function () {
+    setRowData(dataSource || rowData);
+  }, [dataSource, rowData]);
   var onGridReady = (0, _react.useCallback)(function (params) {
     apiRef.current = params.api;
     columnsRef.current = params.columnApi;
-    gridManager.agGridApi = params.api;
-    gridManager.agGridColumnApi = params.columnApi; // gridManager.rowkey = rowkey;
-
     onReady && onReady(params); ///@ts-ignore
 
     dataSource && setRowData(dataSource);
@@ -199,10 +201,15 @@ function AgGridPlus(props) {
     setSortColumn(sortedColumn);
   };
 
-  var onRest = function onRest() {
+  var onRefresh = function onRefresh() {
     request && onRequest(queryFilter);
   };
 
+  (0, _react.useEffect)(function () {
+    gridRef.current = {
+      onRefresh: onRefresh
+    };
+  }, [queryFilter]);
   return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"
@@ -247,10 +254,10 @@ function AgGridPlus(props) {
     title: headerTitle,
     actions: actionDom,
     settings: [/*#__PURE__*/_react.default.createElement(_settingItem.default, {
-      onClick: onRest,
+      onClick: onRefresh,
       icon: /*#__PURE__*/_react.default.createElement(_icons.RedoOutlined, null)
     }), /*#__PURE__*/_react.default.createElement(_settingItem.default, {
-      onClick: onRest,
+      onClick: onRefresh,
       icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null)
     })]
   }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({

package/dist/cjs/ag-grid-plus/interface.d.ts

@@ -1,6 +1,9 @@
 import { GridApi } from 'ag-grid-community';
 import { AgGridReactProps, AgGridColumnProps, AgGridColumnGroupProps } from 'ag-grid-react';
 import React, { CSSProperties, ReactNode } from 'react';
+interface GridRef {
+    onRefresh: () => void;
+}
 interface GridProps extends AgGridReactProps {
     hideRedo?: boolean;
     style?: CSSProperties;
@@ -20,6 +23,7 @@ interface GridProps extends AgGridReactProps {
      * 列方案
     */
     gridColumnState?: any[];
+    gridRef?: React.Ref<GridRef | undefined>;
 }
 interface AgGridColumnPropsClone extends AgGridColumnProps {
     hideInTable?: boolean;
@@ -30,4 +34,4 @@ interface AgGridColumnPropsClone extends AgGridColumnProps {
     searchSort?: number;
 }
 declare function AgGridColumn(props: AgGridColumnPropsClone | AgGridColumnGroupProps): JSX.Element;
-export { GridProps, AgGridColumn };
+export { GridProps, AgGridColumn, GridRef };

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

@@ -1,4 +1,4 @@
-var _excluded = ["style", "params", "request", "dataSource", "headerTitle", "toolBarRender", "search", "hideRedo", "onGridReady", "gridKey", "gridColumnState", "children"];
+var _excluded = ["style", "params", "request", "dataSource", "gridRef", "headerTitle", "toolBarRender", "search", "hideRedo", "onGridReady", "gridKey", "gridColumnState", "children"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -26,8 +26,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { AgGridReact } from 'ag-grid-react';
 import { Spin, Pagination, Card, Tag } from 'antd';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import GridManage from "./gridManager";
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import "ag-grid-enterprise";
 import "./global.scss";
 import "./index.less";
@@ -47,6 +46,7 @@ function AgGridPlus(props) {
       gridParams = props.params,
       request = props.request,
       dataSource = props.dataSource,
+      propsGridRef = props.gridRef,
       headerTitle = props.headerTitle,
       toolBarRender = props.toolBarRender,
       search = props.search,
@@ -57,9 +57,9 @@ function AgGridPlus(props) {
       children = props.children,
       rest = _objectWithoutProperties(props, _excluded);
 
+  var gridRef = useRef();
   var apiRef = useRef();
   var columnsRef = useRef();
-  var gridManager = new GridManage();
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -98,8 +98,11 @@ function AgGridPlus(props) {
   }),
       _useState14 = _slicedToArray(_useState13, 2),
       pagination = _useState14[0],
-      setPagination = _useState14[1]; //默认列属性
+      setPagination = _useState14[1];
 
+  useImperativeHandle(propsGridRef, function () {
+    return gridRef.current;
+  }); //默认列属性
 
   var defaultColDef = {
     resizable: true,
@@ -121,12 +124,12 @@ function AgGridPlus(props) {
       });
     }
   }, [gridColumnState, columnsRef.current]);
+  useEffect(function () {
+    setRowData(dataSource || rowData);
+  }, [dataSource, rowData]);
   var onGridReady = useCallback(function (params) {
     apiRef.current = params.api;
     columnsRef.current = params.columnApi;
-    gridManager.agGridApi = params.api;
-    gridManager.agGridColumnApi = params.columnApi; // gridManager.rowkey = rowkey;
-
     onReady && onReady(params); ///@ts-ignore
 
     dataSource && setRowData(dataSource);
@@ -172,10 +175,15 @@ function AgGridPlus(props) {
     setSortColumn(sortedColumn);
   };
 
-  var onRest = function onRest() {
+  var onRefresh = function onRefresh() {
     request && onRequest(queryFilter);
   };
 
+  useEffect(function () {
+    gridRef.current = {
+      onRefresh: onRefresh
+    };
+  }, [queryFilter]);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"
@@ -220,10 +228,10 @@ function AgGridPlus(props) {
     title: headerTitle,
     actions: actionDom,
     settings: [/*#__PURE__*/React.createElement(SettingItem, {
-      onClick: onRest,
+      onClick: onRefresh,
       icon: /*#__PURE__*/React.createElement(RedoOutlined, null)
     }), /*#__PURE__*/React.createElement(SettingItem, {
-      onClick: onRest,
+      onClick: onRefresh,
       icon: /*#__PURE__*/React.createElement(SettingOutlined, null)
     })]
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({

package/dist/esm/ag-grid-plus/interface.d.ts

@@ -1,6 +1,9 @@
 import { GridApi } from 'ag-grid-community';
 import { AgGridReactProps, AgGridColumnProps, AgGridColumnGroupProps } from 'ag-grid-react';
 import React, { CSSProperties, ReactNode } from 'react';
+interface GridRef {
+    onRefresh: () => void;
+}
 interface GridProps extends AgGridReactProps {
     hideRedo?: boolean;
     style?: CSSProperties;
@@ -20,6 +23,7 @@ interface GridProps extends AgGridReactProps {
      * 列方案
     */
     gridColumnState?: any[];
+    gridRef?: React.Ref<GridRef | undefined>;
 }
 interface AgGridColumnPropsClone extends AgGridColumnProps {
     hideInTable?: boolean;
@@ -30,4 +34,4 @@ interface AgGridColumnPropsClone extends AgGridColumnProps {
     searchSort?: number;
 }
 declare function AgGridColumn(props: AgGridColumnPropsClone | AgGridColumnGroupProps): JSX.Element;
-export { GridProps, AgGridColumn };
+export { GridProps, AgGridColumn, GridRef };